Merge branch '5.1' into 5.2

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

Author: nicolas-grekas

Tests/PropertyAccessorArrayAccessTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\PropertyAccess\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
@@ -47,7 +48,7 @@ public function testGetValue($collection, $path, $value)
 
     public function testGetValueFailsIfNoSuchIndex()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchIndexException::class);
+        $this->expectException(NoSuchIndexException::class);
         $this->propertyAccessor = PropertyAccess::createPropertyAccessorBuilder()
             ->enableExceptionOnInvalidIndex()
             ->getPropertyAccessor();

Tests/PropertyAccessorCollectionTest.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\PropertyAccess\Tests;
 
+use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
+
 class PropertyAccessorCollectionTest_Car
 {
     private $axes;
@@ -121,8 +123,8 @@ public function testSetValueCallsAdderAndRemoverForCollections()
 
     public function testSetValueCallsAdderAndRemoverForNestedCollections()
     {
-        $car = $this->getMockBuilder(__CLASS__.'_CompositeCar')->getMock();
-        $structure = $this->getMockBuilder(__CLASS__.'_CarStructure')->getMock();
+        $car = $this->createMock(__CLASS__.'_CompositeCar');
+        $structure = $this->createMock(__CLASS__.'_CarStructure');
         $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
         $axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
 
@@ -148,9 +150,9 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
 
     public function testSetValueFailsIfNoAdderNorRemoverFound()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./');
-        $car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();
+        $car = $this->createMock(__CLASS__.'_CarNoAdderAndRemover');
         $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
         $axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
 
@@ -187,7 +189,7 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
 
     public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->expectExceptionMessageMatches('/The property "axes" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\PropertyAccessorCollectionTest_Car" can be defined with the methods "addAxis\(\)", "removeAxis\(\)" but the new value must be an array or an instance of \\\Traversable\./');
         $car = new PropertyAccessorCollectionTest_Car();
 

Tests/PropertyAccessorTest.php

@@ -13,8 +13,11 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\PropertyAccess\Exception\AccessException;
+use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;
 use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
+use Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException;
 use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
@@ -159,7 +162,7 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()
      */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousClass()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);
+        $this->expectException(AccessException::class);
         $this->expectExceptionMessage('The method "class@anonymous::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');
 
         $object = eval('return new class() {
@@ -179,7 +182,7 @@ public function getUninitialized(): array
      */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousStdClass()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);
+        $this->expectException(AccessException::class);
         $this->expectExceptionMessage('The method "stdClass@anonymous::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');
 
         $object = eval('return new class() extends \stdClass {
@@ -199,7 +202,7 @@ public function getUninitialized(): array
      */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousChildClass()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);
+        $this->expectException(AccessException::class);
         $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty@anonymous::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');
 
         $object = eval('return new class() extends \Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty {};');
@@ -302,7 +305,7 @@ public function testGetValueReadsMagicCallThatReturnsConstant()
      */
     public function testGetValueThrowsExceptionIfNotObjectOrArray($objectOrArray, $path)
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException::class);
+        $this->expectException(UnexpectedTypeException::class);
         $this->expectExceptionMessage('PropertyAccessor requires a graph of objects or arrays to operate on');
         $this->propertyAccessor->getValue($objectOrArray, $path);
     }
@@ -421,7 +424,7 @@ public function testSetValueUpdatesMagicCallIfEnabled()
      */
     public function testSetValueThrowsExceptionIfNotObjectOrArray($objectOrArray, $path)
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException::class);
+        $this->expectException(UnexpectedTypeException::class);
         $this->expectExceptionMessage('PropertyAccessor requires a graph of objects or arrays to operate on');
         $this->propertyAccessor->setValue($objectOrArray, $path, 'value');
     }
@@ -679,7 +682,7 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)
 
     public function testThrowTypeError()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Expected argument of type "DateTime", "string" given at property path "date"');
         $object = new TypeHinted();
 
@@ -688,7 +691,7 @@ public function testThrowTypeError()
 
     public function testThrowTypeErrorWithNullArgument()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Expected argument of type "DateTime", "null" given');
         $object = new TypeHinted();
 
@@ -740,7 +743,7 @@ public function testAttributeWithSpecialChars()
 
     public function testThrowTypeErrorWithInterface()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Expected argument of type "Countable", "string" given');
         $object = new TypeHinted();
 

Tests/PropertyPathTest.php

@@ -12,6 +12,8 @@
 namespace Symfony\Component\PropertyAccess\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;
+use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;
 use Symfony\Component\PropertyAccess\PropertyPath;
 
 class PropertyPathTest extends TestCase
@@ -25,13 +27,13 @@ public function testToString()
 
     public function testDotIsRequiredBeforeProperty()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
+        $this->expectException(InvalidPropertyPathException::class);
         new PropertyPath('[index]property');
     }
 
     public function testDotCannotBePresentAtTheBeginning()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
+        $this->expectException(InvalidPropertyPathException::class);
         new PropertyPath('.property');
     }
 
@@ -53,25 +55,25 @@ public function providePathsContainingUnexpectedCharacters()
      */
     public function testUnexpectedCharacters($path)
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
+        $this->expectException(InvalidPropertyPathException::class);
         new PropertyPath($path);
     }
 
     public function testPathCannotBeEmpty()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
+        $this->expectException(InvalidPropertyPathException::class);
         new PropertyPath('');
     }
 
     public function testPathCannotBeNull()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         new PropertyPath(null);
     }
 
     public function testPathCannotBeFalse()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         new PropertyPath(false);
     }