Add support for PHP 8

Author: janbarasek

.github/workflows/coding-style.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           coverage: none
 
       - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress

.github/workflows/main.yml

@@ -19,12 +19,12 @@ jobs:
     - name: Install PHP
       uses: shivammathur/setup-php@master
       with:
-        php-version: 7.4
+        php-version: 8.0
 
     - name: Install composer deps
       run: |
         composer create-project nette/code-checker temp/code-checker ^3 --no-progress
-        composer create-project nette/coding-standard temp/coding-standard ^2 --no-progress
+        composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress
 
         # Install app deps
         composer install --no-interaction --prefer-dist

composer.json

@@ -9,12 +9,12 @@
 		}
 	],
 	"require": {
-		"php": "^7.4 || ^8.0"
+		"php": "^8.0"
 	},
 	"require-dev": {
-		"phpstan/phpstan": "^0.12.52",
+		"phpstan/phpstan": "^0.12.74",
 		"tracy/tracy": "^2.8",
-		"phpstan/phpstan-nette": "^0.12.9",
+		"phpstan/phpstan-nette": "^0.12.14",
 		"spaze/phpstan-disallowed-calls": "^1.1",
 		"roave/security-advisories": "dev-master"
 	},
@@ -23,11 +23,6 @@
 			"src/"
 		]
 	},
-	"config": {
-		"platform": {
-			"php": "7.4.0"
-		}
-	},
 	"scripts": {
 		"phpstan": [
 			"vendor/bin/phpstan analyse src -c phpstan.neon --level 8 --no-progress"

src/SelectboxItem.php

@@ -7,20 +7,14 @@
 
 final class SelectboxItem
 {
-	/** @var int|string */
-	private $id;
+	private int|string $id;
 
 	private string $name;
 
-	/** @var int|string|null */
-	private $parentId;
+	private int|string|null $parentId;
 
 
-	/**
-	 * @param int|string $id
-	 * @param int|string|null $parentId
-	 */
-	public function __construct($id, string $name, $parentId = null)
+	public function __construct(int|string $id, string $name, int|string|null $parentId = null)
 	{
 		$this->id = $id;
 		$this->name = $name;

src/SelectboxTree.php

@@ -60,7 +60,6 @@ public function process(array $data): array
 
 	/**
 	 * @param string[] $wheres
-	 * @return string
 	 */
 	public function sqlBuilder(
 		string $table,
@@ -96,10 +95,9 @@ public function setNameFormatter(NameFormatter $nameFormatter): void
 	 * Build category tree to simple selectbox array.
 	 *
 	 * @param string[][]|null[][]|null $categories
-	 * @param int|string|null $parent
 	 * @return mixed[][]
 	 */
-	private function serializeCategoriesToSelectbox(?array $categories, int $level = 0, $parent = null): array
+	private function serializeCategoriesToSelectbox(?array $categories, int $level = 0, int|string|null $parent = null): array
 	{
 		static $usedIds = [];