Drop support for Symfony < 5.1

Author: mtarld

.github/workflows/unit-tests.yml

@@ -11,7 +11,6 @@ jobs:
         strategy:
             matrix:
                 symfony-version:
-                    - "4.4.*"
                     - "5.1.*"
                     - "5.2.*"
                 php-version:

.psalm.baseline.xml

@@ -4,12 +4,6 @@
     <ImplicitToStringCast occurrences="1">
       <code>service(GrantConfigurator::class)</code>
     </ImplicitToStringCast>
-    <MixedInferredReturnType occurrences="1">
-      <code>ReferenceConfigurator</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="1">
-      <code>($fn)($id)</code>
-    </MixedReturnStatement>
   </file>
   <file src="src/Security/Authenticator/OAuth2Authenticator.php">
     <PossiblyInvalidArgument occurrences="1">

composer.json

@@ -22,15 +22,15 @@
         "league/oauth2-server": "^8.0",
         "nyholm/psr7": "^1.4",
         "psr/http-factory": "^1.0",
-        "symfony/framework-bundle": "^4.4|^5.0",
+        "symfony/framework-bundle": "^5.1",
         "symfony/psr-http-message-bridge": "^2.0",
-        "symfony/security-bundle": "^4.4|^5.0"
+        "symfony/security-bundle": "^5.1.1"
     },
     "require-dev": {
         "ext-pdo": "*",
         "ext-pdo_sqlite": "*",
         "psalm/plugin-symfony": "^2.2",
-        "symfony/browser-kit": "^4.4|^5.0",
+        "symfony/browser-kit": "^5.1",
         "symfony/phpunit-bridge": "^5.2",
         "vimeo/psalm": "^4.6"
     },

src/DependencyInjection/Security/LegacyOAuth2Factory.php

@@ -6,9 +6,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
 use League\Bundle\OAuth2ServerBundle\DependencyInjection\LeagueOAuth2ServerExtension;
-use League\Bundle\OAuth2ServerBundle\DependencyInjection\Security\LegacyOAuth2Factory;
 use League\Bundle\OAuth2ServerBundle\DependencyInjection\Security\OAuth2Factory;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -40,9 +38,7 @@ private function configureSecurityExtension(ContainerBuilder $container): void
     {
         /** @var SecurityExtension $extension */
         $extension = $container->getExtension('security');
-
-        // BC Layer for < 5.1 versions
-        $extension->addSecurityListenerFactory(interface_exists(AuthenticatorFactoryInterface::class) ? new OAuth2Factory() : new LegacyOAuth2Factory());
+        $extension->addSecurityListenerFactory(new OAuth2Factory());
     }
 
     private function configureDoctrineExtension(ContainerBuilder $container): void

src/LeagueOAuth2ServerBundle.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
 use League\Bundle\OAuth2ServerBundle\Command\ClearExpiredTokensCommand;
 use League\Bundle\OAuth2ServerBundle\Command\CreateClientCommand;
@@ -54,25 +55,12 @@
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
-// BC Layer for < 5.1 versions
-if (!function_exists('service')) {
-    function service(string $id): ReferenceConfigurator
-    {
-        $fn = function_exists('Symfony\Component\DependencyInjection\Loader\Configurator\service')
-            ? 'Symfony\Component\DependencyInjection\Loader\Configurator\service'
-            : 'Symfony\Component\DependencyInjection\Loader\Configurator\ref';
-
-        return ($fn)($id);
-    }
-}
-
 return static function (ContainerConfigurator $container): void {
     $container->services()