Merge pull request #92 from pechondra/3813-php-80

Support for PHP 8.0

.github/workflows/php-package-ci.yml

@@ -0,0 +1,23 @@
+name: Package CI
+
+on:
+  pull_request:
+
+jobs:
+  checks:
+    name: Checks
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [ 7.4, 8.0 ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - run: make composer
+
+      - run: make phpstan
+
+      - run: make tester

Makefile

@@ -0,0 +1,13 @@
+composer:
+	composer validate
+	composer update --no-interaction --prefer-dist
+
+cs:
+	vendor/bin/phpcs --standard=./ruleset.xml --cache=${HOME}/phpcs-cache/.phpcs-cache --encoding=utf-8 -sp src tests/KdybyTests
+	vendor/bin/parallel-lint -e php,phpt --exclude vendor .
+
+phpstan:
+	vendor/bin/phpstan analyse src tests/KdybyTests
+
+tester:
+	vendor/bin/tester -s -c ./tests/php.ini-unix ./tests/KdybyTests/

composer.json

@@ -17,26 +17,26 @@
 		"issues": "https://github.com/kdyby/console/issues"
 	},
 	"require": {
-		"php": ">=7.1",
-		"nette/di": "^2.4.10 || ^3.0",
+		"php": "^7.4 | ^8.0",
+		"nette/di": "^3.0",
 		"nette/routing": "^3.0.0",
-		"tracy/tracy": "^2.5 || ^3.0",
-		"nette/utils": "~3.1.0",
-		"symfony/console": "~2.3 || ^3.0 || < 4.3"
+		"tracy/tracy": "^2.8 || ^3.0",
+		"nette/utils": "^3.0",
+		"symfony/console": "~2.3 || ^3.0 || ^4.0"
 	},
 	"require-dev": {
-		"nette/application": "3.0.*",
-		"nette/bootstrap": "^2.4.5 || ^3.0",
-		"nette/caching": "^2.5 || ^3.0",
+		"nette/application": "^3.0",
+		"nette/bootstrap": "^3.0",
+		"nette/caching": "^3.0",
 		"nette/http": "^3.0",
-		"kdyby/events": "^3.2@dev",
-		"symfony/event-dispatcher": "~2.3 || ^3.0 || ^4.0 < 4.3",
+		"kdyby/events": "dev-patch-1 as 3.2.99",
+		"symfony/event-dispatcher": "~2.3 || ^3.0 || ^4.0",
 
 		"nette/tester": "^2.2",
-		"phpstan/phpstan-shim": "^0.11.5",
-		"kdyby/coding-standard": "dev-master",
+		"phpstan/phpstan": "^0.12.88",
+		"doctrine/coding-standard": "8.2.*",
 		"php-coveralls/php-coveralls": "^2.1",
-		"jakub-onderka/php-parallel-lint": "^1.0",
+		"php-parallel-lint/php-parallel-lint": "^v1.2.0",
 		"typo3/class-alias-loader": "^1.0"
 	},
 	"suggest": {
@@ -58,7 +58,12 @@
 			"tests/KdybyTests/"
 		]
 	},
-	"minimum-stability": "dev",
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "https://github.com/dakorpar/Events.git"
+		}
+	],
 	"extra": {
 		"branch-alias": {
 			"dev-master": "2.8-dev"

tests/KdybyTests/Console/CliRouterTest.phpt

@@ -45,7 +45,7 @@ class CliRouterTest extends \Tester\TestCase
 		/** @var \Nette\Application\Routers\RouteList $router */
 		Assert::true($router instanceof RouteList);
 
-		[$cliRouter] = iterator_to_array($router->getIterator());
+		[$cliRouter] = $router->getRouters();
 		/** @var \Kdyby\Console\CliRouter $cliRouter */
 		Assert::true($cliRouter instanceof CliRouter);