Merge branch '3.4' into 4.1

* 3.4:
  Update symfony links to https
  [FrameworkBundle] fixed guard event names for transitions
  [FrameworkBundle] fixed guard event names for transitions

Author: lyrixx

EventListener/GuardExpression.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Workflow\EventListener;
+
+use Symfony\Component\Workflow\Transition;
+
+class GuardExpression
+{
+    private $transition;
+
+    private $expression;
+
+    /**
+     * @param string $expression
+     */
+    public function __construct(Transition $transition, $expression)
+    {
+        $this->transition = $transition;
+        $this->expression = $expression;
+    }
+
+    public function getTransition()
+    {
+        return $this->transition;
+    }
+
+    public function getExpression()
+    {
+        return $this->expression;
+    }
+}

EventListener/GuardListener.php

@@ -50,8 +50,21 @@ public function onTransition(GuardEvent $event, $eventName)
             return;
         }
 
-        $expression = $this->configuration[$eventName];
+        $eventConfiguration = (array) $this->configuration[$eventName];
+        foreach ($eventConfiguration as $guard) {
+            if ($guard instanceof GuardExpression) {
+                if ($guard->getTransition() !== $event->getTransition()) {
+                    continue;
+                }
+                $this->validateGuardExpression($event, $guard->getExpression());
+            } else {
+                $this->validateGuardExpression($event, $guard);
+            }
+        }
+    }
 
+    private function validateGuardExpression(GuardEvent $event, string $expression)
+    {
         if (!$this->expressionLanguage->evaluate($expression, $this->getVariables($event))) {
             $blocker = TransitionBlocker::createBlockedByExpressionGuardListener($expression);
             $event->addTransitionBlocker($blocker);

Tests/EventListener/GuardListenerTest.php

@@ -11,6 +11,7 @@
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Event\GuardEvent;
 use Symfony\Component\Workflow\EventListener\ExpressionLanguage;
+use Symfony\Component\Workflow\EventListener\GuardExpression;
 use Symfony\Component\Workflow\EventListener\GuardListener;
 use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Transition;
@@ -21,12 +22,17 @@ class GuardListenerTest extends TestCase
     private $authenticationChecker;
     private $validator;
     private $listener;
+    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(new Transition('name', 'from', 'to'), '!is_valid(subject)'),
+                new GuardExpression(new Transition('name', 'from', 'to'), 'is_valid(subject)'),
+            ),
         );
         $expressionLanguage = new ExpressionLanguage();
         $token = $this->getMockBuilder(TokenInterface::class)->getMock();
@@ -36,7 +42,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()
@@ -97,11 +103,38 @@ public function testWithValidatorSupportedEventAndAccept()
         $this->assertFalse($event->isBlocked());
     }
 
-    private function createEvent()
+    public function testWithGuardExpressionWithNotSupportedTransition()
+    {
+        $event = $this->createEvent();
+        $this->configureValidator(false);
+        $this->listener->onTransition($event, 'test_expression');
+
+        $this->assertFalse($event->isBlocked());
+    }
+
+    public function testWithGuardExpressionWithSupportedTransition()
+    {
+        $event = $this->createEvent($this->configuration['test_expression'][1]->getTransition());
+        $this->configureValidator(true, true);
+        $this->listener->onTransition($event, 'test_expression');
+
+        $this->assertFalse($event->isBlocked());
+    }
+
+    public function testGuardExpressionBlocks()
+    {
+        $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(Transition $transition = null)
     {
         $subject = new \stdClass();
         $subject->marking = new Marking();
-        $transition = new Transition('name', 'from', 'to');
+        $transition = $transition ?: new Transition('name', 'from', 'to');
 
         $workflow = $this->getMockBuilder(WorkflowInterface::class)->getMock();
 

composer.json

@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Symfony Workflow Component",
     "keywords": ["workflow", "petrinet", "place", "transition", "statemachine", "state"],
-    "homepage": "http://symfony.com",
+    "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
         {
@@ -16,7 +16,7 @@
         },
         {
             "name": "Symfony Community",
-            "homepage": "http://symfony.com/contributors"
+            "homepage": "https://symfony.com/contributors"
         }
     ],
     "require": {