Merge pull request #79 from VBoss/upgrade-nette

Upgrade nette

Author: fprochazka

.gitignore

@@ -1,2 +1,3 @@
 vendor
 composer.lock
+tests/php.ini-local

.travis.yml

@@ -3,76 +3,61 @@ language: php
 sudo: false
 
 cache:
-    directories:
-        - $HOME/.composer/cache
+  directories:
+    - $HOME/.composer/cache
+    - $HOME/phpcs-cache
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   matrix:
-    - SYMFONY=4.* # dev
-    - SYMFONY=3.* # dev
-    - SYMFONY=2.* # dev
-    - SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable"
-    - SYMFONY=3.* COMPOSER_EXTRA_ARGS="--prefer-stable"
-    - SYMFONY=2.* COMPOSER_EXTRA_ARGS="--prefer-stable"
-    - SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
-    - SYMFONY=3.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
-    - SYMFONY=2.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
+    - RUN_TESTS=1 SYMFONY=4.* # dev
+    - RUN_TESTS=1 SYMFONY=3.* # dev
+    - RUN_TESTS=1 SYMFONY=2.* # dev
+    - RUN_TESTS=1 SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable"
+    - RUN_TESTS=1 SYMFONY=3.* COMPOSER_EXTRA_ARGS="--prefer-stable"
+    - RUN_TESTS=1 SYMFONY=2.* COMPOSER_EXTRA_ARGS="--prefer-stable"
+    - RUN_TESTS=1 SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
+    - RUN_TESTS=1 SYMFONY=3.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
+    - RUN_TESTS=1 SYMFONY=2.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
 
 matrix:
   fast_finish: true
   include:
-    - php: 7.2
+    - php: 7.3
       env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable" COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
-    - php: 7.2
-      env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable" PHPSTAN=1
-    - php: 7.2
-      env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable" CODING_STANDARD=1
+    - php: 7.3
+      env: RUN_TESTS=0 SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable" PHPSTAN=1
+    - php: 7.3
+      env: RUN_TESTS=0 SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable" CODING_STANDARD=1
   exclude:
-    - php: 7.2
+    - php: 7.3
       env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable"
-    - php: 7.0
-      env: SYMFONY=4.*
-    - php: 7.0
-      env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable"
-    - php: 7.0
-      env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
-    - php: 5.6
-      env: SYMFONY=4.*
-    - php: 5.6
-      env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-stable"
-    - php: 5.6
-      env: SYMFONY=4.* COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
   allow_failures:
-    - env: SYMFONY=4.*
-    - env: SYMFONY=3.*
-    - env: SYMFONY=2.*
+    - env: RUN_TESTS=1 SYMFONY=4.*
+    - env: RUN_TESTS=1 SYMFONY=3.*
+    - env: RUN_TESTS=1 SYMFONY=2.*
 
 before_install:
   - if [[ $SYMFONY = '2.*' ]]; then composer require --no-update symfony/console:^2.8; fi
   - if [[ $SYMFONY = '3.*' ]]; then composer require --no-update symfony/console:^3.0; fi
   - if [[ $SYMFONY = '4.*' ]]; then composer require --no-update symfony/console:^4.0; fi
+  - travis_retry composer self-update
 
 install:
-  - if [ "$CODING_STANDARD" = "1" ]; then composer require --dev --no-update kdyby/coding-standard:^1.0@dev; fi
-  - if [ "$PHPSTAN" = "1" ]; then composer require --dev --no-update phpstan/phpstan-shim:^0.7; fi
-  - travis_retry composer update --no-interaction --no-suggest --no-progress --prefer-dist $COMPOSER_EXTRA_ARGS
-  - travis_retry composer create-project --no-interaction jakub-onderka/php-parallel-lint /tmp/php-parallel-lint
-  - if [ "$COVERAGE" != "" ]; then travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
+  - travis_retry composer update --no-interaction --no-suggest --no-progress --prefer-dist $COMPOSER_EXTRA_ARGS # update because we may need --prefer-lowest option
 
 script:
-  - vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/
-  - php /tmp/php-parallel-lint/parallel-lint.php -e php,phpt --exclude vendor .
-  - if [ "$PHPSTAN" = "1" ]; then php vendor/phpstan/phpstan-shim/phpstan.phar analyse --ansi --no-progress -l7 -c phpstan.neon src tests/KdybyTests; fi
-  - if [ "$CODING_STANDARD" = "1" ]; then php vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 -sp src tests; fi
+  - if [ "$PHPSTAN" = "1" ]; then vendor/bin/phpstan analyse -l 2 -c phpstan.neon src tests/KdybyTests; fi
+  - if [ "$CODING_STANDARD" = "1" ]; then vendor/bin/phpcs --standard=ruleset.xml --cache=$HOME/phpcs-cache/.phpcs-cache --encoding=utf-8 -sp src tests/KdybyTests; fi
+  - if [ "$CODING_STANDARD" = "1" ]; then vendor/bin/parallel-lint -e php,phpt --exclude vendor .; fi
+  - if [ "$RUN_TESTS" = "1" ]; then vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/; fi
 
 after_script:
-  - if [ "$COVERAGE" != "" ]; then php /tmp/coveralls.phar --verbose --config tests/.coveralls.yml || true; fi
+  - if [ "$COVERAGE" != "" ]; then vendor/bin/php-coveralls --verbose --config tests/.coveralls.yml || true; fi
 
 after_failure:
   - 'for i in $(find ./tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done'

composer.json

@@ -17,22 +17,28 @@
 		"issues": "https://github.com/kdyby/console/issues"
 	},
 	"require": {
-		"php": "^5.6 || ^7.0",
-		"nette/di": "^2.4.8@dev",
-		"tracy/tracy": "^2.4@dev",
+		"php": ">=7.1",
+		"nette/di": "^2.4.10 || ^3.0",
+		"nette/routing": "^3.0.0",
+		"tracy/tracy": "^2.5 || ^3.0",
 		"kdyby/strict-objects": "^1.0",
 		"symfony/console": "~2.3 || ^3.0 || ^4.0"
 	},
 	"require-dev": {
-		"nette/application": "^2.4.9@dev",
-		"nette/bootstrap": "^2.4.5@dev",
-		"nette/caching": "^2.5@dev",
-		"nette/http": "^2.4.7@dev",
-		"nette/tester": "^2.0",
-		"kdyby/events": "^3.1.1@dev",
-		"symfony/event-dispatcher": "~2.3 || ^3.0 || ^4.0"
+		"nette/application": "^3.0",
+		"nette/bootstrap": "^2.4.5 || ^3.0",
+		"nette/caching": "^2.5 || ^3.0",
+		"nette/http": "^3.0",
+		"kdyby/events": "^3.2@dev",
+		"symfony/event-dispatcher": "~2.3 || ^3.0 || ^4.0",
+
+		"nette/tester": "^2.2",
+		"phpstan/phpstan-shim": "^0.11.5",
+		"kdyby/coding-standard": "dev-master",
+		"php-coveralls/php-coveralls": "^2.1",
+		"jakub-onderka/php-parallel-lint": "^1.0",
+		"typo3/class-alias-loader": "^1.0"
 	},
-	"minimum-stability": "dev",
 	"suggest": {
 		"nette/http": "For faking the url of the request in cli"
 	},
@@ -41,8 +47,7 @@
 			"Kdyby\\Console\\": "src/"
 		},
 		"classmap": [
-			"src/CliPresenter.php",
-			"src/exceptions.php"
+			"src/CliPresenter.php"
 		]
 	},
 	"autoload-dev": {
@@ -53,9 +58,10 @@
 			"tests/KdybyTests/"
 		]
 	},
+	"minimum-stability": "dev",
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.7-dev"
+			"dev-master": "2.8-dev"
 		}
 	}
 }

phpstan.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		- '#Constant TEMP_DIR not found#'
-		- '#Class Nette\\Framework not found#'
-		# Nette events are not annotated
-		- '#Call to an undefined method Nette\\Application\\Application::onShutdown\(\)#'
-		# it does, it just isn't annotated
-		- '#Static property Tracy\\Dumper::\$terminalColors \(mixed\[\]\) does not accept false#'
-		# intentional
-		- '#Constructor of class KdybyTests\\Console\\.*?Command.*? has an unused parameter *.?#'
+
+	excludes_analyse:
+		- *src/DI/ClassAliasMap.php

ruleset.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <ruleset name="Kdyby/Console">
-	<rule ref="vendor/kdyby/coding-standard/KdybyCodingStandard/ruleset-5.6.xml"/>
+	<rule ref="vendor/kdyby/coding-standard/ruleset.xml"/>
 </ruleset>

src/Application.php

@@ -12,7 +12,6 @@
 
 use Nette\Application\Application as NetteApplication;
 use Nette\DI\Container;
-use Nette\Framework as NetteFramework;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\InputInterface;
@@ -49,9 +48,16 @@ class Application extends \Symfony\Component\Console\Application
 	 * @param string $name
 	 * @param string $version
 	 */
-	public function __construct($name = 'Nette Framework', $version = NULL)
+	public function __construct($name = 'Nette Framework', $version = 'UNKNOWN')
 	{
-		parent::__construct($name, $version ?: (class_exists(NetteFramework::class) ? NetteFramework::VERSION : 'UNKNOWN'));
+		if ( ! $version && \class_exists(\Nette\DI\Definitions\ServiceDefinition::class)) {
+			$version = \Kdyby\Console\DI\ConsoleExtension::NETTE_VERSION_30;
+
+		} elseif ( ! $version && \class_exists(\Nette\DI\ServiceDefinition::class)) {
+			$version = \Kdyby\Console\DI\ConsoleExtension::NETTE_VERSION_24;
+		}
+
+		parent::__construct($name, $version);
 
 		$this->setCatchExceptions(FALSE);
 		$this->setAutoExit(FALSE);
@@ -68,7 +74,7 @@ public function find($name)
 			return parent::find($name);
 
 		} catch (\InvalidArgumentException $e) {
-			throw new \Kdyby\Console\UnknownCommandException($e->getMessage(), $e->getCode(), $e);
+			throw new Exception\UnknownCommandException($e->getMessage(), $e->getCode(), $e);
 		}
 	}
 
@@ -86,7 +92,7 @@ public function run(InputInterface $input = NULL, OutputInterface $output = NULL
 		if ($input->hasParameterOption('--debug-mode')) {
 			if ($input->hasParameterOption(['--debug-mode=no', '--debug-mode=off', '--debug-mode=false', '--debug-mode=0'])) {
 				if ($this->serviceLocator->parameters['debugMode']) {
-					$this->renderException(new \Kdyby\Console\InvalidApplicationModeException(
+					$this->renderException(new Exception\InvalidApplicationModeException(
 						'The app is running in debug mode. You have to use Kdyby\Console\DI\BootstrapHelper in app/bootstrap.php, ' .
 						'Kdyby\Console cannot switch already running app to production mode.'
 					), $output);
@@ -96,7 +102,7 @@ public function run(InputInterface $input = NULL, OutputInterface $output = NULL
 
 			} else {
 				if (!$this->serviceLocator->parameters['debugMode']) {
-					$this->renderException(new \Kdyby\Console\InvalidApplicationModeException(
+					$this->renderException(new Exception\InvalidApplicationModeException(
 						'The app is running in production mode. You have to use Kdyby\Console\DI\BootstrapHelper in app/bootstrap.php, ' .
 						'Kdyby\Console cannot switch already running app to debug mode.'
 					), $output);
@@ -113,7 +119,7 @@ public function run(InputInterface $input = NULL, OutputInterface $output = NULL
 		try {
 			return parent::run($input, $output);
 
-		} catch (\Kdyby\Console\UnknownCommandException $e) {
+		} catch (Exception\UnknownCommandException $e) {
 			$this->renderException($e->getPrevious(), $output);
 			list($message) = explode("\n", $e->getMessage());
 			Debugger::log($message, Debugger::ERROR);

src/CliPresenter.php

@@ -25,6 +25,11 @@ class CliPresenter extends \Nette\Application\UI\Presenter
 
 	const NAME = 'Kdyby:Cli';
 
+	/**
+	 * @var string
+	 */
+	public $name = \KdybyModule\CliPresenter::NAME;
+
 	/**
 	 * @var \Kdyby\Console\Application|NULL
 	 */
@@ -57,12 +62,12 @@ public function injectConsole(
 	public function actionDefault()
 	{
 		if ($this->console === NULL || $this->application === NULL) {
-			throw new \Kdyby\Console\InvalidStateException('Before running the presenter, call injectConsole() with required dependencies.');
+			throw new \Kdyby\Console\Exception\InvalidStateException('Before running the presenter, call injectConsole() with required dependencies.');
 		}
 
 		$request = $this->getRequest();
 		if ($request === NULL) {
-			throw new \Kdyby\Console\InvalidStateException(sprintf('Do not call %s directly, use %s::run()', __FUNCTION__, __CLASS__));
+			throw new \Kdyby\Console\Exception\InvalidStateException(sprintf('Do not call %s directly, use %s::run()', __FUNCTION__, __CLASS__));
 		}
 
 		$params = $request->getParameters();

src/CliResponse.php

@@ -60,10 +60,12 @@ public function getExitCode()
 	 * @param \Nette\Http\IResponse $httpResponse
 	 * @return void
 	 */
-	public function send(IRequest $httpRequest, IResponse $httpResponse)
+	public function send(IRequest $httpRequest, IResponse $httpResponse): void
 	{
 		if ($this->application !== NULL) {
-			$this->application->onShutdown($this->application);
+			foreach ($this->application->onShutdown as $handler) {
+				$handler($this->application);
+			}
 		}
 
 		exit($this->exitCode);

src/CliRouter.php

@@ -10,16 +10,12 @@
 
 namespace Kdyby\Console;
 
-use KdybyModule\CliPresenter;
-use Nette\Application\Request as AppRequest;
-use Nette\Http\IRequest;
-use Nette\Http\Url;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class CliRouter implements \Nette\Application\IRouter
+class CliRouter implements \Nette\Routing\Router
 {
 
 	use \Kdyby\StrictObjects\Scream;
@@ -58,7 +54,7 @@ public function setInput(InputInterface $input)
 	/**
 	 * Maps HTTP request to a Request object.
 	 */
-	public function match(IRequest $httpRequest)
+	public function match(\Nette\Http\IRequest $httpRequest): ?array
 	{
 		if (!in_array(PHP_SAPI, $this->allowedMethods, TRUE)) {
 			return NULL;
@@ -78,17 +74,19 @@ public function match(IRequest $httpRequest)
 			$output = new ConsoleOutput();
 		}
 
-		return new AppRequest(CliPresenter::NAME, Application::CLI_SAPI, [
-			'action' => 'default',
-			'input' => $input,
-			'output' => $output,
-		]);
+		return [
+			'action'    => 'default',
+			'method'    => \Kdyby\Console\Application::CLI_SAPI,
+			'presenter' => \KdybyModule\CliPresenter::NAME,
+			'input'     => $input,
+			'output'    => $output,
+		];
 	}
 
 	/**
 	 * Constructs absolute URL from Request object.
 	 */
-	public function constructUrl(AppRequest $appRequest, Url $refUrl)
+	public function constructUrl(array $params, \Nette\Http\UrlScript $refUrl) : ?string
 	{
 		return NULL;
 	}

src/DI/ClassAliasMap.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types = 1);
+
+return [
+	\Kdyby\Console\Exception::class                         => \Kdyby\Console\Exception\Exception::class,
+	\Kdyby\Console\InvalidApplicationModeException::class   => \Kdyby\Console\Exception\InvalidApplicationModeException::class,
+	\Kdyby\Console\InvalidArgumentException::class          => \Kdyby\Console\Exception\InvalidArgumentException::class,
+	\Kdyby\Console\InvalidStateException::class             => \Kdyby\Console\Exception\InvalidStateException::class,
+];