[FrameworkBundle] fixed guard event names for transitions

Author: lyrixx

EventListener/GuardExpression.php

@@ -19,19 +19,22 @@ class GuardExpression
 
     private $expression;
 
-    public function getTransition(): Transition
+    /**
+     * @param string $expression
+     */
+    public function __construct(Transition $transition, $expression)
     {
-        return $this->transition;
+        $this->transition = $transition;
+        $this->expression = $expression;
     }
 
-    public function getExpression(): string
+    public function getTransition()
     {
-        return $this->expression;
+        return $this->transition;
     }
 
-    public function __construct(Transition $transition, string $expression)
+    public function getExpression()
     {
-        $this->transition = $transition;
-        $this->expression = $expression;
+        return $this->expression;
     }
 }

EventListener/GuardListener.php

@@ -18,7 +18,6 @@
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Event\GuardEvent;
 use Symfony\Component\Workflow\Exception\InvalidTokenConfigurationException;
-use Symfony\Component\Workflow\TransitionBlocker;
 
 /**
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
@@ -63,16 +62,15 @@ public function onTransition(GuardEvent $event, $eventName)
         }
     }
 
-    private function validateGuardExpression(GuardEvent $event, string $expression)
+    private function validateGuardExpression(GuardEvent $event, $expression)
     {
         if (!$this->expressionLanguage->evaluate($expression, $this->getVariables($event))) {
-            $blocker = TransitionBlocker::createBlockedByExpressionGuardListener($expression);
-            $event->addTransitionBlocker($blocker);
+            $event->setBlocked(true);
         }
     }
 
     // code should be sync with Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter
-    private function getVariables(GuardEvent $event): array
+    private function getVariables(GuardEvent $event)
     {
         $token = $this->tokenStorage->getToken();
 

Tests/EventListener/GuardListenerTest.php

@@ -21,16 +21,16 @@ class GuardListenerTest extends TestCase
     private $authenticationChecker;
     private $validator;
     private $listener;
-    private $transition;
+    private $configuration;
 
     protected function setUp()
     {
-        $configuration = array(
+        $this->configuration = array(
             'test_is_granted' => 'is_granted("something")',
             'test_is_valid' => 'is_valid(subject)',
             'test_expression' => array(
-                new GuardExpression($this->getTransition(true), '!is_valid(subject)'),
-                new GuardExpression($this->getTransition(true), 'is_valid(subject)'),
+                new GuardExpression(new Transition('name', 'from', 'to'), '!is_valid(subject)'),
+                new GuardExpression(new Transition('name', 'from', 'to'), 'is_valid(subject)'),
             ),
         );
         $expressionLanguage = new ExpressionLanguage();
@@ -41,7 +41,7 @@ protected function setUp()
         $this->authenticationChecker = $this->getMockBuilder(AuthorizationCheckerInterface::class)->getMock();
         $trustResolver = $this->getMockBuilder(AuthenticationTrustResolverInterface::class)->getMock();
         $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
-        $this->listener = new GuardListener($configuration, $expressionLanguage, $tokenStorage, $this->authenticationChecker, $trustResolver, null, $this->validator);
+        $this->listener = new GuardListener($this->configuration, $expressionLanguage, $tokenStorage, $this->authenticationChecker, $trustResolver, null, $this->validator);
     }
 
     protected function tearDown()
@@ -104,16 +104,16 @@ public function testWithValidatorSupportedEventAndAccept()
 
     public function testWithGuardExpressionWithNotSupportedTransition()
     {
-        $event = $this->createEvent(true);
-        $this->configureValidator(false, false);
+        $event = $this->createEvent();
+        $this->configureValidator(false);
         $this->listener->onTransition($event, 'test_expression');
 
         $this->assertFalse($event->isBlocked());
     }
 
     public function testWithGuardExpressionWithSupportedTransition()
     {
-        $event = $this->createEvent();
+        $event = $this->createEvent($this->configuration['test_expression'][1]->getTransition());
         $this->configureValidator(true, true);
         $this->listener->onTransition($event, 'test_expression');
 
@@ -122,18 +122,18 @@ public function testWithGuardExpressionWithSupportedTransition()
 
     public function testGuardExpressionBlocks()
     {
-        $event = $this->createEvent();
+        $event = $this->createEvent($this->configuration['test_expression'][1]->getTransition());
         $this->configureValidator(true, false);
         $this->listener->onTransition($event, 'test_expression');
 
         $this->assertTrue($event->isBlocked());
     }
 
-    private function createEvent($newTransition = false)
+    private function createEvent(Transition $transition = null)
     {
         $subject = new \stdClass();
         $subject->marking = new Marking();
-        $transition = $this->getTransition($newTransition);
+        $transition = $transition ?: new Transition('name', 'from', 'to');
 
         return new GuardEvent($subject, $subject->marking, $transition);
     }
@@ -173,13 +173,4 @@ private function configureValidator($isUsed, $valid = true)
             ->willReturn($valid ? array() : array('a violation'))
         ;
     }
-
-    private function getTransition($new = false)
-    {
-        if ($new || !$this->transition) {
-            $this->transition = new Transition('name', 'from', 'to');
-        }
-
-        return $this->transition;
-    }
 }