[Form] Removed unused ResolvedTypeFactory in FormFactory constructor
This commit is contained in:
parent
027d58869f
commit
3607eb3dd0
@ -15,20 +15,11 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
|
|||||||
|
|
||||||
class FormFactory implements FormFactoryInterface
|
class FormFactory implements FormFactoryInterface
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @var FormRegistryInterface
|
|
||||||
*/
|
|
||||||
private $registry;
|
private $registry;
|
||||||
|
|
||||||
/**
|
public function __construct(FormRegistryInterface $registry)
|
||||||
* @var ResolvedFormTypeFactoryInterface
|
|
||||||
*/
|
|
||||||
private $resolvedTypeFactory;
|
|
||||||
|
|
||||||
public function __construct(FormRegistryInterface $registry, ResolvedFormTypeFactoryInterface $resolvedTypeFactory)
|
|
||||||
{
|
{
|
||||||
$this->registry = $registry;
|
$this->registry = $registry;
|
||||||
$this->resolvedTypeFactory = $resolvedTypeFactory;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -154,9 +154,8 @@ class FormFactoryBuilder implements FormFactoryBuilderInterface
|
|||||||
$extensions[] = new PreloadedExtension($this->types, $this->typeExtensions, $typeGuesser);
|
$extensions[] = new PreloadedExtension($this->types, $this->typeExtensions, $typeGuesser);
|
||||||
}
|
}
|
||||||
|
|
||||||
$resolvedTypeFactory = $this->resolvedTypeFactory ?: new ResolvedFormTypeFactory();
|
$registry = new FormRegistry($extensions, $this->resolvedTypeFactory ?: new ResolvedFormTypeFactory());
|
||||||
$registry = new FormRegistry($extensions, $resolvedTypeFactory);
|
|
||||||
|
|
||||||
return new FormFactory($registry, $resolvedTypeFactory);
|
return new FormFactory($registry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -37,11 +37,6 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
private $registry;
|
private $registry;
|
||||||
|
|
||||||
/**
|
|
||||||
* @var \PHPUnit_Framework_MockObject_MockObject
|
|
||||||
*/
|
|
||||||
private $resolvedTypeFactory;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var \PHPUnit_Framework_MockObject_MockObject
|
* @var \PHPUnit_Framework_MockObject_MockObject
|
||||||
*/
|
*/
|
||||||
@ -54,12 +49,11 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
$this->resolvedTypeFactory = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeFactoryInterface')->getMock();
|
|
||||||
$this->guesser1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
|
$this->guesser1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
|
||||||
$this->guesser2 = $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->registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
|
||||||
$this->builder = $this->getMockBuilder('Symfony\Component\Form\Test\FormBuilderInterface')->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())
|
$this->registry->expects($this->any())
|
||||||
->method('getTypeGuesser')
|
->method('getTypeGuesser')
|
||||||
@ -244,7 +238,7 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
$registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
|
$registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
|
||||||
$factory = $this->getMockBuilder('Symfony\Component\Form\FormFactory')
|
$factory = $this->getMockBuilder('Symfony\Component\Form\FormFactory')
|
||||||
->setMethods(array('createNamedBuilder'))
|
->setMethods(array('createNamedBuilder'))
|
||||||
->setConstructorArgs(array($registry, $this->resolvedTypeFactory))
|
->setConstructorArgs(array($registry))
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$factory->expects($this->once())
|
$factory->expects($this->once())
|
||||||
@ -474,7 +468,7 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
return $this->getMockBuilder('Symfony\Component\Form\FormFactory')
|
return $this->getMockBuilder('Symfony\Component\Form\FormFactory')
|
||||||
->setMethods($methods)
|
->setMethods($methods)
|
||||||
->setConstructorArgs(array($this->registry, $this->resolvedTypeFactory))
|
->setConstructorArgs(array($this->registry))
|
||||||
->getMock();
|
->getMock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user