Fixed phpstan/code sniffer

contributte · May 27, 2019 · 9152c0e · 9152c0e
1 parent 9186f6b
commit 9152c0e
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,8 @@ before_script:
   - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
 
 script:
+  - composer phpstan
+  - composer phpcs
   - vendor/bin/tester tests/ -c tests/php.ini
 
 jobs:

diff --git a/src/Column/Column.php b/src/Column/Column.php
@@ -180,11 +180,7 @@ public function isSortable(): bool
 			return $this->sortable;
 		}
 
-		if ($this->sortable !== '') {
-			return true;
-		}
-
-		return false;
+		return $this->sortable !== '';
 	}
 
 

diff --git a/src/DataGrid.php b/src/DataGrid.php
@@ -418,7 +418,7 @@ class DataGrid extends Control
 	private $customPaginatorTemplate = null;
 
 	/**
-	 * @var  string
+	 * @var string|null
 	 */
 	private $componentFullName;
 
@@ -2047,7 +2047,7 @@ public function handleResetFilter(): void
 			$this->deleteSessionData('_grid_has_sorted');
 		}
 
-		foreach ($this->getSessionData() as $key => $val) {
+		foreach (array_keys($this->getSessionData()) as $key) {
 			if (!in_array($key, [
 				'_grid_perPage',
 				'_grid_sort',
@@ -2501,7 +2501,9 @@ public function getPerPage()
 			$perPage = reset($itemsPerPageList);
 		}
 
-		return $perPage === 'all' ? 'all' : (int) $perPage;
+		return $perPage === 'all'
+			? 'all'
+			: (int) $perPage;
 	}
 
 
@@ -2998,10 +3000,9 @@ public function getColumnsSummary(): ?ColumnsSummary
 
 	/**
 	 * Gets component's full name in component tree
-	 * @return string
 	 * @throws DataGridHasToBeAttachedToPresenterComponentException
 	 */
-	public function getFullName() : string
+	public function getFullName(): string
 	{
 		if ($this->componentFullName === null) {
 			throw new DataGridHasToBeAttachedToPresenterComponentException(

diff --git a/src/GroupAction/GroupActionCollection.php b/src/GroupAction/GroupActionCollection.php
@@ -111,14 +111,14 @@ public function addToFormContainer(Container $container): void
 
 		$groupActionSelect->addCondition(Form::FILLED)
 			->toggle(
-				strtolower((string) $this->datagrid->getFullName()) . 'group_action_submit'
+				strtolower($this->datagrid->getFullName()) . 'group_action_submit'
 			);
 
 		$container->addSubmit('submit', 'ublaboo_datagrid.execute')
 			->setValidationScope([$container])
 			->setAttribute(
 				'id',
-				strtolower((string) $this->datagrid->getFullName()) . 'group_action_submit'
+				strtolower($this->datagrid->getFullName()) . 'group_action_submit'
 			);
 
 		$form->onSubmit[] = [$this, 'submitted'];
@@ -146,7 +146,7 @@ public function submitted(Form $form): void
 		 */
 		$http_ids = $form->getHttpData(
 			Form::DATA_LINE | Form::DATA_KEYS,
-			strtolower((string) $this->datagrid->getFullName()) . '_group_action_item[]'
+			strtolower($this->datagrid->getFullName()) . '_group_action_item[]'
 		);
 
 		$ids = array_keys($http_ids);

diff --git a/tests/Cases/CreateLinkTest.phpt b/tests/Cases/CreateLinkTest.phpt
@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace Ublaboo\DataGrid\Tests\Cases;
 
-use InvalidArgumentException;
-use Nette\Application\UI\InvalidLinkException;
 use Nette\Application\UI\Presenter;
 use Tester\Assert;
 use Tester\TestCase;

diff --git a/tests/Cases/DataSources/ArrayDataSourceTest.phpt b/tests/Cases/DataSources/ArrayDataSourceTest.phpt
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Ublaboo\DataGrid\Tests\Cases\DataSources;
 
-use Ublaboo;
 use Ublaboo\DataGrid\DataSource\ArrayDataSource;
 use Ublaboo\DataGrid\Tests\Files\TestingDataGridFactory;
 

diff --git a/tests/Cases/DataSources/DoctrineCollectionDataSourceTest.php b/tests/Cases/DataSources/DoctrineCollectionDataSourceTest.php
@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Tester\Assert;
-use Ublaboo;
 use Ublaboo\DataGrid\DataSource\DoctrineCollectionDataSource;
 use Ublaboo\DataGrid\Filter\FilterText;
 use Ublaboo\DataGrid\Tests\Files\TestingDataGridFactory;

diff --git a/tests/Cases/ItemsPerPageTest.phpt b/tests/Cases/ItemsPerPageTest.phpt
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * TEST: ItemsPerPageTest
  * @testCase Ublaboo\DataGrid\Tests\Cases\ItemsPerPageTest
@@ -32,41 +34,41 @@ class ItemsPerPageTest extends Tester\TestCase
 
 	public function testGetPerPage()
 	{
-	    $this->grid->setItemsPerPageList([10, 20, 50], false);
+		$this->grid->setItemsPerPageList([10, 20, 50], false);
 
-        $this->grid->perPage = 20;
-        Tester\Assert::same(20, $this->grid->getPerPage());
+		$this->grid->perPage = 20;
+		Tester\Assert::same(20, $this->grid->getPerPage());
 
-        $this->grid->perPage = 'all';
-        Tester\Assert::same(10, $this->grid->getPerPage());
+		$this->grid->perPage = 'all';
+		Tester\Assert::same(10, $this->grid->getPerPage());
 	}
 
-    public function testGetPerPageAll()
-    {
-        $this->grid->setItemsPerPageList([10, 20, 50], true);
+	public function testGetPerPageAll()
+	{
+		$this->grid->setItemsPerPageList([10, 20, 50], true);
 
-        $this->grid->perPage = 20;
-        Tester\Assert::same(20, $this->grid->getPerPage());
+		$this->grid->perPage = 20;
+		Tester\Assert::same(20, $this->grid->getPerPage());
 
-        $this->grid->perPage = 'all';
-        Tester\Assert::same('all', $this->grid->getPerPage());
-    }
+		$this->grid->perPage = 'all';
+		Tester\Assert::same('all', $this->grid->getPerPage());
+	}
 
 	public function testGetPerPageAllTranslated()
-    {
-        $translator = new Ublaboo\DataGrid\Localization\SimpleTranslator([
-            'ublaboo_datagrid.all' => 'všechny'
-        ]);
-        $this->grid->setTranslator($translator);
+	{
+		$translator = new Ublaboo\DataGrid\Localization\SimpleTranslator([
+			'ublaboo_datagrid.all' => 'všechny',
+		]);
+		$this->grid->setTranslator($translator);
 
-        $this->grid->setItemsPerPageList([10, 20, 50], true);
+		$this->grid->setItemsPerPageList([10, 20, 50], true);
 
-        $this->grid->perPage = 20;
-        Tester\Assert::same(20, $this->grid->getPerPage());
+		$this->grid->perPage = 20;
+		Tester\Assert::same(20, $this->grid->getPerPage());
 
-        $this->grid->perPage = 'all';
-        Tester\Assert::same('all', $this->grid->getPerPage());
-    }
+		$this->grid->perPage = 'all';
+		Tester\Assert::same('all', $this->grid->getPerPage());
+	}
 }
 
 $test = new ItemsPerPageTest();

diff --git a/tests/Files/TestingPresenter.php b/tests/Files/TestingPresenter.php
@@ -4,7 +4,6 @@
 
 namespace Ublaboo\DataGrid\Tests\Files;
 
-use Nette\Application\UI\Component;
 use Nette\Application\UI\Presenter;
 use Ublaboo\DataGrid\DataGrid;
 
@@ -31,9 +30,6 @@ public function link(string $destination, $args = []): string
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	/*protected function createRequest(
 		Component $component,
 		string $destination,