Merge branch 'main' into feature/support-dash-separated-permissions-a…

…nd-scopes
auth0 · Jun 24, 2024 · 259d061 · 259d061
2 parents 46f1733 + d4c3aac
commit 259d061
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -33,10 +33,10 @@
     "ext-json": "*",
     "ext-mbstring": "*",
     "ext-openssl": "*",
-    "auth0/auth0-php": "^8.10",
-    "symfony/cache": "^6.4",
-    "symfony/framework-bundle": "^6.4",
-    "symfony/security-bundle": "^6.4"
+    "auth0/auth0-php": "^8.11",
+    "symfony/cache": "^6.4 || ^7.0",
+    "symfony/framework-bundle": "^6.4 || ^7.0",
+    "symfony/security-bundle": "^6.4 || ^7.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2",

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -24,5 +24,10 @@
         <PossiblyNullArgument errorLevel="suppress" />
         <PossiblyNullPropertyAssignmentValue errorLevel="suppress" />
         <PossiblyNullReference errorLevel="suppress" />
+        <PropertyNotSetInConstructor>
+            <errorLevel type="suppress">
+                <referencedProperty name="Symfony\Bundle\FrameworkBundle\Controller\AbstractController::$container" />    <!-- Injected by Symfony DI via setContainer() because marked as #[Required] -->
+            </errorLevel>
+        </PropertyNotSetInConstructor>
     </issueHandlers>
 </psalm>
diff --git a/src/Controllers/AuthenticationController.php b/src/Controllers/AuthenticationController.php
@@ -7,9 +7,7 @@
 use Auth0\SDK\Auth0;
 use Auth0\Symfony\Contracts\Controllers\AuthenticationControllerInterface;
 use Auth0\Symfony\Security\Authenticator;
-use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Exception\{BadRequestException, ConflictingHeadersException, SuspiciousOperationException};
 use Symfony\Component\HttpFoundation\{RedirectResponse, Request, Response};
 use Symfony\Component\Routing\RouterInterface;
 use Throwable;
@@ -22,9 +20,7 @@ final class AuthenticationController extends AbstractController implements Authe
     public function __construct(
         private Authenticator $authenticator,
         private RouterInterface $router,
-        ContainerInterface $container,
     ) {
-        $this->container = $container;
     }
 
     /**

diff --git a/src/Controllers/BackchannelLogoutController.php b/src/Controllers/BackchannelLogoutController.php
@@ -7,9 +7,8 @@
 use Auth0\SDK\Auth0;
 use Auth0\Symfony\Contracts\Controllers\AuthenticationControllerInterface;
 use Auth0\Symfony\Security\Authenticator;
-use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\{RedirectResponse, Request, Response};
+use Symfony\Component\HttpFoundation\{Request, Response};
 use Throwable;
 
 use function is_string;
@@ -18,9 +17,7 @@ final class BackchannelLogoutController extends AbstractController implements Au
 {
     public function __construct(
         private Authenticator $authenticator,
-        ContainerInterface $container,
     ) {
-        $this->container = $container;
     }
 
     /**