IBX-8558: Removed GuardRepositoryAuthenticationProvider due to Symf…

…ony security deprecations
ibexa · Jul 12, 2024 · fc81c0e · fc81c0e
1 parent ace51ec
commit fc81c0e
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 190 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -46970,31 +46970,6 @@ parameters:
 			count: 1
 			path: tests/lib/MVC/Symfony/Routing/UrlAliasRouterTest.php
 
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\TokenInterface\\:\\:getProviderKey\\(\\)\\.$#"
-			count: 1
-			path: tests/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProviderTest.php
-
-		-
-			message: "#^Method Ibexa\\\\Tests\\\\Core\\\\MVC\\\\Symfony\\\\Security\\\\Authentication\\\\GuardRepositoryAuthenticationProviderTest\\:\\:testAuthenticate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProviderTest.php
-
-		-
-			message: "#^Method Ibexa\\\\Tests\\\\Core\\\\MVC\\\\Symfony\\\\Security\\\\Authentication\\\\GuardRepositoryAuthenticationProviderTest\\:\\:testAuthenticateUnsupportedToken\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProviderTest.php
-
-		-
-			message: "#^Method Ibexa\\\\Tests\\\\Core\\\\MVC\\\\Symfony\\\\Security\\\\Authentication\\\\GuardRepositoryAuthenticationProviderTest\\:\\:testAuthenticateWrongGuardProviderKey\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProviderTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$token of method Ibexa\\\\Core\\\\MVC\\\\Symfony\\\\Security\\\\Authentication\\\\GuardRepositoryAuthenticationProvider\\:\\:authenticate\\(\\) expects Symfony\\\\Component\\\\Security\\\\Guard\\\\Token\\\\GuardTokenInterface, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\AnonymousToken given\\.$#"
-			count: 1
-			path: tests/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProviderTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Core\\\\MVC\\\\Symfony\\\\Security\\\\HttpUtilsTest\\:\\:checkRequestPathProvider\\(\\) has no return type specified\\.$#"
 			count: 1

diff --git a/src/bundle/Core/DependencyInjection/Compiler/SecurityPass.php b/src/bundle/Core/DependencyInjection/Compiler/SecurityPass.php
@@ -8,10 +8,8 @@
 
 namespace Ibexa\Bundle\Core\DependencyInjection\Compiler;
 
-use Ibexa\Contracts\Core\Repository\PermissionResolver;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\MVC\Symfony\Security\Authentication\DefaultAuthenticationSuccessHandler;
-use Ibexa\Core\MVC\Symfony\Security\Authentication\GuardRepositoryAuthenticationProvider;
 use Ibexa\Core\MVC\Symfony\Security\HttpUtils;
 use Ibexa\Core\MVC\Symfony\SiteAccess;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -26,21 +24,6 @@ final class SecurityPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (
-            !$container->hasDefinition('security.authentication.provider.guard')
-        ) {
-            return;
-        }
-
-        $permissionResolverRef = new Reference(PermissionResolver::class);
-
-        $guardAuthenticationProviderDef = $container->findDefinition('security.authentication.provider.guard');
-        $guardAuthenticationProviderDef->setClass(GuardRepositoryAuthenticationProvider::class);
-        $guardAuthenticationProviderDef->addMethodCall(
-            'setPermissionResolver',
-            [$permissionResolverRef]
-        );
-
         if (!$container->hasDefinition('security.http_utils')) {
             return;
         }

diff --git a/src/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProvider.php b/src/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProvider.php
diff --git a/tests/bundle/Core/DependencyInjection/Compiler/SecurityPassTest.php b/tests/bundle/Core/DependencyInjection/Compiler/SecurityPassTest.php
@@ -37,15 +37,10 @@ protected function registerCompilerPass(ContainerBuilder $container): void
         $container->addCompilerPass(new SecurityPass());
     }
 
-    public function testAlteredDaoAuthenticationProvider(): void
+    public function testAlteredHttpUtils(): void
     {
         $this->compile();
 
-        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'security.authentication.provider.guard',
-            'setPermissionResolver',
-            [new Reference(PermissionResolver::class)]
-        );
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
             'security.http_utils',
             'setSiteAccess',

diff --git a/tests/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProviderTest.php b/tests/lib/MVC/Symfony/Security/Authentication/GuardRepositoryAuthenticationProviderTest.php