[Form] Removed unused ResolvedTypeFactory in FormFactory constructor

HeahDude · HeahDude · commit 3607eb3dd06b · 2017-01-10T21:49:17.000+01:00
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -15,20 +15,11 @@
 
 class FormFactory implements FormFactoryInterface
 {
-    /**
-     * @var FormRegistryInterface
-     */
     private $registry;
 
-    /**
-     * @var ResolvedFormTypeFactoryInterface
-     */
-    private $resolvedTypeFactory;
-
-    public function __construct(FormRegistryInterface $registry, ResolvedFormTypeFactoryInterface $resolvedTypeFactory)
+    public function __construct(FormRegistryInterface $registry)
     {
         $this->registry = $registry;
-        $this->resolvedTypeFactory = $resolvedTypeFactory;
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormFactoryBuilder.php b/src/Symfony/Component/Form/FormFactoryBuilder.php
@@ -154,9 +154,8 @@ public function getFormFactory()
             $extensions[] = new PreloadedExtension($this->types, $this->typeExtensions, $typeGuesser);
         }
 
-        $resolvedTypeFactory = $this->resolvedTypeFactory ?: new ResolvedFormTypeFactory();
-        $registry = new FormRegistry($extensions, $resolvedTypeFactory);
+        $registry = new FormRegistry($extensions, $this->resolvedTypeFactory ?: new ResolvedFormTypeFactory());
 
-        return new FormFactory($registry, $resolvedTypeFactory);
+        return new FormFactory($registry);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -37,11 +37,6 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
      */
     private $registry;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $resolvedTypeFactory;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -54,12 +49,11 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->resolvedTypeFactory = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeFactoryInterface')->getMock();
         $this->guesser1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
         $this->guesser2 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
         $this->registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
         $this->builder = $this->getMockBuilder('Symfony\Component\Form\Test\FormBuilderInterface')->getMock();
-        $this->factory = new FormFactory($this->registry, $this->resolvedTypeFactory);
+        $this->factory = new FormFactory($this->registry);
 
         $this->registry->expects($this->any())
             ->method('getTypeGuesser')
@@ -244,7 +238,7 @@ public function testCreateBuilderForPropertyWithoutTypeGuesser()
         $registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
         $factory = $this->getMockBuilder('Symfony\Component\Form\FormFactory')
             ->setMethods(array('createNamedBuilder'))
-            ->setConstructorArgs(array($registry, $this->resolvedTypeFactory))
+            ->setConstructorArgs(array($registry))
             ->getMock();
 
         $factory->expects($this->once())
@@ -474,7 +468,7 @@ private function getMockFactory(array $methods = array())
     {
         return $this->getMockBuilder('Symfony\Component\Form\FormFactory')
             ->setMethods($methods)
-            ->setConstructorArgs(array($this->registry, $this->resolvedTypeFactory))
+            ->setConstructorArgs(array($this->registry))
             ->getMock();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -15,20 +15,11 @@`
`15`	`15`
`16`	`16`	`class FormFactory implements FormFactoryInterface`
`17`	`17`	`{`
`18`		`- /**`
`19`		`- * @var FormRegistryInterface`
`20`		`- */`
`21`	`18`	`private $registry;`
`22`	`19`
`23`		`- /**`
`24`		`- * @var ResolvedFormTypeFactoryInterface`
`25`		`- */`
`26`		`- private $resolvedTypeFactory;`
`27`		`-`
`28`		`- public function __construct(FormRegistryInterface $registry, ResolvedFormTypeFactoryInterface $resolvedTypeFactory)`
	`20`	`+ public function __construct(FormRegistryInterface $registry)`
`29`	`21`	`{`
`30`	`22`	`$this->registry = $registry;`
`31`		`- $this->resolvedTypeFactory = $resolvedTypeFactory;`
`32`	`23`	`}`
`33`	`24`
`34`	`25`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,8 @@ public function getFormFactory()`
`154`	`154`	`$extensions[] = new PreloadedExtension($this->types, $this->typeExtensions, $typeGuesser);`
`155`	`155`	`}`
`156`	`156`
`157`		`- $resolvedTypeFactory = $this->resolvedTypeFactory ?: new ResolvedFormTypeFactory();`
`158`		`- $registry = new FormRegistry($extensions, $resolvedTypeFactory);`
	`157`	`+ $registry = new FormRegistry($extensions, $this->resolvedTypeFactory ?: new ResolvedFormTypeFactory());`
`159`	`158`
`160`		`- return new FormFactory($registry, $resolvedTypeFactory);`
	`159`	`+ return new FormFactory($registry);`
`161`	`160`	`}`
`162`	`161`	`}`