[Workflow] add guard is_valid() method support

halundraN · halundraN · commit b89df2476922 · 2017-07-13T15:26:21.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -632,6 +632,7 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
                     new Reference('security.token_storage'),
                     new Reference('security.authorization_checker'),
                     new Reference('security.authentication.trust_resolver'),
+                    new Reference('validator'),
                     new Reference('security.role_hierarchy'),
                 ));
 
diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
@@ -29,5 +29,12 @@ protected function registerFunctions()
         }, function (array $variables, $attributes, $object = null) {
             return $variables['auth_checker']->isGranted($attributes, $object);
         });
+
+        $this->register('is_valid', function ($object = 'null', $groups = 'null') {
+            return sprintf('$validator->validate(%s, null, %s)', $object, $groups);
+        }, function (array $variables, $object = null, $groups = null) {
+            $errors = $variables['validator']->validate($object, null, $groups);
+            return count($errors) === 0;
+        });
     }
 }
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Event\GuardEvent;
 
 /**
@@ -28,14 +29,23 @@ class GuardListener
     private $authenticationChecker;
     private $trustResolver;
     private $roleHierarchy;
+    private $validator;
 
-    public function __construct($configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authenticationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null)
-    {
+    public function __construct(
+        $configuration,
+        ExpressionLanguage $expressionLanguage,
+        TokenStorageInterface $tokenStorage,
+        AuthorizationCheckerInterface $authenticationChecker,
+        AuthenticationTrustResolverInterface $trustResolver,
+        ValidatorInterface $validator,
+        RoleHierarchyInterface $roleHierarchy = null
+    ) {
         $this->configuration = $configuration;
         $this->expressionLanguage = $expressionLanguage;
         $this->tokenStorage = $tokenStorage;
         $this->authenticationChecker = $authenticationChecker;
         $this->trustResolver = $trustResolver;
+        $this->validator = $validator;
         $this->roleHierarchy = $roleHierarchy;
     }
 
@@ -72,6 +82,8 @@ private function getVariables(GuardEvent $event)
             'auth_checker' => $this->authenticationChecker,
             // needed for the is_* expression function
             'trust_resolver' => $this->trustResolver,
+            // needed for the is_valid expression function
+            'validator' => $this->validator
         );
 
         return $variables;
diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\EventListener\ExpressionLanguage;
 use Symfony\Component\Workflow\EventListener\GuardListener;
 use Symfony\Component\Workflow\Event\GuardEvent;
@@ -30,8 +31,9 @@ protected function setUp()
         $this->tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
         $authenticationChecker = $this->getMockBuilder(AuthorizationCheckerInterface::class)->getMock();
         $trustResolver = $this->getMockBuilder(AuthenticationTrustResolverInterface::class)->getMock();
+        $validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
 
-        $this->listener = new GuardListener($configuration, $expressionLanguage, $this->tokenStorage, $authenticationChecker, $trustResolver);
+        $this->listener = new GuardListener($configuration, $expressionLanguage, $this->tokenStorage, $authenticationChecker, $trustResolver, $validator);
     }
 
     protected function tearDown()

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,12 @@ protected function registerFunctions()`
`29`	`29`	`}, function (array $variables, $attributes, $object = null) {`
`30`	`30`	`return $variables['auth_checker']->isGranted($attributes, $object);`
`31`	`31`	`});`
	`32`	`+`
	`33`	`+ $this->register('is_valid', function ($object = 'null', $groups = 'null') {`
	`34`	`+ return sprintf('$validator->validate(%s, null, %s)', $object, $groups);`
	`35`	`+ }, function (array $variables, $object = null, $groups = null) {`
	`36`	`+ $errors = $variables['validator']->validate($object, null, $groups);`
	`37`	`+ return count($errors) === 0;`
	`38`	`+ });`
`32`	`39`	`}`
`33`	`40`	`}`