bug #24951 [Console] Fixed exit code with non-integer throwable code (wouterj)

fabpot · fabpot · commit 033e7529ccbc · 2017-12-11T14:26:04.000-08:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Console] Fixed exit code with non-integer throwable code | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The exception/error code in PHP doesn't have to be an integer: > Returns the exception code as integer in Exception but possibly as other type in Exception descendants (for example as string in PDOException). > http://php.net/manual/en/exception.getcode.php#refsect1-exception.getcode-returnvalues This means that a "Return value of Symfony\Component\Console\Event\ConsoleErrorEvent::getExitCode() must be of the type integer, string returned" error is shown when e.g. an uncatched PDOException is handled by the console error event. Commits ------- ca86e65 Fixed exit code with non-integer throwable code
diff --git a/src/Symfony/Component/Console/Event/ConsoleErrorEvent.php b/src/Symfony/Component/Console/Event/ConsoleErrorEvent.php
@@ -53,6 +53,6 @@ public function setExitCode(int $exitCode): void
 
     public function getExitCode(): int
     {
-        return null !== $this->exitCode ? $this->exitCode : ($this->error->getCode() ?: 1);
+        return null !== $this->exitCode ? $this->exitCode : (is_int($this->error->getCode()) ? $this->error->getCode() : 1);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,6 @@ public function setExitCode(int $exitCode): void`
`53`	`53`
`54`	`54`	`public function getExitCode(): int`
`55`	`55`	`{`
`56`		`- return null !== $this->exitCode ? $this->exitCode : ($this->error->getCode() ?: 1);`
	`56`	`+ return null !== $this->exitCode ? $this->exitCode : (is_int($this->error->getCode()) ? $this->error->getCode() : 1);`
`57`	`57`	`}`
`58`	`58`	`}`