Merge pull request #306 from Soullivaneuh/factory

Fix deprecated factory definition

Author: stof

DependencyInjection/FOSOAuthServerExtension.php

@@ -12,6 +12,7 @@
 namespace FOS\OAuthServerBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -74,9 +75,31 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        // Entity manager factory definition
+        // TODO: Go back to xml configuration when bumping the requirement to Symfony >=2.6
+        if ('orm' === $config['db_driver']) {
+            $ormEntityManagerDefinition = $container->getDefinition('fos_oauth_server.entity_manager');
+            if (method_exists($ormEntityManagerDefinition, 'setFactory')) {
+                $ormEntityManagerDefinition->setFactory(array(new Reference('doctrine'), 'getManager'));
+            } else {
+                $ormEntityManagerDefinition->setFactoryService('doctrine');
+                $ormEntityManagerDefinition->setFactoryMethod('getManager');
+            }
+        }
+
         if (!empty($config['authorize'])) {
             $this->loadAuthorize($config['authorize'], $container, $loader);
         }
+
+        // Authorize form factory definition
+        // TODO: Go back to xml configuration when bumping the requirement to Symfony >=2.6
+        $authorizeFormDefinition = $container->getDefinition('fos_oauth_server.authorize.form');
+        if (method_exists($authorizeFormDefinition, 'setFactory')) {
+            $authorizeFormDefinition->setFactory(array(new Reference('form.factory'), 'createNamed'));
+        } else {
+            $authorizeFormDefinition->setFactoryService('form.factory');
+            $authorizeFormDefinition->setFactoryMethod('createNamed');
+        }
     }
 
     /**

Resources/config/authorize.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="fos_oauth_server.authorize.form" factory-method="createNamed" factory-service="form.factory" class="Symfony\Component\Form\Form">
+        <service id="fos_oauth_server.authorize.form" class="Symfony\Component\Form\Form">
             <argument>%fos_oauth_server.authorize.form.name%</argument>
             <argument>%fos_oauth_server.authorize.form.type%</argument>
             <argument>null</argument>

Resources/config/orm.xml

@@ -25,7 +25,7 @@
             <argument>%fos_oauth_server.model.auth_code.class%</argument>
         </service>
 
-        <service id="fos_oauth_server.entity_manager" factory-service="doctrine" factory-method="getManager" class="Doctrine\ORM\EntityManager" public="false">
+        <service id="fos_oauth_server.entity_manager" class="Doctrine\ORM\EntityManager" public="false">
             <argument>%fos_oauth_server.model_manager_name%</argument>
         </service>
     </services>