Skip to content

Commit 55374b5

Browse files
Merge branch '3.3' into 3.4
* 3.3: [Form] fix how form type is referenced in test [Console] Fix console tests by adding the missing condition
2 parents 6aa18bf + 33f1698 commit 55374b5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Symfony/Component/Console/Event/ConsoleErrorEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ public function setExitCode($exitCode)
7878
*/
7979
public function getExitCode()
8080
{
81-
return null !== $this->exitCode ? $this->exitCode : (is_int($this->error->getCode()) ? $this->error->getCode() : 1);
81+
return null !== $this->exitCode ? $this->exitCode : (is_int($this->error->getCode()) && 0 !== $this->error->getCode() ? $this->error->getCode() : 1);
8282
}
8383
}

src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ public function testMoney()
19161916

19171917
public function testMoneyWithoutCurrency()
19181918
{
1919-
$form = $this->factory->createNamed('name', 'money', 1234.56, array(
1919+
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, array(
19201920
'currency' => false,
19211921
));
19221922

0 commit comments

Comments
 (0)