Merge branch '4.4' into 5.1

* 4.4:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/DefinitionTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\Exception\LogicException;
 use Symfony\Component\Workflow\Transition;
 
 class DefinitionTest extends TestCase
@@ -36,7 +37,7 @@ public function testSetInitialPlaces()
 
     public function testSetInitialPlaceAndPlaceIsNotDefined()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Place "d" cannot be the initial place as it does not exist.');
         new Definition([], [], 'd');
     }
@@ -54,7 +55,7 @@ public function testAddTransition()
 
     public function testAddTransitionAndFromPlaceIsNotDefined()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Place "c" referenced in transition "name" does not exist.');
         $places = range('a', 'b');
 
@@ -63,7 +64,7 @@ public function testAddTransitionAndFromPlaceIsNotDefined()
 
     public function testAddTransitionAndToPlaceIsNotDefined()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Place "c" referenced in transition "name" does not exist.');
         $places = range('a', 'b');
 

Tests/EventListener/GuardListenerTest.php

@@ -39,11 +39,11 @@ protected function setUp(): void
         ];
         $expressionLanguage = new ExpressionLanguage();
         $token = new UsernamePasswordToken('username', 'credentials', 'provider', ['ROLE_USER']);
-        $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
+        $tokenStorage = $this->createMock(TokenStorageInterface::class);
         $tokenStorage->expects($this->any())->method('getToken')->willReturn($token);
-        $this->authenticationChecker = $this->getMockBuilder(AuthorizationCheckerInterface::class)->getMock();
-        $trustResolver = $this->getMockBuilder(AuthenticationTrustResolverInterface::class)->getMock();
-        $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
+        $this->authenticationChecker = $this->createMock(AuthorizationCheckerInterface::class);
+        $trustResolver = $this->createMock(AuthenticationTrustResolverInterface::class);
+        $this->validator = $this->createMock(ValidatorInterface::class);
         $roleHierarchy = new RoleHierarchy([]);
         $this->listener = new GuardListener($this->configuration, $expressionLanguage, $tokenStorage, $this->authenticationChecker, $trustResolver, $roleHierarchy, $this->validator);
     }
@@ -138,7 +138,7 @@ private function createEvent(Transition $transition = null)
         $subject = new Subject();
         $transition = $transition ?: new Transition('name', 'from', 'to');
 
-        $workflow = $this->getMockBuilder(WorkflowInterface::class)->getMock();
+        $workflow = $this->createMock(WorkflowInterface::class);
 
         return new GuardEvent($subject, new Marking($subject->getMarking() ?? []), $transition, $workflow);
     }

Tests/Metadata/InMemoryMetadataStoreTest.php

@@ -3,6 +3,7 @@
 namespace Symfony\Component\Workflow\Tests\Metadata;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Workflow\Exception\InvalidArgumentException;
 use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
 use Symfony\Component\Workflow\Transition;
 
@@ -77,7 +78,7 @@ public function testGetMetadata()
 
     public function testGetMetadataWithUnknownType()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Could not find a MetadataBag for the subject of type "bool".');
         $this->store->getMetadata('title', true);
     }

Tests/RegistryTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\Exception\InvalidArgumentException;
 use Symfony\Component\Workflow\MarkingStore\MarkingStoreInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\SupportStrategy\WorkflowSupportStrategyInterface;
@@ -18,9 +19,9 @@ protected function setUp(): void
     {
         $this->registry = new Registry();
 
-        $this->registry->addWorkflow(new Workflow(new Definition([], []), $this->getMockBuilder(MarkingStoreInterface::class)->getMock(), $this->getMockBuilder(EventDispatcherInterface::class)->getMock(), 'workflow1'), $this->createWorkflowSupportStrategy(Subject1::class));
-        $this->registry->addWorkflow(new Workflow(new Definition([], []), $this->getMockBuilder(MarkingStoreInterface::class)->getMock(), $this->getMockBuilder(EventDispatcherInterface::class)->getMock(), 'workflow2'), $this->createWorkflowSupportStrategy(Subject2::class));
-        $this->registry->addWorkflow(new Workflow(new Definition([], []), $this->getMockBuilder(MarkingStoreInterface::class)->getMock(), $this->getMockBuilder(EventDispatcherInterface::class)->getMock(), 'workflow3'), $this->createWorkflowSupportStrategy(Subject2::class));
+        $this->registry->addWorkflow(new Workflow(new Definition([], []), $this->createMock(MarkingStoreInterface::class), $this->createMock(EventDispatcherInterface::class), 'workflow1'), $this->createWorkflowSupportStrategy(Subject1::class));
+        $this->registry->addWorkflow(new Workflow(new Definition([], []), $this->createMock(MarkingStoreInterface::class), $this->createMock(EventDispatcherInterface::class), 'workflow2'), $this->createWorkflowSupportStrategy(Subject2::class));
+        $this->registry->addWorkflow(new Workflow(new Definition([], []), $this->createMock(MarkingStoreInterface::class), $this->createMock(EventDispatcherInterface::class), 'workflow3'), $this->createWorkflowSupportStrategy(Subject2::class));
     }
 
     protected function tearDown(): void
@@ -55,7 +56,7 @@ public function testGetWithSuccess()
 
     public function testGetWithMultipleMatch()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Too many workflows (workflow2, workflow3) match this subject (Symfony\Component\Workflow\Tests\Subject2); set a different name on each and use the second (name) argument of this method.');
         $w1 = $this->registry->get(new Subject2());
         $this->assertInstanceOf(Workflow::class, $w1);
@@ -64,7 +65,7 @@ public function testGetWithMultipleMatch()
 
     public function testGetWithNoMatch()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Unable to find a workflow for class "stdClass".');
         $w1 = $this->registry->get(new \stdClass());
         $this->assertInstanceOf(Workflow::class, $w1);
@@ -100,7 +101,7 @@ public function testAllWithNoMatch()
 
     private function createWorkflowSupportStrategy($supportedClassName)
     {
-        $strategy = $this->getMockBuilder(WorkflowSupportStrategyInterface::class)->getMock();
+        $strategy = $this->createMock(WorkflowSupportStrategyInterface::class);
         $strategy->expects($this->any())->method('supports')
             ->willReturnCallback(function ($workflow, $subject) use ($supportedClassName) {
                 return $subject instanceof $supportedClassName;

Tests/Validator/StateMachineValidatorTest.php

@@ -4,14 +4,15 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\Exception\InvalidDefinitionException;
 use Symfony\Component\Workflow\Transition;
 use Symfony\Component\Workflow\Validator\StateMachineValidator;
 
 class StateMachineValidatorTest extends TestCase
 {
     public function testWithMultipleTransitionWithSameNameShareInput()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidDefinitionException::class);
+        $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('A transition from a place/state must have an unique name.');
         $places = ['a', 'b', 'c'];
         $transitions[] = new Transition('t1', 'a', 'b');
@@ -35,7 +36,7 @@ public function testWithMultipleTransitionWithSameNameShareInput()
 
     public function testWithMultipleTos()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidDefinitionException::class);
+        $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('A transition in StateMachine can only have one output.');
         $places = ['a', 'b', 'c'];
         $transitions[] = new Transition('t1', 'a', ['b', 'c']);
@@ -58,7 +59,7 @@ public function testWithMultipleTos()
 
     public function testWithMultipleFroms()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidDefinitionException::class);
+        $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('A transition in StateMachine can only have one input.');
         $places = ['a', 'b', 'c'];
         $transitions[] = new Transition('t1', ['a', 'b'], 'c');
@@ -106,7 +107,7 @@ public function testValid()
 
     public function testWithTooManyInitialPlaces()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidDefinitionException::class);
+        $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('The state machine "foo" can not store many places. But the definition has 2 initial places. Only one is supported.');
         $places = range('a', 'c');
         $transitions = [];

Tests/Validator/WorkflowValidatorTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\Exception\InvalidDefinitionException;
 use Symfony\Component\Workflow\Tests\WorkflowBuilderTrait;
 use Symfony\Component\Workflow\Transition;
 use Symfony\Component\Workflow\Validator\WorkflowValidator;
@@ -14,7 +15,7 @@ class WorkflowValidatorTest extends TestCase
 
     public function testWorkflowWithInvalidNames()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\InvalidDefinitionException::class);
+        $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('All transitions for a place must have an unique name. Multiple transitions named "t1" where found for place "a" in workflow "foo".');
         $places = range('a', 'c');
 

Tests/WorkflowTest.php

@@ -8,6 +8,7 @@
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Event\GuardEvent;
 use Symfony\Component\Workflow\Event\TransitionEvent;
+use Symfony\Component\Workflow\Exception\LogicException;
 use Symfony\Component\Workflow\Exception\NotEnabledTransitionException;
 use Symfony\Component\Workflow\Exception\UndefinedTransitionException;
 use Symfony\Component\Workflow\Marking;
@@ -23,17 +24,17 @@ class WorkflowTest extends TestCase
 
     public function testGetMarkingWithInvalidStoreReturn()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('The value returned by the MarkingStore is not an instance of "Symfony\Component\Workflow\Marking" for workflow "unnamed".');
         $subject = new Subject();
-        $workflow = new Workflow(new Definition([], []), $this->getMockBuilder(MarkingStoreInterface::class)->getMock());
+        $workflow = new Workflow(new Definition([], []), $this->createMock(MarkingStoreInterface::class));
 
         $workflow->getMarking($subject);
     }
 
     public function testGetMarkingWithEmptyDefinition()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('The Marking is empty and there is no initial place for workflow "unnamed".');
         $subject = new Subject();
         $workflow = new Workflow(new Definition([], []), new MethodMarkingStore());
@@ -43,7 +44,7 @@ public function testGetMarkingWithEmptyDefinition()
 
     public function testGetMarkingWithImpossiblePlace()
     {
-        $this->expectException(\Symfony\Component\Workflow\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Place "nope" is not valid for workflow "unnamed".');
         $subject = new Subject();
         $subject->setMarking(['nope' => 1]);