diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source 
* 3.3:
  [Form] fix how form type is referenced in test
  [Console] Fix console tests by adding the missing condition
This commit is contained in:
Nicolas Grekas 2017-12-12 09:58:07 +01:00
commit 55374b5f36
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Console/Event/ConsoleErrorEvent.php
View File

@ -78,6 +78,6 @@ final class ConsoleErrorEvent extends ConsoleEvent
*/
public function getExitCode()
{
return null !== $this->exitCode ? $this->exitCode : (is_int($this->error->getCode()) ? $this->error->getCode() : 1);
return null !== $this->exitCode ? $this->exitCode : (is_int($this->error->getCode()) && 0 !== $this->error->getCode() ? $this->error->getCode() : 1);
}
}

2
src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
View File

@ -1916,7 +1916,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
public function testMoneyWithoutCurrency()
{
$form = $this->factory->createNamed('name', 'money', 1234.56, array(
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, array(
'currency' => false,
));