Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 8e67f1bdc701 · 2017-12-12T09:58:23.000+01:00
* 3.4:
  [Form] fix how form type is referenced in test
  [Console] Fix console tests by adding the missing condition
diff --git a/Tests/AbstractBootstrap3LayoutTest.php b/Tests/AbstractBootstrap3LayoutTest.php
@@ -1916,7 +1916,7 @@ public function testMoney()
 
     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,
         ));
 

Original file line number	Diff line number	Diff line change
`@@ -1916,7 +1916,7 @@ public function testMoney()`
`1916`	`1916`
`1917`	`1917`	`public function testMoneyWithoutCurrency()`
`1918`	`1918`	`{`
`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(`
`1920`	`1920`	`'currency' => false,`
`1921`	`1921`	`));`
`1922`	`1922`