Drop support for unmainted Symfony versions (#648)

* Remove support for Symfony version older than 4.4

* Fix deprecation for configuration tree builder

* Remove legacy form types

* Add changelog

* Update return type-hint for commands

* Remove DefinitionDecorator usage

* Remove security.context

* Drop ListenerInterface usage

* Replace GetResponseEvent by RequestEvent

* Replace getRoles() by getRoleNames()

* Update travis configuration

Author: deguif

.travis.yml

@@ -12,12 +12,8 @@ service:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
     - php: 7.2
-      env: SYMFONY_VERSION=4.0.*
-    - php: 7.2
-      env: SYMFONY_VERSION=4.0.* DEPENDENCIES=beta
+      env: DEPENDENCIES=beta
 
 cache:
   directories:

CHANGELOG-2.0.md

@@ -6,6 +6,7 @@ This changelog references the relevant changes done in 6.0 versions.
 ### 2.0.0-ALPHA1 (unreleased)
 
 * Added `NL` translations [[#631](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/631)]
+* Dropped support for Symfony versions anterior to `4.4` [[#648](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/648)]
 * Fixed form submission/validation [[#643](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/643)]
 
 ### 2.0.0-ALPHA0 (2018-05-01)

Command/CleanCommand.php

@@ -59,11 +59,13 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         foreach ([$this->accessTokenManager, $this->refreshTokenManager, $this->authCodeManager] as $service) {
             $result = $service->deleteExpired();
             $output->writeln(sprintf('Removed <info>%d</info> items from <comment>%s</comment> storage.', $result, get_class($service)));
         }
+
+        return 0;
     }
 }

Command/CreateClientCommand.php

@@ -68,7 +68,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 

DependencyInjection/Compiler/TokenStorageCompilerPass.php

@@ -29,10 +29,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-
-        /** @var ArrayNodeDefinition $rootNode */
-        $rootNode = $treeBuilder->root('fos_oauth_server');
+        $treeBuilder = new TreeBuilder('fos_oauth_server');
+        $rootNode = $treeBuilder->getRootNode();
 
         $supportedDrivers = ['orm', 'mongodb', 'propel', 'custom'];
 

DependencyInjection/Configuration.php

@@ -13,7 +13,6 @@
 
 namespace FOS\OAuthServerBundle\DependencyInjection;
 
-use FOS\OAuthServerBundle\Util\LegacyFormHelper;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
@@ -149,7 +148,7 @@ protected function loadAuthorize(array $config, ContainerBuilder $container, Xml
         $container->setAlias('fos_oauth_server.authorize.form.handler', $config['form']['handler']);
         unset($config['form']['handler']);
 
-        if (!LegacyFormHelper::isLegacy() && $config['form']['type'] === 'fos_oauth_server_authorize') {
+        if ($config['form']['type'] === 'fos_oauth_server_authorize') {
             $authorizeFormTypeDefinition = $container->getDefinition('fos_oauth_server.authorize.form.type');
             $config['form']['type'] = $authorizeFormTypeDefinition->getClass();
         }

DependencyInjection/FOSOAuthServerExtension.php

@@ -15,6 +15,7 @@
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -30,22 +31,14 @@ class OAuthFactory implements SecurityFactoryInterface
      */
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
-        // NOTE: done like this to avoid PHPStan complaining about a missing class for both Symfony v3 and Symfony v4
-        $definitionDecorator = 'Symfony\\Component\\DependencyInjection\\DefinitionDecorator';
-        $childDefinition = 'Symfony\\Component\\DependencyInjection\\ChildDefinition';
-        $definitionClass = $childDefinition;
-        if (class_exists($definitionDecorator)) {
-            $definitionClass = $definitionDecorator;
-        }
-
         $providerId = 'security.authentication.provider.fos_oauth_server.'.$id;
         $container
-            ->setDefinition($providerId, new $definitionClass('fos_oauth_server.security.authentication.provider'))
+            ->setDefinition($providerId, new ChildDefinition('fos_oauth_server.security.authentication.provider'))
             ->replaceArgument(0, new Reference($userProvider))
         ;
 
         $listenerId = 'security.authentication.listener.fos_oauth_server.'.$id;
-        $container->setDefinition($listenerId, new $definitionClass('fos_oauth_server.security.authentication.listener'));
+        $container->setDefinition($listenerId, new ChildDefinition('fos_oauth_server.security.authentication.listener'));
 
         return [$providerId, $listenerId, 'fos_oauth_server.security.entry_point'];
     }

DependencyInjection/Security/Factory/OAuthFactory.php

@@ -15,7 +15,6 @@
 
 use FOS\OAuthServerBundle\DependencyInjection\Compiler\GrantExtensionsCompilerPass;
 use FOS\OAuthServerBundle\DependencyInjection\Compiler\RequestStackCompilerPass;
-use FOS\OAuthServerBundle\DependencyInjection\Compiler\TokenStorageCompilerPass;
 use FOS\OAuthServerBundle\DependencyInjection\FOSOAuthServerExtension;
 use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuthFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
@@ -38,7 +37,6 @@ public function build(ContainerBuilder $container)
         $extension->addSecurityListenerFactory(new OAuthFactory());
 
         $container->addCompilerPass(new GrantExtensionsCompilerPass());
-        $container->addCompilerPass(new TokenStorageCompilerPass());
         $container->addCompilerPass(new RequestStackCompilerPass());
     }
 }

FOSOAuthServerBundle.php

@@ -13,8 +13,8 @@
 
 namespace FOS\OAuthServerBundle\Form\Type;
 
-use FOS\OAuthServerBundle\Util\LegacyFormHelper;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -25,13 +25,11 @@ class AuthorizeFormType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $hiddenType = LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\HiddenType');
-
-        $builder->add('client_id', $hiddenType);
-        $builder->add('response_type', $hiddenType);
-        $builder->add('redirect_uri', $hiddenType);
-        $builder->add('state', $hiddenType);
-        $builder->add('scope', $hiddenType);
+        $builder->add('client_id', HiddenType::class);
+        $builder->add('response_type', HiddenType::class);
+        $builder->add('redirect_uri', HiddenType::class);
+        $builder->add('state', HiddenType::class);
+        $builder->add('scope', HiddenType::class);
     }
 
     /**