App: upgrade to PHP 8.1, phpstan level 9

contributte · Mar 7, 2023 · 581cd29 · 581cd29
1 parent 2cd74d3
commit 581cd29
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 29 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,10 +23,3 @@ jobs:
     with:
         php: "8.1"
         database: tests
-
-  test80:
-    name: "Nette Tester"
-    uses: contributte/.github/.github/workflows/nette-tester-mysql.yml@v1
-    with:
-        php: "8.0"
-        database: tests
diff --git a/app/Model/Utils/DateTime.php b/app/Model/Utils/DateTime.php
@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace App\Model\Utils;
+
+use DateTimeInterface;
+use Nette\Utils\DateTime as NetteDateTime;
+
+class DateTime extends NetteDateTime
+{
+
+	public static function fromSafe(string|int|DateTimeInterface|null $time): ?static
+	{
+		if ($time === null) {
+			return null;
+		}
+
+		return self::from($time);
+	}
+
+}
diff --git a/app/Model/Utils/Types.php b/app/Model/Utils/Types.php
@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace App\Model\Utils;
+
+use InvalidArgumentException;
+
+class Types
+{
+
+	public static function forceInt(mixed $input): int
+	{
+		if (!is_int($input)) {
+			throw new InvalidArgumentException(sprintf('Expect int, given %s.', gettype($input)));
+		}
+
+		return $input;
+	}
+
+	public static function forceNumber(mixed $input): float|int
+	{
+		if (!is_numeric($input) || is_string($input)) {
+			throw new InvalidArgumentException(sprintf('Expect number, given %s.', gettype($input)));
+		}
+
+		return $input;
+	}
+
+}
diff --git a/app/Presenters/AbstractPresenter.php b/app/Presenters/AbstractPresenter.php
@@ -15,10 +15,8 @@ abstract class AbstractPresenter extends Presenter
 
 	abstract public function createComponentGrid(): DataGrid;
 
-	public function changeStatus(mixed $id, string $newStatus): void
+	public function changeStatus(int $id, string $newStatus): void
 	{
-		$id = (int) $id;
-
 		if (in_array($newStatus, ['active', 'inactive', 'deleted'], true)) {
 			$data = ['status' => $newStatus];
 

diff --git a/app/Presenters/BasicPresenter.php b/app/Presenters/BasicPresenter.php
@@ -2,8 +2,8 @@
 
 namespace App\Presenters;
 
+use App\Model\Utils\DateTime;
 use App\UI\TEmptyLayoutView;
-use DateTime;
 use Dibi\Row;
 use Ublaboo\DataGrid\DataGrid;
 
@@ -34,7 +34,7 @@ public function createComponentGrid(): DataGrid
 			->setFormat('j. n. Y');
 
 		$grid->addColumnNumber('age', 'Age')
-			->setRenderer(fn (Row $row): int => $row['birth_date']->diff(new DateTime())->y);
+			->setRenderer(fn (Row $row): ?int => DateTime::fromSafe($row->asDateTime('birth_date'))?->diff(new DateTime())->y);
 
 		return $grid;
 	}

diff --git a/app/Presenters/ColumnsPresenter.php b/app/Presenters/ColumnsPresenter.php
@@ -2,8 +2,9 @@
 
 namespace App\Presenters;
 
+use App\Model\Utils\DateTime;
+use App\Model\Utils\Types;
 use App\UI\TEmptyLayoutView;
-use DateTime;
 use Dibi\Fluent;
 use Dibi\Row;
 use Ublaboo\DataGrid\AggregationFunction\IAggregationFunction;
@@ -61,7 +62,7 @@ public function createComponentGrid(): DataGrid
 			->setSortable();
 
 		$grid->addColumnNumber('age', 'Age')
-			->setRenderer(fn (Row $row): int => $row['birth_date']->diff(new DateTime())->y);
+			->setRenderer(fn (Row $row): ?int => DateTime::fromSafe($row->asDateTime('birth_date'))?->diff(new DateTime())->y);
 
 		$grid->setColumnsHideable();
 
@@ -103,15 +104,15 @@ public function processDataSource(mixed $dataSource): void
 						throw new UnexpectedValueException();
 					}
 
-					$this->idsSum = (int) $dataSource->getConnection()
+					$this->idsSum = Types::forceInt($dataSource->getConnection()
 						->select('SUM([id])')
 						->from($dataSource, '_')
-						->fetchSingle();
+						->fetchSingle());
 
-					$this->avgAge = round((float) $dataSource->getConnection()
+					$this->avgAge = round(Types::forceNumber($dataSource->getConnection()
 						->select('AVG(YEAR([birth_date]))')
 						->from($dataSource, '_')
-						->fetchSingle());
+						->fetchSingle()));
 				}
 
 				public function renderResult(string $key): string

diff --git a/app/Presenters/EditPresenter.php b/app/Presenters/EditPresenter.php
@@ -2,6 +2,7 @@
 
 namespace App\Presenters;
 
+use App\Model\Utils\DateTime;
 use App\UI\TEmptyLayoutView;
 use Dibi\Row;
 use Nette\Forms\Container;
@@ -67,7 +68,7 @@ public function createComponentGrid(): DataGrid
 			$container->setDefaults([
 				'id' => $row['id'],
 				'name' => $row['name'],
-				'birth_date' => $row['birth_date']->format('j. n. Y'),
+				'birth_date' => DateTime::fromSafe($row->asDateTime('birth_date'))?->format('j. n. Y'),
 				'link' => $row['name'],
 				'status' => $row['status'],
 			]);

diff --git a/app/Presenters/FiltersPresenter.php b/app/Presenters/FiltersPresenter.php
@@ -2,8 +2,8 @@
 
 namespace App\Presenters;
 
+use App\Model\Utils\DateTime;
 use App\UI\TEmptyLayoutView;
-use DateTime;
 use Dibi\Fluent;
 use Dibi\Row;
 use Nette\Utils\ArrayHash;
@@ -48,7 +48,7 @@ public function createComponentGrid(): DataGrid
 			->setFilterDateRange();
 
 		$grid->addColumnNumber('age', 'Age')
-			->setRenderer(fn (Row $row): int => $row['birth_date']->diff(new DateTime())->y)
+			->setRenderer(fn (Row $row): ?int => DateTime::fromSafe($row->asDateTime('birth_date'))?->diff(new DateTime())->y)
 			->setFilterRange()
 			->setCondition(function (Fluent $fluent, ArrayHash $values): void {
 				if ((bool) $values['from']) {

diff --git a/app/Presenters/LocalizationPresenter.php b/app/Presenters/LocalizationPresenter.php
@@ -2,8 +2,8 @@
 
 namespace App\Presenters;
 
+use App\Model\Utils\DateTime;
 use App\UI\TEmptyLayoutView;
-use DateTime;
 use Dibi\Row;
 use Ublaboo\DataGrid\DataGrid;
 use Ublaboo\DataGrid\Localization\SimpleTranslator;
@@ -35,7 +35,7 @@ public function createComponentGrid(): DataGrid
 			->setFormat('j. n. Y');
 
 		$grid->addColumnNumber('age', 'Age')
-			->setRenderer(fn (Row $row): int => $row['birth_date']->diff(new DateTime())->y);
+			->setRenderer(fn (Row $row): ?int => DateTime::fromSafe($row->asDateTime('birth_date'))?->diff(new DateTime())->y);
 
 		$translator = new SimpleTranslator([
 			'ublaboo_datagrid.no_item_found_reset' => 'Žádné položky nenalezeny. Filtr můžete vynulovat',

diff --git a/app/Presenters/TreeViewPresenter.php b/app/Presenters/TreeViewPresenter.php
@@ -71,7 +71,7 @@ public function createComponentGrid(): DataGrid
 	/**
 	 * @return Fluent<mixed>
 	 */
-	public function getChildren(mixed $parentCategoryId): Fluent
+	public function getChildren(int $parentCategoryId): Fluent
 	{
 		$join = $this->dibiConnection->select('COUNT(id) AS count, parent_category_id')
 			->from('categories')
@@ -82,10 +82,10 @@ public function getChildren(mixed $parentCategoryId): Fluent
 			->from('categories', 'c')
 			->leftJoin($join, 'c_b')
 			->on('c_b.parent_category_id = c.id')
-			->where('c.parent_category_id = ?', (int) $parentCategoryId);
+			->where('c.parent_category_id = ?', $parentCategoryId);
 	}
 
-	public function handleSort(mixed $itemId, mixed $prevId, mixed $nextId, mixed $parentId): void
+	public function handleSort(int $itemId, int $prevId, int $nextId, int $parentId): void
 	{
 		$this->flashMessage(
 			sprintf(

diff --git a/app/UI/TEmptyLayoutView.php b/app/UI/TEmptyLayoutView.php
@@ -17,7 +17,7 @@ public function renderDefault(): void
 	{
 		$request = $this->getRequest();
 
-		if ($request->getParameter('inFrame') === true) {
+		if ($request !== null && $request->getParameter('inFrame') === true) {
 			$this->setLayout(__DIR__ . '/../templates/@layout.inFrame.latte');
 		}
 	}

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "type": "project",
   "require": {
-    "php": ">= 8.0",
+    "php": ">= 8.1",
 
     "nette/application": "^3.1.0",
     "nette/bootstrap": "^3.2.0",

diff --git a/phpstan.neon b/phpstan.neon
@@ -6,7 +6,15 @@ includes:
 	- vendor/phpstan/phpstan-dibi/extension.neon
 
 parameters:
-	level: 8
+	level: 9
+	phpVersion: 80100
+
+	tmpDir: %currentWorkingDirectory%/temp/phpstan
 
 	paths:
 		- app
+
+	fileExtensions:
+		- php
+
+	ignoreErrors: