Merge pull request #17 from fulll/sf7

Allow symfony >= 5.4
fulll · Jun 20, 2024 · 25eebf5 · 25eebf5
2 parents 112ceae + 004afc7
commit 25eebf5
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 70 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,29 +5,37 @@ jobs:
   php-cs-fixer:
     name: PHP Coding Standards Fixer
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@master
-
+      - uses: actions/checkout@v4
+      - name: Add HTTP basic auth credentials
+        run: echo '${{ secrets.COMPOSER_AUTH }}' > $GITHUB_WORKSPACE/auth.json
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+      - name: Install dependencies
+        uses: php-actions/composer@v6
+        with:
+          php_version: 8.3
+          args: --no-scripts --dev
       - name: Php cs fixer
-        uses: fulll/actions/php-cs-fixer@master
+        run: bin/php-cs-fixer fix
 
   phpstan:
     name: PHPStan Static Analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - name: Add HTTP basic auth credentials
         run: echo '${{ secrets.COMPOSER_AUTH }}' > $GITHUB_WORKSPACE/auth.json
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
       - name: Install dependencies
-        uses: php-actions/composer@v5
+        uses: php-actions/composer@v6
         with:
-          php_version: 8.0
-          args: --no-scripts
+          php_version: 8.3
+          args: --no-scripts --dev
       - name: PHPStan Static Analysis
-        uses: php-actions/phpstan@v3
-        with:
-          version: 1.9.4
-          memory_limit: 1G
-          php_version: 8.0
-          args: --error-format=github
+        run: bin/phpstan --memory-limit=1G
diff --git a/Controller/Annotations/ObfuscateRequest.php b/Controller/Annotations/ObfuscateRequest.php
@@ -18,9 +18,6 @@ class ObfuscateRequest
      */
     private $obfuscatedPatterns;
 
-    /**
-     * @param array $data data
-     */
     public function __construct(array $obfuscatedPatterns)
     {
         $this->obfuscatedPatterns = $obfuscatedPatterns;

diff --git a/DataCollector/RequestDataCollector.php b/DataCollector/RequestDataCollector.php
@@ -16,7 +16,7 @@ public function __construct(private AnnotationReader $annotationReader, private
     {
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         parent::collect($request, $response, $exception);
 

diff --git a/DependencyInjection/Compiler/ObfuscatorCompilerPass.php b/DependencyInjection/Compiler/ObfuscatorCompilerPass.php
@@ -10,9 +10,6 @@
 
 class ObfuscatorCompilerPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         // request obfuscator is not enabled.

diff --git a/DependencyInjection/RezzzaSecurityExtension.php b/DependencyInjection/RezzzaSecurityExtension.php
@@ -21,9 +21,6 @@
  */
 class RezzzaSecurityExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();

diff --git a/Request/Obfuscator/RequestObfuscator.php b/Request/Obfuscator/RequestObfuscator.php
@@ -16,9 +16,6 @@ class RequestObfuscator implements ObfuscatorInterface
     public const TOKEN_REPLACE = 'X';
     public const TOKEN_ALL = '*';
 
-    /**
-     * {@inheritdoc}
-     */
     public function obfuscate(array $data, array $obfuscatedPatterns)
     {
         foreach ($obfuscatedPatterns as $key => $pattern) {

diff --git a/RezzzaSecurityBundle.php b/RezzzaSecurityBundle.php
@@ -18,9 +18,6 @@
  */
 class RezzzaSecurityBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     */
     public function build(ContainerBuilder $container): void
     {
         parent::build($container);

diff --git a/Security/Firewall/RequestSignatureProdiver.php b/Security/Firewall/RequestSignatureProdiver.php
@@ -10,9 +10,6 @@
 
 class RequestSignatureProdiver implements UserProviderInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function loadUserByUsername($username): UserInterface
     {
         throw new \LogicException(sprintf('Method %s should never be called.', __METHOD__));
@@ -33,9 +30,6 @@ public function refreshUser(UserInterface $user): UserInterface
         return $user;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsClass($class): bool
     {
         return SignatureValidUser::class === $class;

diff --git a/Security/SignatureValidToken.php b/Security/SignatureValidToken.php
@@ -13,9 +13,6 @@ public function __construct(SignatureValidUser $user)
         $this->setUser($user);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCredentials(): string
     {
         return '';

diff --git a/Security/SignatureValidUser.php b/Security/SignatureValidUser.php
@@ -8,48 +8,30 @@
 
 class SignatureValidUser implements UserInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getRoles(): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPassword(): ?string
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSalt(): ?string
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function eraseCredentials(): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUsername(): ?string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUserIdentifier(): string
     {
         return '';

diff --git a/composer.json b/composer.json
@@ -11,13 +11,14 @@
     }],
     "require": {
         "php": ">=8.0",
-        "symfony/framework-bundle": "~5.4|~6.0",
-        "symfony/security-bundle" : "~5.4|~6.0",
+        "symfony/framework-bundle": ">=5.4",
+        "symfony/security-bundle" : ">=5.4",
         "doctrine/common": "~2.2|~3.0"
     },
     "require-dev": {
         "atoum/atoum": "~4.0",
-        "phpstan/phpstan": "^1.9"
+        "phpstan/phpstan": "1.11.5",
+        "friendsofphp/php-cs-fixer": "v3.59.3"
     },
     "suggest": {
         "psr/http-message": "Required by \\Rezzza\\SecurityBundle\\Request\\Psr7RequestSigner"

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5,11 +5,6 @@ parameters:
 			count: 1
 			path: Controller/Annotations/ObfuscateRequest.php
 
-		-
-			message: "#^PHPDoc tag @param references unknown parameter\\: \\$data$#"
-			count: 1
-			path: Controller/Annotations/ObfuscateRequest.php
-
 		-
 			message: "#^Call to method getMethodAnnotation\\(\\) on an unknown class Doctrine\\\\Common\\\\Annotations\\\\Reader\\.$#"
 			count: 1
@@ -55,11 +50,6 @@ parameters:
 			count: 1
 			path: DependencyInjection/Security/Factory/RequestSignatureFactory.php
 
-		-
-			message: "#^Method Rezzza\\\\SecurityBundle\\\\DependencyInjection\\\\Security\\\\Factory\\\\RequestSignatureFactory\\:\\:createAuthenticator\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: DependencyInjection/Security/Factory/RequestSignatureFactory.php
-
 		-
 			message: "#^Method Rezzza\\\\SecurityBundle\\\\DependencyInjection\\\\Security\\\\Factory\\\\RequestSignatureFactory\\:\\:createReplayProtection\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -205,6 +195,11 @@ parameters:
 			count: 1
 			path: Security/Firewall/RequestSignatureListener.php
 
+		-
+			message: "#^Class Rezzza\\\\SecurityBundle\\\\Security\\\\Firewall\\\\RequestSignatureProdiver implements generic interface Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserProviderInterface but does not specify its types\\: TUser$#"
+			count: 1
+			path: Security/Firewall/RequestSignatureProdiver.php
+
 		-
 			message: "#^Method Rezzza\\\\SecurityBundle\\\\Security\\\\Firewall\\\\RequestSignatureProdiver\\:\\:loadUserByUsername\\(\\) has parameter \\$username with no type specified\\.$#"
 			count: 1