Fixes

HypeMC · HypeMC · commit 3957a986d17b · 2022-07-21T13:41:45.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
@@ -36,6 +36,7 @@ public function process(ContainerBuilder $container)
 
         if (!$container->hasDefinition('cache.system')) {
             $container->removeDefinition('cache.security_expression_language');
+            $container->removeDefinition('cache.security_is_granted_attribute_expression_language');
         }
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -112,6 +112,7 @@ public function load(array $configs, ContainerBuilder $container)
         if (!$container::willBeAvailable('symfony/expression-language', ExpressionLanguage::class, ['symfony/security-bundle'])) {
             $container->removeDefinition('security.expression_language');
             $container->removeDefinition('security.access.expression_voter');
+            $container->removeDefinition('security.is_granted_attribute_expression_language');
         }
 
         // set some global scalars
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
@@ -18,6 +18,7 @@
 use Symfony\Bundle\SecurityBundle\Security\FirewallMap;
 use Symfony\Bundle\SecurityBundle\Security\LazyFirewallContext;
 use Symfony\Bundle\SecurityBundle\Security\Security;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
 use Symfony\Component\Ldap\Security\LdapUserProvider;
 use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
@@ -277,8 +278,16 @@
         ->set('controller.is_granted_attribute_listener', IsGrantedAttributeListener::class)
             ->args([
                 service('security.authorization_checker'),
-                service('security.expression_language')->nullOnInvalid(),
+                service('security.is_granted_attribute_expression_language')->nullOnInvalid(),
             ])
             ->tag('kernel.event_subscriber')
+
+        ->set('security.is_granted_attribute_expression_language', BaseExpressionLanguage::class)
+            ->args([service('cache.security_is_granted_attribute_expression_language')->nullOnInvalid()])
+
+        ->set('cache.security_is_granted_attribute_expression_language')
+            ->parent('cache.system')
+            ->private()
+            ->tag('cache.pool')
     ;
 };
diff --git a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
@@ -13,12 +13,13 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\ExpressionLanguage\Expression;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Security\Core\Authorization\ExpressionLanguage;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\LogicException;
 use Symfony\Component\Security\Core\Exception\RuntimeException;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
@@ -52,7 +53,7 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event)
                 if ($subjectRef instanceof Expression) {
                     $this->expressionLanguage ??= class_exists(Expression::class)
                         ? new ExpressionLanguage()
-                        : throw new \LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".')
+                        : throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".')
                     ;
                     $subject = $this->expressionLanguage->evaluate($subjectRef, [
                         'args' => $arguments,

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public function process(ContainerBuilder $container)`
`36`	`36`
`37`	`37`	`if (!$container->hasDefinition('cache.system')) {`
`38`	`38`	`$container->removeDefinition('cache.security_expression_language');`
	`39`	`+ $container->removeDefinition('cache.security_is_granted_attribute_expression_language');`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ public function load(array $configs, ContainerBuilder $container)`
`112`	`112`	`if (!$container::willBeAvailable('symfony/expression-language', ExpressionLanguage::class, ['symfony/security-bundle'])) {`
`113`	`113`	`$container->removeDefinition('security.expression_language');`
`114`	`114`	`$container->removeDefinition('security.access.expression_voter');`
	`115`	`+ $container->removeDefinition('security.is_granted_attribute_expression_language');`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`// set some global scalars`