Removing 2.3 compat on DI - it was too much trouble

But, I did need 2.3 on router (which is fine) - before it was using something even lower, which caused incompatibilities. Anyways, this configuration finally works with low deps set on Composer.
knpuniversity · Jan 17, 2016 · d4a3dce · d4a3dce
1 parent 06cc3a9
commit d4a3dce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 27 deletions.
diff --git a/DependencyInjection/KnpUOAuth2ClientExtension.php b/DependencyInjection/KnpUOAuth2ClientExtension.php
@@ -109,16 +109,11 @@ private function configureProvider(ContainerBuilder $container, $providerType, $
             $providerClass
         );
 
-        if (method_exists($definition, 'setFactory')) {
-            $definition->setFactory(array(
-                new Reference('knpu.oauth.provider_factory'),
-                'createProvider'
-            ));
-        } else {
-            // for 2.3-2.5 compatibility
-            $definition->setFactoryService('knpu.oauth.provider_factory');
-            $definition->setFactoryMethod('createProvider');
-        }
+        $definition->setFactory(array(
+            new Reference('knpu.oauth.provider_factory'),
+            'createProvider'
+        ));
+
         $definition->setArguments(array(
             $providerClass,
             $options,

diff --git a/Tests/DependencyInjection/KnpUOAuth2ClientExtensionTest.php b/Tests/DependencyInjection/KnpUOAuth2ClientExtensionTest.php
@@ -41,23 +41,12 @@ public function testFacebookProviderMakesService()
 
         $definition = $this->configuration->getDefinition('knpu.oauth2.facebook_client');
 
-        if (method_exists($definition, 'getFactory')) {
-            $factory = $definition->getFactory();
-            // make sure the factory is correct
-            $this->assertEquals(
-                array(new Reference('knpu.oauth.provider_factory'), 'createProvider'),
-                $factory
-            );
-        } else {
-            // 2.3-2.5 compat
-            $factoryService = $definition->getFactoryService();
-            // make sure the factory is correct
-            $this->assertEquals(
-                'knpu.oauth.provider_factory',
-                $factoryService
-            );
-            $this->assertEquals('createProvider', $definition->getFactoryMethod());
-        }
+        $factory = $definition->getFactory();
+        // make sure the factory is correct
+        $this->assertEquals(
+            array(new Reference('knpu.oauth.provider_factory'), 'createProvider'),
+            $factory
+        );
 
         $this->assertEquals(
             array(

diff --git a/composer.json b/composer.json
@@ -13,6 +13,8 @@
     ],
     "require": {
         "symfony/framework-bundle": "~2.3|~3.0",
+        "symfony/dependency-injection": "~2.7|~3.0",
+        "symfony/routing": "~2.3|~3.0",
         "league/oauth2-client": "^1.0"
     },
     "autoload": {