Merge branch '2.13.x' into 3.1.x

* 2.13.x: Fix a deprecation in console command return types Psalm 4.12.0, PHPStan 1.1.1
doctrine · Nov 9, 2021 · 0703eca · 0703eca
2 parents 4534d44 + 9c8f2b0
commit 0703eca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -40,14 +40,14 @@
     "require-dev": {
         "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2021.1",
-        "phpstan/phpstan": "1.0.2",
+        "phpstan/phpstan": "1.1.1",
         "phpstan/phpstan-strict-rules": "^1",
         "phpunit/phpunit": "9.5.10",
         "psalm/plugin-phpunit": "0.16.1",
         "squizlabs/php_codesniffer": "3.6.1",
         "symfony/cache": "^5.2|^6.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
-        "vimeo/psalm": "4.11.2"
+        "vimeo/psalm": "4.12.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

diff --git a/src/Tools/Console/Command/ReservedWordsCommand.php b/src/Tools/Console/Command/ReservedWordsCommand.php
@@ -133,6 +133,8 @@ protected function configure()
     /**
      * {@inheritdoc}
      *
+     * @return int
+     *
      * @throws Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)

diff --git a/src/Tools/Console/Command/RunSqlCommand.php b/src/Tools/Console/Command/RunSqlCommand.php
@@ -59,6 +59,8 @@ protected function configure()
     /**
      * {@inheritdoc}
      *
+     * @return int
+     *
      * @throws Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)