symfony · ro0NL · Jun 26, 2016 · Jun 26, 2016 · Jun 26, 2016 · Jun 28, 2016
diff --git a/src/Symfony/Component/Workflow/Definition.php b/src/Symfony/Component/Workflow/Definition.php
@@ -21,9 +21,7 @@
 class Definition
 {
     private $places = array();
-
     private $transitions = array();
-
     private $initialPlace;
 
     /**

diff --git a/src/Symfony/Component/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php
@@ -22,15 +22,13 @@
 class Event extends BaseEvent
 {
     private $subject;
-
     private $marking;
-
     private $transition;
 
     /**
      * Event constructor.
      *
-     * @param mixed      $subject
+     * @param object     $subject
      * @param Marking    $marking
      * @param Transition $transition
      */

diff --git a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
@@ -30,19 +30,19 @@ public function __construct(LoggerInterface $logger)
     public function onLeave(Event $event)
     {
         foreach ($event->getTransition()->getFroms() as $place) {
-            $this->logger->info(sprintf('leaving "%s" for subject of class "%s"', $place, get_class($event->getSubject())));
+            $this->logger->info(sprintf('Leaving "%s" for subject of class "%s".', $place, get_class($event->getSubject())));
         }
     }
 
     public function onTransition(Event $event)
     {
-        $this->logger->info(sprintf('transition "%s" for subject of class "%s"', $event->getTransition()->getName(), get_class($event->getSubject())));
+        $this->logger->info(sprintf('Transition "%s" for subject of class "%s".', $event->getTransition()->getName(), get_class($event->getSubject())));
     }
 
     public function onEnter(Event $event)
     {
         foreach ($event->getTransition()->getTos() as $place) {
-            $this->logger->info(sprintf('entering "%s" for subject of class "%s"', $place, get_class($event->getSubject())));
+            $this->logger->info(sprintf('Entering "%s" for subject of class "%s".', $place, get_class($event->getSubject())));
         }
     }
 

diff --git a/src/Symfony/Component/Workflow/MarkingStore/PropertyAccessorMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/PropertyAccessorMarkingStore.php
@@ -23,7 +23,6 @@
 class PropertyAccessorMarkingStore implements MarkingStoreInterface
 {
     private $property;
-
     private $propertyAccessor;
 
     /**

diff --git a/src/Symfony/Component/Workflow/MarkingStore/ScalarMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/ScalarMarkingStore.php
@@ -23,7 +23,6 @@
 class ScalarMarkingStore implements MarkingStoreInterface, UniqueTransitionOutputInterface
 {
     private $property;
-
     private $propertyAccessor;
 
     /**

diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
@@ -23,19 +23,19 @@ class Registry
 
     /**
      * @param Workflow $workflow
-     * @param string   $classname
+     * @param string   $className
      */
-    public function add(Workflow $workflow, $classname)
+    public function add(Workflow $workflow, $className)
     {
-        $this->workflows[] = array($workflow, $classname);
+        $this->workflows[] = array($workflow, $className);
     }
 
     public function get($subject, $workflowName = null)
     {
         $matched = null;
 
-        foreach ($this->workflows as list($workflow, $classname)) {
-            if ($this->supports($workflow, $classname, $subject, $workflowName)) {
+        foreach ($this->workflows as list($workflow, $className)) {
+            if ($this->supports($workflow, $className, $subject, $workflowName)) {
                 if ($matched) {
                     throw new InvalidArgumentException('At least two workflows match this subject. Set a different name on each and use the second (name) argument of this method.');
                 }
@@ -50,9 +50,9 @@ public function get($subject, $workflowName = null)
         return $matched;
     }
 
-    private function supports(Workflow $workflow, $classname, $subject, $name)
+    private function supports(Workflow $workflow, $className, $subject, $name)
     {
-        if (!$subject instanceof $classname) {
+        if (!$subject instanceof $className) {
             return false;
         }
 

diff --git a/src/Symfony/Component/Workflow/Tests/DefinitionTest.php b/src/Symfony/Component/Workflow/Tests/DefinitionTest.php
@@ -28,7 +28,7 @@ public function testSetInitialPlace()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage Place "d" cannot be the initial place as it does not exist.
      */
     public function testSetInitialPlaceAndPlaceIsNotDefined()
@@ -50,7 +50,7 @@ public function testAddTransition()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage Place "c" referenced in transition "name" does not exist.
      */
     public function testAddTransitionAndFromPlaceIsNotDefined()
@@ -61,7 +61,7 @@ public function testAddTransitionAndFromPlaceIsNotDefined()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage Place "c" referenced in transition "name" does not exist.
      */
     public function testAddTransitionAndToPlaceIsNotDefined()

diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/AuditTrailListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/AuditTrailListenerTest.php
@@ -34,9 +34,9 @@ public function testItWorks()
         $workflow->apply($object, 't1');
 
         $expected = array(
-            'leaving "a" for subject of class "stdClass"',
-            'transition "t1" for subject of class "stdClass"',
-            'entering "b" for subject of class "stdClass"',
+            'Leaving "a" for subject of class "stdClass".',
+            'Transition "t1" for subject of class "stdClass".',
+            'Entering "b" for subject of class "stdClass".',
         );
 
         $this->assertSame($expected, $logger->logs);

diff --git a/src/Symfony/Component/Workflow/Tests/RegistryTest.php b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
@@ -44,7 +44,7 @@ public function testGetWithSuccess()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\InvalidArgumentException
+     * @expectedException \Symfony\Component\Workflow\Exception\InvalidArgumentException
      * @expectedExceptionMessage At least two workflows match this subject. Set a different name on each and use the second (name) argument of this method.
      */
     public function testGetWithMultipleMatch()

diff --git a/src/Symfony/Component/Workflow/Tests/TransitionTest.php b/src/Symfony/Component/Workflow/Tests/TransitionTest.php
@@ -7,7 +7,7 @@
 class TransitionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\InvalidArgumentException
+     * @expectedException \Symfony\Component\Workflow\Exception\InvalidArgumentException
      * @expectedExceptionMessage The transition "foo.bar" contains invalid characters.
      */
     public function testValidateName()

diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -15,7 +15,7 @@
 class WorkflowTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage The marking store (Symfony\Component\Workflow\MarkingStore\ScalarMarkingStore) of workflow "unnamed" can not store many places. But the transition "t1" has too many output (2). Only one is accepted.
      */
     public function testConstructorWithUniqueTransitionOutputInterfaceAndComplexWorkflow()
@@ -35,7 +35,7 @@ public function testConstructorWithUniqueTransitionOutputInterfaceAndSimpleWorkf
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage The value returned by the MarkingStore is not an instance of "Symfony\Component\Workflow\Marking" for workflow "unnamed".
      */
     public function testGetMarkingWithInvalidStoreReturn()
@@ -48,7 +48,7 @@ public function testGetMarkingWithInvalidStoreReturn()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage The Marking is empty and there is no initial place for workflow "unnamed".
      */
     public function testGetMarkingWithEmptyDefinition()
@@ -61,7 +61,7 @@ public function testGetMarkingWithEmptyDefinition()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage Place "nope" is not valid for workflow "unnamed".
      */
     public function testGetMarkingWithImpossiblePlace()
@@ -104,7 +104,7 @@ public function testGetMarkingWithExistingMarking()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage Transition "foobar" does not exist for workflow "unnamed".
      */
     public function testCanWithUnexistingTransition()
@@ -141,7 +141,7 @@ public function testCanWithGuard()
     }
 
     /**
-     * @expectedException Symfony\Component\Workflow\Exception\LogicException
+     * @expectedException \Symfony\Component\Workflow\Exception\LogicException
      * @expectedExceptionMessage Unable to apply transition "t2" for workflow "unnamed".
      */
     public function testApplyWithImpossibleTransition()

diff --git a/src/Symfony/Component/Workflow/Transition.php b/src/Symfony/Component/Workflow/Transition.php
@@ -20,9 +20,7 @@
 class Transition
 {
     private $name;
-
     private $froms;
-
     private $tos;
 
     /**

diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
@@ -109,7 +109,6 @@ public function can($subject, $transitionName)
         }
 
         $transition = $transitions[$transitionName];
-
         $marking = $this->getMarking($subject);
 
         return $this->doCan($subject, $marking, $transition);
@@ -135,7 +134,6 @@ public function apply($subject, $transitionName)
         // We can shortcut the getMarking method in order to boost performance,
         // since the "can" method already checks the Marking state
         $marking = $this->markingStore->getMarking($subject);
-
         $transition = $this->definition->getTransitions()[$transitionName];
 
         $this->leave($subject, $transition, $marking);
@@ -161,7 +159,6 @@ public function apply($subject, $transitionName)
     public function getEnabledTransitions($subject)
     {
         $enabled = array();
-
         $marking = $this->getMarking($subject);
 
         foreach ($this->definition->getTransitions() as $transition) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ @@
     class PropertyAccessorMarkingStore implements MarkingStoreInterface
     {
         private $property;
         private $propertyAccessor;
         /**
@@ Expand Down @@