symfony
diff --git a/‎src/Symfony/Component/Workflow/Tests/WorkflowTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+25Lines changed: 25 additions & 0 deletions b/‎src/Symfony/Component/Workflow/Tests/WorkflowTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+25Lines changed: 25 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Workflow/Workflow.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Workflow/Workflow.php
+11-2Lines changed: 11 additions & 2 deletions b/‎src/Symfony/Component/Workflow/Workflow.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Workflow/Workflow.php
+11-2Lines changed: 11 additions & 2 deletions
@@ -137,6 +137,31 @@ public function testCanWithGuard()
         $this->assertFalse($workflow->can($subject, 't1'));
     }
 
+    public function testCanDoesNotTriggerGuardEventsForNotEnabledTransitions()
+    {
+        $definition = $this->createComplexWorkflowDefinition();
+        $subject = new \stdClass();
+        $subject->marking = null;
+
+        $dispatchedEvents = array();
+        $eventDispatcher = new EventDispatcher();
+
+        $workflow = new Workflow($definition, new MultipleStateMarkingStore(), $eventDispatcher, 'workflow_name');
+        $workflow->apply($subject, 't1');
+        $workflow->apply($subject, 't2');
+
+        $eventDispatcher->addListener('workflow.workflow_name.guard.t3', function () use (&$dispatchedEvents) {
+            $dispatchedEvents[] = 'workflow_name.guard.t3';
+        });
+        $eventDispatcher->addListener('workflow.workflow_name.guard.t4', function () use (&$dispatchedEvents) {
+            $dispatchedEvents[] = 'workflow_name.guard.t4';
+        });
+
+        $workflow->can($subject, 't3');
+
+        $this->assertSame(array('workflow_name.guard.t3'), $dispatchedEvents);
+    }
+
     /**
      * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage Unable to apply transition "t2" for workflow "unnamed".
 
@@ -92,10 +92,19 @@ public function getMarking($subject)
      */
     public function can($subject, $transitionName)
     {
-        $transitions = $this->getEnabledTransitions($subject);
+        $transitions = $this->definition->getTransitions();
+        $marking = $this->getMarking($subject);
 
         foreach ($transitions as $transition) {
-            if ($transitionName === $transition->getName()) {
+            foreach ($transition->getFroms() as $place) {
+                if (!$marking->has($place)) {
+                    // do not emit guard events for transitions where the marking does not contain
+                    // all "from places" (thus the transition couldn't be applied anyway)
+                    continue 2;
+                }
+            }
+
+            if ($transitionName === $transition->getName() && $this->doCan($subject, $marking, $transition)) {
                 return true;
             }
         }