Added support for Symfony 5.4

.github/workflows/ci.yaml

@@ -18,16 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.1'
-          - '7.2'
-          - '7.3'
           - '7.4'
         symfony:
-          - '2.*'
-          - '3.*'
           - '4.*'
           - '5.*'
-          - '6.*'
         dependency:
           - 'highest'
           - 'lowest'
@@ -49,10 +43,13 @@ jobs:
         with:
           dependency-versions: ${{ matrix.dependency }}
 
-      - name: Clear cache (optional)
+      - name: Clear cache
         uses: actions/cache@v3
         with:
           path: ~/.composer/cache
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.symfony }}-${{ matrix.dependency }}
           restore-keys: |
             ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.symfony }}-${{ matrix.dependency }}
+
+      - name: Run all tests
+        run: composer test

.gitignore

@@ -1,2 +1,5 @@
 vendor/
 composer.lock
+build/
+bin/
+cache.*

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.0.0 2024-02-08
+### Added 
+- Added support for Symfony ^5.4
+- Dropped support for PHP 5.5 and Symfony 2.x and 3.x
+- Renamed Paysera\BearerAuthenticationBundle\DependencyInjection\Security\Factory\BearerFactory to Paysera\BearerAuthenticationBundle\DependencyInjection\Security\Factory\BearerSecurityFactory
+- Added Paysera\BearerAuthenticationBundle\DependencyInjection\Security\Factory\BearerAuthenticatorFactory for Symfony 5
+- Changed src/Security/Authentication/Token/BearerTokenInterface::getToken(), added return type
+
 ## 1.0.2
 ### Added
 - Deprecated \Symfony\Component\DependencyInjection\DefinitionDecorator class removed and 

README.md

@@ -12,22 +12,65 @@ $bundles = [
 
 ## Samples
 
-Sample `security.yml`
-```yml
+Sample `security.yml` for symfony 3/4
+```yaml
 security:
     providers:
         bearer_user:
             id: paysera_bearer_authentication.security_user.bearer_user_provider
 
     firewalls:
         bearer_secured:
-            patter: ^/api/
+            pattern: ^/api/
             stateless: true
             bearer: true
+            provider: bearer_user
+```
+
+Sample security.yml for Symfony 5
+```yaml
+security:
+    enable_authenticator_manager: true
+    providers:
+      bearer_user:
+            id: paysera_bearer_authentication.security_user.bearer_user_provider    
+
+    firewalls:
+      bearer_secured:
+            pattern: ^/api
+            stateless: true
+            provider: bearer_user
+            custom_authenticators:
+              - Paysera\BearerAuthenticationBundle\Security\BearerPassportAuthenticator
+
+    access_control:
+        # require ROLE_ADMIN for /admin*
+        - { path: '^/api', roles: ROLE_ADMIN }
 ```
 
 All bearer handlers must be tagged with:
 ```xml
 <tag name="paysera_bearer_authentication.handler" />
 ```
 and implement `\Paysera\BearerAuthenticationBundle\Security\User\HandlerInterface` 
+
+Example of a handler services.yaml
+```yaml
+    paysera_auth_token.security.auth_token_handler:
+        class: 'App\Services\BearerHandler'
+        tags:
+            - { name: 'paysera_bearer_authentication.handler' }
+```
+
+## Support matrix 
+The below table shows the supported PHP versions for this library, please review the composer.json file for each individual package for additional requirements.
+
+| Package version | Symfony Version | PHP Version |
+|-----------------|-----------------|-------------|
+| 0.x             | 2.x             | 5.5         |
+| 0.x             | 3.x             | 5.5         |
+| 1.0.0           | 3.x             | 5.5         |
+| 1.0.1           | 3.x             | 5.5         |
+| 1.0.1           | 4.x             | 5.5         |
+| 2.x             | 4.x             | 7.4         |
+| 2.x             | 5.x             | 7.4         |

composer.json

@@ -1,14 +1,30 @@
 {
   "name": "paysera/lib-bearer-authentication-bundle",
   "description": "Bearer Authentication Bundle",
+  "version": "2.0.0",
   "autoload": {
     "psr-4": {
       "Paysera\\BearerAuthenticationBundle\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Paysera\\BearerAuthenticationBundle\\Tests\\": "tests/"
+    }
+  },
   "require": {
-    "php": ">=5.5",
-    "symfony/symfony": "^2.8 || ^3.0 || ^4.0",
-    "paysera/lib-dependency-injection": "^1.0"
+    "php": ">=7.4",
+    "symfony/security-bundle": "^v4.0 || ^v5.4",
+    "symfony/http-kernel": "^v4.0 || ^v5.4",
+    "paysera/lib-dependency-injection": "^1.4"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^9.6|^10.0"
+  },
+  "scripts": {
+    "phpunit": "vendor/bin/phpunit",
+    "test": [
+      "@phpunit"
+    ]
   }
 }

phpunit.xml.dist

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         cacheResult="false"
+         bootstrap="vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+>
+    <testsuites>
+        <testsuite name="Package test suite">
+            <directory>tests</directory>
+            <directory>tests/*</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/DependencyInjection/Configuration.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Paysera\BearerAuthenticationBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -15,18 +17,14 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('paysera_bearer_authentication');
         $rootNode = method_exists($treeBuilder, 'getRootNode')
             ? $treeBuilder->getRootNode()
             : $treeBuilder->root('paysera_bearer_authentication')
         ;
 
-        // Here you should define the parameters that are allowed to
-        // configure your bundle. See the documentation linked above for
-        // more information on that topic.
-
         return $treeBuilder;
     }
 }

src/DependencyInjection/PayseraBearerAuthenticationExtension.php

@@ -1,26 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Paysera\BearerAuthenticationBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-/**
- * This is the class that loads and manages your bundle configuration.
- *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
- */
 class PayseraBearerAuthenticationExtension extends Extension
 {
     /**
      * {@inheritdoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
+        $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');

src/DependencyInjection/Security/Factory/BearerAuthenticatorFactory.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Paysera\BearerAuthenticationBundle\DependencyInjection\Security\Factory;
+
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Paysera\BearerAuthenticationBundle\Security\BearerPassportAuthenticator;
+
+class BearerAuthenticatorFactory implements AuthenticatorFactoryInterface
+{
+    public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): string
+    {
+        $authenticatorId = 'security.authentication.provider.bearer.' . $firewallName;
+
+        $authenticator = (new ChildDefinition(BearerPassportAuthenticator::class));
+
+        $container->setDefinition($authenticatorId, $authenticator);
+
+        return $authenticatorId;
+    }
+
+    public function getPriority(): int
+    {
+        return -10;
+    }
+
+    public function getKey(): string
+    {
+        return 'bearer';
+    }
+
+    public function addConfiguration(NodeDefinition $builder): void
+    {
+
+    }
+}

src/DependencyInjection/Security/Factory/BearerFactory.php → src/DependencyInjection/Security/Factory/BearerSecurityFactory.php

@@ -1,50 +1,56 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Paysera\BearerAuthenticationBundle\DependencyInjection\Security\Factory;
 
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 
-class BearerFactory implements SecurityFactoryInterface
+/**
+ * @deprecated since symfony 5.4.x, use BearerAuthenticatorFactory instead
+ */
+class BearerSecurityFactory implements SecurityFactoryInterface
 {
-    public function create(
-        ContainerBuilder $container,
-        $id,
-        $config,
-        $userProvider,
-        $defaultEntryPoint
-    ) {
+    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint): array
+    {
         $providerId = 'security.authentication.provider.bearer.'.$id;
         $container
             ->setDefinition(
                 $providerId,
                 new ChildDefinition('paysera_bearer_authentication.security_authentication_provider.bearer_provider')
             )
-            ->replaceArgument(0, new Reference($userProvider));
+            ->replaceArgument(0, new Reference($userProvider))
+        ;
 
         $listenerId = 'security.authentication.listener.bearer.'.$id;
-        $listener = $container->setDefinition(
+
+        $container->setDefinition(
             $listenerId,
             new ChildDefinition('paysera_bearer_authentication.listener.bearer_listener')
         );
 
-        return [$providerId, $listenerId, $defaultEntryPoint];
+        return [
+            $providerId,
+            $listenerId,
+            $defaultEntryPoint,
+        ];
     }
 
-    public function getPosition()
+    public function getPosition(): string
     {
         return 'pre_auth';
     }
 
-    public function getKey()
+    public function getKey(): string
     {
         return 'bearer';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $builder): void
     {
 
     }