Merge pull request #3706 from dmaicher/cmd-exit-code

add missing exit codes to ensure Symfony 5 compatibility
doctrine · Oct 28, 2019 · d82b6aa · d82b6aa
2 parents ce401dd + 2f55925
commit d82b6aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
@@ -58,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $fileNames = $input->getArgument('file');
 
         if ($fileNames === null) {
-            return null;
+            return 0;
         }
 
         foreach ((array) $fileNames as $fileName) {
@@ -133,6 +133,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        return null;
+        return 0;
     }
 }
diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
@@ -68,5 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->write(Dumper::dump($resultSet, (int) $depth));
+
+        return 0;
     }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Tools/Console/RunSqlCommandTest.php b/tests/Doctrine/Tests/DBAL/Tools/Console/RunSqlCommandTest.php
@@ -70,10 +70,11 @@ public function testSelectStatementsPrintsResult() : void
     {
         $this->expectConnectionFetchAll();
 
-        $this->commandTester->execute([
+        $exitCode = $this->commandTester->execute([
             'command' => $this->command->getName(),
             'sql' => 'SELECT 1',
         ]);
+        $this->assertSame(0, $exitCode);
 
         self::assertRegExp('@int.*1.*@', $this->commandTester->getDisplay());
         self::assertRegExp('@array.*1.*@', $this->commandTester->getDisplay());
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             $output->write(Dumper::dump($resultSet, (int) $depth));
+            return 0;
         }
     }