chore: bumped

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -1,4 +1,4 @@
-name: Static analysis and code style
+name: Unit tests, static analysis and code style
 
 on:
     push:
@@ -15,11 +15,11 @@ on:
             - ready_for_review
 
 jobs:
-    static-analysis-tests:
+    run-tests:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.3', '8.4', '8.5']
+                php-version: ['8.1', '8.2', '8.3']
         steps:
             - uses: shivammathur/setup-php@v2
               with:
@@ -35,5 +35,7 @@ jobs:
                       ${{ runner.os }}-php-${{ matrix.php-version }}-
             - name: Install Dependencies
               run: composer install --no-scripts --no-ansi --no-interaction --no-progress
+            - name: Run PHP Code Sniffer
+              run: vendor/bin/phpcs --extensions=php --warning-severity=0 --standard=PSR12 -p ./src
             - name: Run PHPStan
               run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2025 Ambroise Maupate
+Copyright © 2024 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -0,0 +1,4 @@
+
+test:
+	vendor/bin/phpcs --report=full --report-file=./report.txt -p ./src
+	vendor/bin/phpstan analyse -c phpstan.neon

composer.json

@@ -12,13 +12,13 @@
         }
     ],
     "require": {
-        "php": ">=8.3",
-        "lcobucci/jwt": "^5.3",
-        "symfony/http-client": "7.4.*"
+        "php": ">=8.1",
+        "lcobucci/jwt": "^4.1",
+        "guzzlehttp/guzzle": "^7.2.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "^2.1.36",
-        "phpstan/phpdoc-parser": "<2"
+        "phpstan/phpstan": "^1.5.3",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
         "psr-4": {
@@ -27,8 +27,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.7.x-dev",
-            "dev-develop": "2.8.x-dev"
+            "dev-main": "2.3.x-dev",
+            "dev-develop": "2.4.x-dev"
         }
     }
 }

phpcs.xml.dist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+
+    <arg name="basepath" value="."/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors"/>
+    <arg name="extensions" value="php"/>
+
+    <rule ref="PSR12">
+        <exclude name="Generic.Files.LineLength"/>
+    </rule>
+    <file>./src</file>
+</ruleset>

src/JwtConfigurationFactory.php

@@ -8,5 +8,5 @@
 
 interface JwtConfigurationFactory
 {
-    public function create(): ?Configuration;
+    public function create(): Configuration;
 }

src/Validation/Constraint/HostedDomain.php

@@ -5,30 +5,37 @@
 namespace RZ\Roadiz\JWT\Validation\Constraint;
 
 use Lcobucci\JWT\Token;
-use Lcobucci\JWT\Token\Plain;
 use Lcobucci\JWT\Validation\Constraint;
 use Lcobucci\JWT\Validation\ConstraintViolation;
 
-final readonly class HostedDomain implements Constraint
+class HostedDomain implements Constraint
 {
-    public function __construct(private string $hostedDomain)
+    protected string $hostedDomain;
+
+    /**
+     * @param string $hostedDomain
+     */
+    public function __construct(string $hostedDomain)
     {
+        $this->hostedDomain = $hostedDomain;
     }
 
-    #[\Override]
     public function assert(Token $token): void
     {
-        if (!$token instanceof Plain || empty($this->hostedDomain)) {
-            return;
-        }
-        if (!$token->claims()->has('hd')) {
-            throw new ConstraintViolation('Token does not expose any Hosted Domain.');
-        }
-        /*
-         * Check that Hosted Domain is the same as required by Roadiz
-         */
-        if ($token->claims()->get('hd') !== $this->hostedDomain) {
-            throw new ConstraintViolation('User ('.$token->claims()->get('hd').') does not belong to Hosted Domain.');
+        if ($token instanceof Token\Plain && !empty($this->hostedDomain)) {
+            if (!$token->claims()->has('hd')) {
+                throw new ConstraintViolation(
+                    'Token does not expose any Hosted Domain.'
+                );
+            }
+            /*
+             * Check that Hosted Domain is the same as required by Roadiz
+             */
+            if ($token->claims()->get('hd') !== $this->hostedDomain) {
+                throw new ConstraintViolation(
+                    'User (' . $token->claims()->get('hd') . ') does not belong to Hosted Domain.'
+                );
+            }
         }
     }
 }

src/Validation/Constraint/UserInfoEndpoint.php

@@ -4,33 +4,39 @@
 
 namespace RZ\Roadiz\JWT\Validation\Constraint;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use Lcobucci\JWT\Token;
 use Lcobucci\JWT\Validation\Constraint;
 use Lcobucci\JWT\Validation\ConstraintViolation;
-use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-final readonly class UserInfoEndpoint implements Constraint
+class UserInfoEndpoint implements Constraint
 {
-    public function __construct(
-        private string $userInfoEndpoint,
-        private HttpClientInterface $client,
-    ) {
+    protected string $userInfoEndpoint;
+
+    /**
+     * @param string $userInfoEndpoint
+     */
+    public function __construct(string $userInfoEndpoint)
+    {
+        $this->userInfoEndpoint = $userInfoEndpoint;
     }
 
-    #[\Override]
     public function assert(Token $token): void
     {
         try {
-            $response = $this->client->request('GET', $this->userInfoEndpoint, [
+            $client = new Client();
+            $client->get($this->userInfoEndpoint, [
                 'headers' => [
-                    'Authorization' => 'Bearer '.$token->toString(),
+                    'Authorization' => 'Bearer ' . $token->toString(),
                 ],
             ]);
-            // Trigger lazy request
-            $response->getContent();
-        } catch (ExceptionInterface) {
-            throw new ConstraintViolation('Userinfo cannot be fetch from Identity provider');
+        } catch (GuzzleException $e) {
+            throw new ConstraintViolation(
+                'Userinfo cannot be fetch from Identity provider',
+                $e->getCode(),
+                $e
+            );
         }
     }
 }