Merge branch 'master' into 3.0

dev-tools/composer.json

@@ -9,7 +9,7 @@
         "maglnet/composer-require-checker": "2.0.0",
         "mi-schi/phpmd-extension": "^4.3",
         "phpmd/phpmd": "^2.9",
-        "phpstan/phpstan": "0.12.18",
+        "phpstan/phpstan": "0.12.19",
         "phpstan/phpstan-phpunit": "^0.12.8"
     },
     "config": {

phpstan.neon

@@ -32,9 +32,6 @@ parameters:
         -
             message: '/^\$this\(PhpCsFixer\\Tokenizer\\Tokens\) does not accept PhpCsFixer\\Tokenizer\\Token\|null\.$/'
             path: src/Tokenizer/Tokens.php
-        -
-            message: '/^Ternary operator condition is always true\.$/'
-            path: src/Console/Application.php
         -
             message: '/^Class Test\dConfig not found\.$/'
             path: tests/Console/ConfigurationResolverTest.php

src/Console/Application.php

@@ -92,7 +92,7 @@ final class Application extends BaseApplication
     {
         $version = implode('', [
             parent::getLongVersion(),
-            self::VERSION_CODENAME ? sprintf(' <info>%s</info>', self::VERSION_CODENAME) : '',
+            self::VERSION_CODENAME ? sprintf(' <info>%s</info>', self::VERSION_CODENAME) : '', // @phpstan-ignore-line to avoid `Ternary operator condition is always true|false.`
             ' by <comment>Fabien Potencier</comment> and <comment>Dariusz Ruminski</comment>',
         ]);