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
This commit is contained in:
commit
55374b5f36
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
));
|
||||
|
||||
|
Reference in New Issue
Block a user