minor #16761 [Form] Cleanup (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 6df8badbe171 · 2015-11-30T17:33:00.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Form] Cleanup | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - ping @stof Commits ------- fd8e882 [Form] Cleanup
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -62,48 +62,29 @@ public function createForProperty($class, $property, $data = null, array $option
     public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array())
     {
         $name = null;
-        $typeName = null;
 
         if ($type instanceof ResolvedFormTypeInterface) {
-            if (method_exists($type, 'getBlockPrefix')) {
-                // As of Symfony 3.0, the block prefix of the type is used as
-                // default name
-                $name = $type->getBlockPrefix();
-            } else {
-                // BC
-                $typeName = $type->getName();
-            }
+            $typeObject = $type;
         } elseif ($type instanceof FormTypeInterface) {
-            if (method_exists($type, 'getBlockPrefix')) {
-                // As of Symfony 3.0, the block prefix of the type is used as
-                // default name
-                $name = $type->getBlockPrefix();
-            } else {
-                // BC
-                $typeName = $type->getName();
-            }
+            $typeObject = $type;
         } elseif (is_string($type)) {
-            $resolvedType = $this->registry->getType($type);
-            if (method_exists($resolvedType, 'getBlockPrefix')) {
-                // As of Symfony 3.0, the block prefix of the type is used as
-                // default name
-                $name = $resolvedType->getBlockPrefix();
-            } else {
-                // BC
-                $typeName = $type;
-            }
+            $typeObject = $this->registry->getType($type);
+            $name = $type;
         } else {
             throw new UnexpectedTypeException($type, 'string, Symfony\Component\Form\ResolvedFormTypeInterface or Symfony\Component\Form\FormTypeInterface');
         }
 
-        // BC when there is no block prefix
-        if (null === $name) {
-            if (false === strpos($typeName, '\\')) {
-                // No FQCN - leave unchanged for BC
-                $name = $typeName;
-            } else {
+        if (method_exists($typeObject, 'getBlockPrefix')) {
+            // As of Symfony 3.0, the block prefix of the type is used as default name
+            $name = $typeObject->getBlockPrefix();
+        } else {
+            // BC when there is no block prefix
+            if (null === $name) {
+                $name = $typeObject->getName();
+            }
+            if (false !== strpos($name, '\\')) {
                 // FQCN
-                $name = StringUtil::fqcnToBlockPrefix($typeName);
+                $name = StringUtil::fqcnToBlockPrefix($name);
             }
         }
 
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -341,6 +341,9 @@ public function testCreateUsesBlockPrefixIfTypeGivenAsString()
         $this->assertSame('FORM', $this->factory->create('TYPE', null, $options));
     }
 
+    /**
+     * @group legacy
+     */
     public function testCreateUsesTypeNameIfTypeGivenAsString()
     {
         $options = array('a' => '1', 'b' => '2');
@@ -372,6 +375,9 @@ public function testCreateUsesTypeNameIfTypeGivenAsString()
         $this->assertSame('FORM', $this->factory->create('TYPE', null, $options));
     }
 
+    /**
+     * @group legacy
+     */
     public function testCreateStripsNamespaceOffTypeName()
     {
         $options = array('a' => '1', 'b' => '2');
@@ -403,6 +409,9 @@ public function testCreateStripsNamespaceOffTypeName()
         $this->assertSame('FORM', $this->factory->create('Vendor\Name\Space\UserForm', null, $options));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyCreateStripsNamespaceOffTypeNameAccessByFQCN()
     {
         $options = array('a' => '1', 'b' => '2');
@@ -434,6 +443,9 @@ public function testLegacyCreateStripsNamespaceOffTypeNameAccessByFQCN()
         $this->assertSame('FORM', $this->factory->create('userform', null, $options));
     }
 
+    /**
+     * @group legacy
+     */
     public function testCreateStripsTypeSuffixOffTypeName()
     {
         $options = array('a' => '1', 'b' => '2');
@@ -465,6 +477,9 @@ public function testCreateStripsTypeSuffixOffTypeName()
         $this->assertSame('FORM', $this->factory->create('Vendor\Name\Space\UserType', null, $options));
     }
 
+    /**
+     * @group legacy
+     */
     public function testCreateDoesNotStripTypeSuffixIfResultEmpty()
     {
         $options = array('a' => '1', 'b' => '2');
@@ -496,6 +511,9 @@ public function testCreateDoesNotStripTypeSuffixIfResultEmpty()
         $this->assertSame('FORM', $this->factory->create('Vendor\Name\Space\Type', null, $options));
     }
 
+    /**
+     * @group legacy
+     */
     public function testCreateConvertsTypeToUnderscoreSyntax()
     {
         $options = array('a' => '1', 'b' => '2');

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,9 @@ public function testCreateUsesBlockPrefixIfTypeGivenAsString()`
`341`	`341`	`$this->assertSame('FORM', $this->factory->create('TYPE', null, $options));`
`342`	`342`	`}`
`343`	`343`
	`344`	`+ /**`
	`345`	`+ * @group legacy`
	`346`	`+ */`
`344`	`347`	`public function testCreateUsesTypeNameIfTypeGivenAsString()`
`345`	`348`	`{`
`346`	`349`	`$options = array('a' => '1', 'b' => '2');`
`@@ -372,6 +375,9 @@ public function testCreateUsesTypeNameIfTypeGivenAsString()`
`372`	`375`	`$this->assertSame('FORM', $this->factory->create('TYPE', null, $options));`
`373`	`376`	`}`
`374`	`377`
	`378`	`+ /**`
	`379`	`+ * @group legacy`
	`380`	`+ */`
`375`	`381`	`public function testCreateStripsNamespaceOffTypeName()`
`376`	`382`	`{`
`377`	`383`	`$options = array('a' => '1', 'b' => '2');`
`@@ -403,6 +409,9 @@ public function testCreateStripsNamespaceOffTypeName()`
`403`	`409`	`$this->assertSame('FORM', $this->factory->create('Vendor\Name\Space\UserForm', null, $options));`
`404`	`410`	`}`
`405`	`411`
	`412`	`+ /**`
	`413`	`+ * @group legacy`
	`414`	`+ */`
`406`	`415`	`public function testLegacyCreateStripsNamespaceOffTypeNameAccessByFQCN()`
`407`	`416`	`{`
`408`	`417`	`$options = array('a' => '1', 'b' => '2');`
`@@ -434,6 +443,9 @@ public function testLegacyCreateStripsNamespaceOffTypeNameAccessByFQCN()`
`434`	`443`	`$this->assertSame('FORM', $this->factory->create('userform', null, $options));`
`435`	`444`	`}`
`436`	`445`
	`446`	`+ /**`
	`447`	`+ * @group legacy`
	`448`	`+ */`
`437`	`449`	`public function testCreateStripsTypeSuffixOffTypeName()`
`438`	`450`	`{`
`439`	`451`	`$options = array('a' => '1', 'b' => '2');`
`@@ -465,6 +477,9 @@ public function testCreateStripsTypeSuffixOffTypeName()`
`465`	`477`	`$this->assertSame('FORM', $this->factory->create('Vendor\Name\Space\UserType', null, $options));`
`466`	`478`	`}`
`467`	`479`
	`480`	`+ /**`
	`481`	`+ * @group legacy`
	`482`	`+ */`
`468`	`483`	`public function testCreateDoesNotStripTypeSuffixIfResultEmpty()`
`469`	`484`	`{`
`470`	`485`	`$options = array('a' => '1', 'b' => '2');`
`@@ -496,6 +511,9 @@ public function testCreateDoesNotStripTypeSuffixIfResultEmpty()`
`496`	`511`	`$this->assertSame('FORM', $this->factory->create('Vendor\Name\Space\Type', null, $options));`
`497`	`512`	`}`
`498`	`513`
	`514`	`+ /**`
	`515`	`+ * @group legacy`
	`516`	`+ */`
`499`	`517`	`public function testCreateConvertsTypeToUnderscoreSyntax()`
`500`	`518`	`{`
`501`	`519`	`$options = array('a' => '1', 'b' => '2');`