Merge branch '2.8'

nicolas-grekas · nicolas-grekas · commit fdb419e918bf · 2015-11-30T15:11:44.000+01:00
* 2.8:
  Fix BC for the default root form name

Conflicts:
	src/Symfony/Component/Form/FormFactory.php
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -65,7 +65,11 @@ public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Typ
             throw new UnexpectedTypeException($type, 'string');
         }
 
-        return $this->createNamedBuilder(StringUtil::fqcnToBlockPrefix($type), $type, $data, $options);
+        if (null === $name = $this->registry->getType($type)->getBlockPrefix()) {
+            $name = StringUtil::fqcnToBlockPrefix($type);
+        }
+
+        return $this->createNamedBuilder($name, $type, $data, $options);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -169,13 +169,52 @@ public function testCreateThrowsUnderstandableException()
         $this->factory->create(new \stdClass());
     }
 
+    public function testCreateUsesBlockPrefixIfTypeGivenAsString()
+    {
+        $options = array('a' => '1', 'b' => '2');
+        $resolvedOptions = array('a' => '2', 'b' => '3');
+
+        // the interface does not have the method, so use the real class
+        $resolvedType = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormType')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $resolvedType->expects($this->any())
+            ->method('getBlockPrefix')
+            ->willReturn('TYPE_PREFIX');
+
+        $this->registry->expects($this->any())
+            ->method('getType')
+            ->with('TYPE')
+            ->will($this->returnValue($resolvedType));
+
+        $resolvedType->expects($this->once())
+            ->method('createBuilder')
+            ->with($this->factory, 'TYPE_PREFIX', $options)
+            ->will($this->returnValue($this->builder));
+
+        $this->builder->expects($this->any())
+            ->method('getOptions')
+            ->will($this->returnValue($resolvedOptions));
+
+        $resolvedType->expects($this->once())
+            ->method('buildForm')
+            ->with($this->builder, $resolvedOptions);
+
+        $this->builder->expects($this->once())
+            ->method('getForm')
+            ->will($this->returnValue('FORM'));
+
+        $this->assertSame('FORM', $this->factory->create('TYPE', null, $options));
+    }
+
     public function testCreateUsesTypeNameIfTypeGivenAsString()
     {
         $options = array('a' => '1', 'b' => '2');
         $resolvedOptions = array('a' => '2', 'b' => '3');
         $resolvedType = $this->getMockResolvedType();
 
-        $this->registry->expects($this->once())
+        $this->registry->expects($this->any())
             ->method('getType')
             ->with('TYPE')
             ->will($this->returnValue($resolvedType));
@@ -206,7 +245,7 @@ public function testCreateStripsNamespaceOffTypeName()
         $resolvedOptions = array('a' => '2', 'b' => '3');
         $resolvedType = $this->getMockResolvedType();
 
-        $this->registry->expects($this->once())
+        $this->registry->expects($this->any())
             ->method('getType')
             ->with('Vendor\Name\Space\UserForm')
             ->will($this->returnValue($resolvedType));
@@ -237,7 +276,7 @@ public function testCreateStripsTypeSuffixOffTypeName()
         $resolvedOptions = array('a' => '2', 'b' => '3');
         $resolvedType = $this->getMockResolvedType();
 
-        $this->registry->expects($this->once())
+        $this->registry->expects($this->any())
             ->method('getType')
             ->with('Vendor\Name\Space\UserType')
             ->will($this->returnValue($resolvedType));
@@ -268,7 +307,7 @@ public function testCreateDoesNotStripTypeSuffixIfResultEmpty()
         $resolvedOptions = array('a' => '2', 'b' => '3');
         $resolvedType = $this->getMockResolvedType();
 
-        $this->registry->expects($this->once())
+        $this->registry->expects($this->any())
             ->method('getType')
             ->with('Vendor\Name\Space\Type')
             ->will($this->returnValue($resolvedType));
@@ -299,7 +338,7 @@ public function testCreateConvertsTypeToUnderscoreSyntax()
         $resolvedOptions = array('a' => '2', 'b' => '3');
         $resolvedType = $this->getMockResolvedType();
 
-        $this->registry->expects($this->once())
+        $this->registry->expects($this->any())
             ->method('getType')
             ->with('Vendor\Name\Space\MyProfileHTMLType')
             ->will($this->returnValue($resolvedType));

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,11 @@ public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Typ`
`65`	`65`	`throw new UnexpectedTypeException($type, 'string');`
`66`	`66`	`}`
`67`	`67`
`68`		`- return $this->createNamedBuilder(StringUtil::fqcnToBlockPrefix($type), $type, $data, $options);`
	`68`	`+ if (null === $name = $this->registry->getType($type)->getBlockPrefix()) {`
	`69`	`+ $name = StringUtil::fqcnToBlockPrefix($type);`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ return $this->createNamedBuilder($name, $type, $data, $options);`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`/**`