Requires PHP 7.2 or newer

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     tests:
         uses: janpecha/actions/.github/workflows/nette-tester-library.yml@master
         with:
-            phpVersions: '["5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'
+            phpVersions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'
             lowestDependencies: true
 
     coding-style:

code-checker.php

@@ -1,7 +1,7 @@
 <?php
 
 return function (JP\CodeChecker\CheckerConfig $config) {
-	$config->setPhpVersion(new JP\CodeChecker\Version('5.6.0'));
+	$config->setPhpVersion(new JP\CodeChecker\Version('7.2.0'));
 	$config->addPath('./src');
 	$config->addPath('./tests');
 	JP\CodeChecker\Sets\CzProjectMinimum::configure($config);

composer.json

@@ -13,18 +13,18 @@
 		{"type": "other", "url": "https://www.janpecha.cz/donate/"}
 	],
 	"require": {
-		"php": ">=5.6.0",
+		"php": ">=7.2.0",
 		"czproject/assert": "^1.3",
-		"nette/application": "^2.4 || ^3.0",
-		"nette/forms": "^2.4 || ^3.0",
-		"nette/utils": "^2.4 || ^3.0 || ^4.0"
+		"nette/application": "^3.0",
+		"nette/forms": "^3.0",
+		"nette/utils": "^3.0 || ^4.0"
 	},
 	"autoload": {
 		"classmap": ["src/"]
 	},
 	"require-dev": {
 		"nette/tester": "^2.0",
-		"mbohuslavek/leanmapper-query": "^1.1"
+		"mbohuslavek/leanmapper-query": "^1.2"
 	},
 	"extra": {
 		"assets-files": "assets/",

readme.md

@@ -18,7 +18,7 @@ DataGrid component for Nette.
 composer require inteve/datagrid
 ```
 
-Inteve\Datagrid requires PHP 5.6.0 or later.
+Inteve\Datagrid requires PHP 7.2.0 or later.
 
 
 ## Usage

src/Action.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/BulkAction.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/Columns/AbstractColumn.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Columns;
 
 	use CzProject\Assert\Assert;

src/Columns/DateTimeColumn.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Columns;
 
 	use CzProject\Assert\Assert;

src/Columns/LinkColumn.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Columns;
 
 	use Nette\Utils\Html;
@@ -34,7 +36,7 @@ protected function processDefaultFormat($value, $row)
 				$url = call_user_func($this->linkFactory, $value, $row);
 			}
 
-			if (Validators::isUrl($url)) { // external URL
+			if (is_string($url) && Validators::isUrl($url)) { // external URL
 				$target = '_blank';
 			}
 

src/Columns/NumberColumn.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Columns;
 
 

src/Columns/TextColumn.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Columns;
 
 

src/DataGrid.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;
@@ -442,9 +444,8 @@ public function processBulkAction(\Nette\Application\UI\Form $form)
 
 		/**
 		 * @param  array<string, mixed> $params
-		 * @return void
 		 */
-		public function loadState(array $params)
+		public function loadState(array $params): void
 		{
 			parent::loadState($params);
 
@@ -515,7 +516,11 @@ public function render()
 			$result = $this->getDataResult();
 			$template = $this->createTemplate();
 			assert($template instanceof \Nette\Bridges\ApplicationLatte\Template);
-			$template->setParameters($this->templateParameters);
+
+			foreach ($this->templateParameters as $templateParameter => $templateParameterValue) {
+				$template->{$templateParameter} = $templateParameterValue;
+			}
+
 			$template->grid = $this;
 			$template->rows = $result->getRows();
 			$template->paginator = $this->createPaginator($result, $this->page, $this->getItemsOnPage());

src/DataPaging.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/DataProxy.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/DataSourceResult.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/DataSources/ArrayDataSource.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\DataSources;
 
 	use CzProject\Assert\Assert;

src/DataSources/LeanMapperQuery.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\DataSources;
 
 	use CzProject\Assert\Assert;

src/DataSources/MergedDataSource.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\DataSources;
 
 	use CzProject\Assert\Assert;

src/FilterCondition.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/FilterModifier.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/Filters/AbstractFilter.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Filters;
 
 	use CzProject\Assert\Assert;

src/Filters/MultiSelectFilter.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Filters;
 
 	use Inteve\DataGrid\IFilter;
@@ -37,7 +39,9 @@ public function setValue($value)
 			}
 
 			$values = explode(',', $value);
-			array_walk($values, ['Nette\Utils\Strings', 'trim']);
+			array_walk($values, function (string $value, $key) {
+				return \Nette\Utils\Strings::trim($value);
+			});
 			array_filter($values, function ($value) {
 				return $value !== '';
 			});

src/Filters/SelectFilter.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Filters;
 
 	use Inteve\DataGrid\IFilter;

src/Filters/TextFilter.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid\Filters;
 
 	use Inteve\DataGrid\IFilter;

src/Helpers.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use CzProject\Assert\Assert;

src/IColumn.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 
@@ -36,7 +38,7 @@ function getRowField();
 
 		/**
 		 * @param  array<string, mixed>|object $row
-		 * @return string
+		 * @return string|\Nette\Utils\Html
 		 */
 		function formatValue($row);
 

src/IDataSource.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 

src/IFilter.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 	use Nette\Forms\Controls\BaseControl;

src/LinkHelper.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 

src/exceptions.php

@@ -1,5 +1,7 @@
 <?php
 
+	declare(strict_types=1);
+
 	namespace Inteve\DataGrid;
 
 

tests/DataGrid/DataSources/ArrayDataSource.objects.phpt

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Inteve\DataGrid\DataSources\ArrayDataSource;
 use Tester\Assert;
 

tests/DataGrid/DataSources/ArrayDataSource.phpt

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Inteve\DataGrid\DataPaging;
 use Inteve\DataGrid\DataSources\ArrayDataSource;
 use Tester\Assert;

tests/DataGrid/DataSources/MergedDataSource.phpt

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Inteve\DataGrid\DataPaging;
 use Inteve\DataGrid\DataSources\ArrayDataSource;
 use Inteve\DataGrid\DataSources\MergedDataSource;

tests/bootstrap.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../vendor/autoload.php';
 
 Tester\Environment::setup();