Use createMock() and use import instead of FQCN

OskarStark · nicolas-grekas · commit 94a1d9837396 · 2021-01-27T10:09:26.000+01:00
diff --git a/Tests/PropertyAccessorArrayAccessTest.php b/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();
diff --git a/Tests/PropertyAccessorCollectionTest.php b/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('/Could not determine access type for property "axes" in class "Symfony\\\\Component\\\\PropertyAccess\\\\Tests\\\\PropertyAccessorCollectionTest_Car[^"]*": 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, "string" given./');
         $car = new PropertyAccessorCollectionTest_Car();
 
diff --git a/Tests/PropertyAccessorTest.php b/Tests/PropertyAccessorTest.php
@@ -13,7 +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\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\ReturnTyped;
@@ -101,7 +105,7 @@ public function testGetValue($objectOrArray, $path, $value)
      */
     public function testGetValueThrowsExceptionIfPropertyNotFound($objectOrArray, $path)
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->propertyAccessor->getValue($objectOrArray, $path);
     }
 
@@ -138,7 +142,7 @@ public function testGetValueThrowsExceptionIfIndexNotFoundAndIndexExceptionsEnab
      */
     public function testGetValueThrowsExceptionIfUninitializedProperty()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);
+        $this->expectException(AccessException::class);
         $this->expectExceptionMessage('The property "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty::$uninitialized" is not readable because it is typed "string". You should initialize it or declare a default value instead.');
 
         $this->propertyAccessor->getValue(new UninitializedProperty(), 'uninitialized');
@@ -149,7 +153,7 @@ public function testGetValueThrowsExceptionIfUninitializedProperty()
      */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);
+        $this->expectException(AccessException::class);
         $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');
 
         $this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');
@@ -160,7 +164,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() {
@@ -180,7 +184,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 {
@@ -200,7 +204,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 {};');
@@ -259,7 +263,7 @@ public function testGetValueNotModifyObjectException()
 
     public function testGetValueDoesNotReadMagicCallByDefault()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->propertyAccessor->getValue(new TestClassMagicCall('Bernhard'), 'magicCallProperty');
     }
 
@@ -283,7 +287,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);
     }
@@ -303,7 +307,7 @@ public function testSetValue($objectOrArray, $path)
      */
     public function testSetValueThrowsExceptionIfPropertyNotFound($objectOrArray, $path)
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->propertyAccessor->setValue($objectOrArray, $path, 'Updated');
     }
 
@@ -347,15 +351,15 @@ public function testSetValueUpdatesMagicSet()
 
     public function testSetValueThrowsExceptionIfThereAreMissingParameters()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $object = new TestClass('Bernhard');
 
         $this->propertyAccessor->setValue($object, 'publicAccessorWithMoreRequiredParameters', 'Updated');
     }
 
     public function testSetValueDoesNotUpdateMagicCallByDefault()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $author = new TestClassMagicCall('Bernhard');
 
         $this->propertyAccessor->setValue($author, 'magicCallProperty', 'Updated');
@@ -377,7 +381,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');
     }
@@ -613,7 +617,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();
 
@@ -622,7 +626,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();
 
@@ -674,7 +678,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();
 
@@ -694,7 +698,7 @@ public function testAnonymousClassRead()
 
     public function testAnonymousClassReadThrowExceptionOnInvalidPropertyPath()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $obj = $this->generateAnonymousClass('bar');
 
         $this->propertyAccessor->getValue($obj, 'invalid_property');
@@ -820,39 +824,39 @@ public function testAdderAndRemoverArePreferredOverSetterForSameSingularAndPlura
 
     public function testAdderWithoutRemover()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->expectExceptionMessageMatches('/.*The add method "addFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidMethods" was found, but the corresponding remove method "removeFoo" was not found\./');
         $object = new TestAdderRemoverInvalidMethods();
         $this->propertyAccessor->setValue($object, 'foos', [1, 2]);
     }
 
     public function testRemoverWithoutAdder()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->expectExceptionMessageMatches('/.*The remove method "removeBar" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidMethods" was found, but the corresponding add method "addBar" was not found\./');
         $object = new TestAdderRemoverInvalidMethods();
         $this->propertyAccessor->setValue($object, 'bars', [1, 2]);
     }
 
     public function testAdderAndRemoveNeedsTheExactParametersDefined()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->expectExceptionMessageMatches('/.*The method "addFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidArgumentLength" requires 0 arguments, but should accept only 1\. The method "removeFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidArgumentLength" requires 2 arguments, but should accept only 1\./');
         $object = new TestAdderRemoverInvalidArgumentLength();
         $this->propertyAccessor->setValue($object, 'foo', [1, 2]);
     }
 
     public function testSetterNeedsTheExactParametersDefined()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->expectExceptionMessageMatches('/.*The method "setBar" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidArgumentLength" requires 2 arguments, but should accept only 1\./');
         $object = new TestAdderRemoverInvalidArgumentLength();
         $this->propertyAccessor->setValue($object, 'bar', [1, 2]);
     }
 
     public function testSetterNeedsPublicAccess()
     {
-        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);
+        $this->expectException(NoSuchPropertyException::class);
         $this->expectExceptionMessageMatches('/.*The method "setFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestClassSetValue" was found but does not have public access./');
         $object = new TestClassSetValue(0);
         $this->propertyAccessor->setValue($object, 'foo', 1);
diff --git a/Tests/PropertyPathTest.php b/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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,11 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Cache\Adapter\ArrayAdapter;`
	`16`	`+use Symfony\Component\PropertyAccess\Exception\AccessException;`
	`17`	`+use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;`
`16`	`18`	`use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;`
	`19`	`+use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;`
	`20`	`+use Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException;`
`17`	`21`	`use Symfony\Component\PropertyAccess\PropertyAccess;`
`18`	`22`	`use Symfony\Component\PropertyAccess\PropertyAccessor;`
`19`	`23`	`use Symfony\Component\PropertyAccess\Tests\Fixtures\ReturnTyped;`
`@@ -101,7 +105,7 @@ public function testGetValue($objectOrArray, $path, $value)`
`101`	`105`	`*/`
`102`	`106`	`public function testGetValueThrowsExceptionIfPropertyNotFound($objectOrArray, $path)`
`103`	`107`	`{`
`104`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`108`	`+ $this->expectException(NoSuchPropertyException::class);`
`105`	`109`	`$this->propertyAccessor->getValue($objectOrArray, $path);`
`106`	`110`	`}`
`107`	`111`
`@@ -138,7 +142,7 @@ public function testGetValueThrowsExceptionIfIndexNotFoundAndIndexExceptionsEnab`
`138`	`142`	`*/`
`139`	`143`	`public function testGetValueThrowsExceptionIfUninitializedProperty()`
`140`	`144`	`{`
`141`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);`
	`145`	`+ $this->expectException(AccessException::class);`
`142`	`146`	`$this->expectExceptionMessage('The property "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty::$uninitialized" is not readable because it is typed "string". You should initialize it or declare a default value instead.');`
`143`	`147`
`144`	`148`	`$this->propertyAccessor->getValue(new UninitializedProperty(), 'uninitialized');`
`@@ -149,7 +153,7 @@ public function testGetValueThrowsExceptionIfUninitializedProperty()`
`149`	`153`	`*/`
`150`	`154`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()`
`151`	`155`	`{`
`152`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);`
	`156`	`+ $this->expectException(AccessException::class);`
`153`	`157`	`$this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');`
`154`	`158`
`155`	`159`	`$this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');`
`@@ -160,7 +164,7 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()`
`160`	`164`	`*/`
`161`	`165`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousClass()`
`162`	`166`	`{`
`163`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);`
	`167`	`+ $this->expectException(AccessException::class);`
`164`	`168`	`$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"?');`
`165`	`169`
`166`	`170`	`$object = eval('return new class() {`
`@@ -180,7 +184,7 @@ public function getUninitialized(): array`
`180`	`184`	`*/`
`181`	`185`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousStdClass()`
`182`	`186`	`{`
`183`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);`
	`187`	`+ $this->expectException(AccessException::class);`
`184`	`188`	`$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"?');`
`185`	`189`
`186`	`190`	`$object = eval('return new class() extends \stdClass {`
`@@ -200,7 +204,7 @@ public function getUninitialized(): array`
`200`	`204`	`*/`
`201`	`205`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousChildClass()`
`202`	`206`	`{`
`203`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\AccessException::class);`
	`207`	`+ $this->expectException(AccessException::class);`
`204`	`208`	`$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"?');`
`205`	`209`
`206`	`210`	`$object = eval('return new class() extends \Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty {};');`
`@@ -259,7 +263,7 @@ public function testGetValueNotModifyObjectException()`
`259`	`263`
`260`	`264`	`public function testGetValueDoesNotReadMagicCallByDefault()`
`261`	`265`	`{`
`262`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`266`	`+ $this->expectException(NoSuchPropertyException::class);`
`263`	`267`	`$this->propertyAccessor->getValue(new TestClassMagicCall('Bernhard'), 'magicCallProperty');`
`264`	`268`	`}`
`265`	`269`
`@@ -283,7 +287,7 @@ public function testGetValueReadsMagicCallThatReturnsConstant()`
`283`	`287`	`*/`
`284`	`288`	`public function testGetValueThrowsExceptionIfNotObjectOrArray($objectOrArray, $path)`
`285`	`289`	`{`
`286`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException::class);`
	`290`	`+ $this->expectException(UnexpectedTypeException::class);`
`287`	`291`	`$this->expectExceptionMessage('PropertyAccessor requires a graph of objects or arrays to operate on');`
`288`	`292`	`$this->propertyAccessor->getValue($objectOrArray, $path);`
`289`	`293`	`}`
`@@ -303,7 +307,7 @@ public function testSetValue($objectOrArray, $path)`
`303`	`307`	`*/`
`304`	`308`	`public function testSetValueThrowsExceptionIfPropertyNotFound($objectOrArray, $path)`
`305`	`309`	`{`
`306`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`310`	`+ $this->expectException(NoSuchPropertyException::class);`
`307`	`311`	`$this->propertyAccessor->setValue($objectOrArray, $path, 'Updated');`
`308`	`312`	`}`
`309`	`313`
`@@ -347,15 +351,15 @@ public function testSetValueUpdatesMagicSet()`
`347`	`351`
`348`	`352`	`public function testSetValueThrowsExceptionIfThereAreMissingParameters()`
`349`	`353`	`{`
`350`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`354`	`+ $this->expectException(NoSuchPropertyException::class);`
`351`	`355`	`$object = new TestClass('Bernhard');`
`352`	`356`
`353`	`357`	`$this->propertyAccessor->setValue($object, 'publicAccessorWithMoreRequiredParameters', 'Updated');`
`354`	`358`	`}`
`355`	`359`
`356`	`360`	`public function testSetValueDoesNotUpdateMagicCallByDefault()`
`357`	`361`	`{`
`358`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`362`	`+ $this->expectException(NoSuchPropertyException::class);`
`359`	`363`	`$author = new TestClassMagicCall('Bernhard');`
`360`	`364`
`361`	`365`	`$this->propertyAccessor->setValue($author, 'magicCallProperty', 'Updated');`
`@@ -377,7 +381,7 @@ public function testSetValueUpdatesMagicCallIfEnabled()`
`377`	`381`	`*/`
`378`	`382`	`public function testSetValueThrowsExceptionIfNotObjectOrArray($objectOrArray, $path)`
`379`	`383`	`{`
`380`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException::class);`
	`384`	`+ $this->expectException(UnexpectedTypeException::class);`
`381`	`385`	`$this->expectExceptionMessage('PropertyAccessor requires a graph of objects or arrays to operate on');`
`382`	`386`	`$this->propertyAccessor->setValue($objectOrArray, $path, 'value');`
`383`	`387`	`}`
`@@ -613,7 +617,7 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)`
`613`	`617`
`614`	`618`	`public function testThrowTypeError()`
`615`	`619`	`{`
`616`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);`
	`620`	`+ $this->expectException(InvalidArgumentException::class);`
`617`	`621`	`$this->expectExceptionMessage('Expected argument of type "DateTime", "string" given at property path "date"');`
`618`	`622`	`$object = new TypeHinted();`
`619`	`623`
`@@ -622,7 +626,7 @@ public function testThrowTypeError()`
`622`	`626`
`623`	`627`	`public function testThrowTypeErrorWithNullArgument()`
`624`	`628`	`{`
`625`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);`
	`629`	`+ $this->expectException(InvalidArgumentException::class);`
`626`	`630`	`$this->expectExceptionMessage('Expected argument of type "DateTime", "null" given');`
`627`	`631`	`$object = new TypeHinted();`
`628`	`632`
`@@ -674,7 +678,7 @@ public function testAttributeWithSpecialChars()`
`674`	`678`
`675`	`679`	`public function testThrowTypeErrorWithInterface()`
`676`	`680`	`{`
`677`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);`
	`681`	`+ $this->expectException(InvalidArgumentException::class);`
`678`	`682`	`$this->expectExceptionMessage('Expected argument of type "Countable", "string" given');`
`679`	`683`	`$object = new TypeHinted();`
`680`	`684`
`@@ -694,7 +698,7 @@ public function testAnonymousClassRead()`
`694`	`698`
`695`	`699`	`public function testAnonymousClassReadThrowExceptionOnInvalidPropertyPath()`
`696`	`700`	`{`
`697`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`701`	`+ $this->expectException(NoSuchPropertyException::class);`
`698`	`702`	`$obj = $this->generateAnonymousClass('bar');`
`699`	`703`
`700`	`704`	`$this->propertyAccessor->getValue($obj, 'invalid_property');`
`@@ -820,39 +824,39 @@ public function testAdderAndRemoverArePreferredOverSetterForSameSingularAndPlura`
`820`	`824`
`821`	`825`	`public function testAdderWithoutRemover()`
`822`	`826`	`{`
`823`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`827`	`+ $this->expectException(NoSuchPropertyException::class);`
`824`	`828`	`$this->expectExceptionMessageMatches('/.*The add method "addFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidMethods" was found, but the corresponding remove method "removeFoo" was not found\./');`
`825`	`829`	`$object = new TestAdderRemoverInvalidMethods();`
`826`	`830`	`$this->propertyAccessor->setValue($object, 'foos', [1, 2]);`
`827`	`831`	`}`
`828`	`832`
`829`	`833`	`public function testRemoverWithoutAdder()`
`830`	`834`	`{`
`831`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`835`	`+ $this->expectException(NoSuchPropertyException::class);`
`832`	`836`	`$this->expectExceptionMessageMatches('/.*The remove method "removeBar" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidMethods" was found, but the corresponding add method "addBar" was not found\./');`
`833`	`837`	`$object = new TestAdderRemoverInvalidMethods();`
`834`	`838`	`$this->propertyAccessor->setValue($object, 'bars', [1, 2]);`
`835`	`839`	`}`
`836`	`840`
`837`	`841`	`public function testAdderAndRemoveNeedsTheExactParametersDefined()`
`838`	`842`	`{`
`839`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`843`	`+ $this->expectException(NoSuchPropertyException::class);`
`840`	`844`	`$this->expectExceptionMessageMatches('/.*The method "addFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidArgumentLength" requires 0 arguments, but should accept only 1\. The method "removeFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidArgumentLength" requires 2 arguments, but should accept only 1\./');`
`841`	`845`	`$object = new TestAdderRemoverInvalidArgumentLength();`
`842`	`846`	`$this->propertyAccessor->setValue($object, 'foo', [1, 2]);`
`843`	`847`	`}`
`844`	`848`
`845`	`849`	`public function testSetterNeedsTheExactParametersDefined()`
`846`	`850`	`{`
`847`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`851`	`+ $this->expectException(NoSuchPropertyException::class);`
`848`	`852`	`$this->expectExceptionMessageMatches('/.*The method "setBar" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestAdderRemoverInvalidArgumentLength" requires 2 arguments, but should accept only 1\./');`
`849`	`853`	`$object = new TestAdderRemoverInvalidArgumentLength();`
`850`	`854`	`$this->propertyAccessor->setValue($object, 'bar', [1, 2]);`
`851`	`855`	`}`
`852`	`856`
`853`	`857`	`public function testSetterNeedsPublicAccess()`
`854`	`858`	`{`
`855`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException::class);`
	`859`	`+ $this->expectException(NoSuchPropertyException::class);`
`856`	`860`	`$this->expectExceptionMessageMatches('/.*The method "setFoo" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\Fixtures\\\TestClassSetValue" was found but does not have public access./');`
`857`	`861`	`$object = new TestClassSetValue(0);`
`858`	`862`	`$this->propertyAccessor->setValue($object, 'foo', 1);`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`namespace Symfony\Component\PropertyAccess\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;`
	`16`	`+use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;`
`15`	`17`	`use Symfony\Component\PropertyAccess\PropertyPath;`
`16`	`18`
`17`	`19`	`class PropertyPathTest extends TestCase`
`@@ -25,13 +27,13 @@ public function testToString()`
`25`	`27`
`26`	`28`	`public function testDotIsRequiredBeforeProperty()`
`27`	`29`	`{`
`28`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);`
	`30`	`+ $this->expectException(InvalidPropertyPathException::class);`
`29`	`31`	`new PropertyPath('[index]property');`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public function testDotCannotBePresentAtTheBeginning()`
`33`	`35`	`{`
`34`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);`
	`36`	`+ $this->expectException(InvalidPropertyPathException::class);`
`35`	`37`	`new PropertyPath('.property');`
`36`	`38`	`}`
`37`	`39`
`@@ -53,25 +55,25 @@ public function providePathsContainingUnexpectedCharacters()`
`53`	`55`	`*/`
`54`	`56`	`public function testUnexpectedCharacters($path)`
`55`	`57`	`{`
`56`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);`
	`58`	`+ $this->expectException(InvalidPropertyPathException::class);`
`57`	`59`	`new PropertyPath($path);`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`public function testPathCannotBeEmpty()`
`61`	`63`	`{`
`62`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);`
	`64`	`+ $this->expectException(InvalidPropertyPathException::class);`
`63`	`65`	`new PropertyPath('');`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`public function testPathCannotBeNull()`
`67`	`69`	`{`
`68`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);`
	`70`	`+ $this->expectException(InvalidArgumentException::class);`
`69`	`71`	`new PropertyPath(null);`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`public function testPathCannotBeFalse()`
`73`	`75`	`{`
`74`		`- $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);`
	`76`	`+ $this->expectException(InvalidArgumentException::class);`
`75`	`77`	`new PropertyPath(false);`
`76`	`78`	`}`
`77`	`79`