symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Form/FormOrdererFactory.php
Lines changed: 0 additions & 28 deletions b/‎src/Symfony/Component/Form/FormOrdererFactory.php
Lines changed: 0 additions & 28 deletions
diff --git a/‎src/Symfony/Component/Form/FormOrdererFactoryInterface.php
Lines changed: 0 additions & 27 deletions b/‎src/Symfony/Component/Form/FormOrdererFactoryInterface.php
Lines changed: 0 additions & 27 deletions
diff --git a/‎src/Symfony/Component/Form/ResolvedFormTypeFactory.php
Lines changed: 6 additions & 6 deletions b/‎src/Symfony/Component/Form/ResolvedFormTypeFactory.php
Lines changed: 6 additions & 6 deletions
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="form.orderer_factory.class">Symfony\Component\Form\FormOrdererFactory</parameter>
+        <parameter key="form.orderer.class">Symfony\Component\Form\FormOrderer</parameter>
         <parameter key="form.resolved_type_factory.class">Symfony\Component\Form\ResolvedFormTypeFactory</parameter>
         <parameter key="form.registry.class">Symfony\Component\Form\FormRegistry</parameter>
         <parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
@@ -15,12 +15,12 @@
     </parameters>
 
     <services>
-        <!-- FormOrdererFactory -->
-        <service id="form.orderer_factory" class="%form.orderer_factory.class%" />
+        <!-- FormOrderer -->
+        <service id="form.orderer" class="%form.orderer.class%" />
 
         <!-- ResolvedFormTypeFactory -->
         <service id="form.resolved_type_factory" class="%form.resolved_type_factory.class%">
-            <argument type="service" id="form.orderer_factory" />
+            <argument type="service" id="form.orderer" />
         </service>
 
         <!-- FormRegistry -->
 
@@ -17,25 +17,25 @@
 class ResolvedFormTypeFactory implements ResolvedFormTypeFactoryInterface
 {
     /**
-     * @var FormOrdererFactory
+     * @var FormOrdererInterface
      */
-    private $ordererFactory;
+    private $orderer;
 
     /**
      * Creates a resolved form type factory.
      *
-     * @param FormOrdererFactoryInterface|null $ordererFactory The form orderer factory.
+     * @param FormOrdererInterface|null $orderer The form orderer.
      */
-    public function __construct(FormOrdererFactoryInterface $ordererFactory = null)
+    public function __construct(FormOrdererInterface $orderer = null)
     {
-        $this->ordererFactory = $ordererFactory ?: new FormOrdererFactory();
+        $this->orderer = $orderer ?: new FormOrderer();
     }
 
     /**
      * {@inheritdoc}
      */
     public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ResolvedFormTypeInterface $parent = null)
     {
-        return new ResolvedFormType($type, $typeExtensions, $parent, $this->ordererFactory->create());
+        return new ResolvedFormType($type, $typeExtensions, $parent, $this->orderer);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -17,25 +17,25 @@`
`17`	`17`	`class ResolvedFormTypeFactory implements ResolvedFormTypeFactoryInterface`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`		`- * @var FormOrdererFactory`
	`20`	`+ * @var FormOrdererInterface`
`21`	`21`	`*/`
`22`		`- private $ordererFactory;`
	`22`	`+ private $orderer;`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* Creates a resolved form type factory.`
`26`	`26`	`*`
`27`		`- * @param FormOrdererFactoryInterface\|null $ordererFactory The form orderer factory.`
	`27`	`+ * @param FormOrdererInterface\|null $orderer The form orderer.`
`28`	`28`	`*/`
`29`		`- public function __construct(FormOrdererFactoryInterface $ordererFactory = null)`
	`29`	`+ public function __construct(FormOrdererInterface $orderer = null)`
`30`	`30`	`{`
`31`		`- $this->ordererFactory = $ordererFactory ?: new FormOrdererFactory();`
	`31`	`+ $this->orderer = $orderer ?: new FormOrderer();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
`35`	`35`	`* {@inheritdoc}`
`36`	`36`	`*/`
`37`	`37`	`public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ResolvedFormTypeInterface $parent = null)`
`38`	`38`	`{`
`39`		`- return new ResolvedFormType($type, $typeExtensions, $parent, $this->ordererFactory->create());`
	`39`	`+ return new ResolvedFormType($type, $typeExtensions, $parent, $this->orderer);`
`40`	`40`	`}`
`41`	`41`	`}`