From 0e1517331e0c4ec7143141c3fa264d76941b8b26 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 7 Nov 2021 13:51:46 +0100
Subject: [PATCH 1/2] Psalm 4.12.0, PHPStan 1.1.1

Signed-off-by: Alexander M. Turek <me@derrabus.de>
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index fcfb4085d76..746c2c8977d 100644
--- a/composer.json
+++ b/composer.json
@@ -41,13 +41,13 @@
     "require-dev": {
         "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2021.1",
-        "phpstan/phpstan": "1.0.2",
+        "phpstan/phpstan": "1.1.1",
         "phpunit/phpunit": "^7.5.20|^8.5|9.5.10",
         "psalm/plugin-phpunit": "0.16.1",
         "squizlabs/php_codesniffer": "3.6.1",
         "symfony/cache": "^4.4",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.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."

From 65029a84fb0d053588c44349ece3fc1ac106bf49 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 9 Nov 2021 09:47:38 +0100
Subject: [PATCH 2/2] Fix a deprecation in console command return types

---
 lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php       | 2 ++
 .../DBAL/Tools/Console/Command/ReservedWordsCommand.php         | 2 ++
 lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
index 26456bde0ce..2f237572c06 100644
--- a/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
+++ b/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
@@ -50,6 +50,8 @@ protected function configure()
 
     /**
      * {@inheritdoc}
+     *
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
index 4553a0a701e..c2fe41051ce 100644
--- a/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
+++ b/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
@@ -145,6 +145,8 @@ protected function configure()
 
     /**
      * {@inheritdoc}
+     *
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
index 8cc24f3007a..55c13e4ec4a 100644
--- a/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
+++ b/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
@@ -67,6 +67,8 @@ protected function configure()
 
     /**
      * {@inheritdoc}
+     *
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {