Merge branch '4.4' into 5.1

* 4.4:
  Use ::class keyword when possible

Author: fabpot

Tests/PropertyAccessorArrayAccessTest.php

@@ -47,7 +47,7 @@ public function testGetValue($collection, $path, $value)
 
     public function testGetValueFailsIfNoSuchIndex()
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException');
+        $this->expectException(\Symfony\Component\PropertyAccess\Exception\NoSuchIndexException::class);
         $this->propertyAccessor = PropertyAccess::createPropertyAccessorBuilder()
             ->enableExceptionOnInvalidIndex()
             ->getPropertyAccessor();

Tests/PropertyPathBuilderTest.php

@@ -118,13 +118,13 @@ public function testReplaceByIndexWithoutName()
 
     public function testReplaceByIndexDoesNotAllowInvalidOffsets()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $this->builder->replaceByIndex(6, 'new1');
     }
 
     public function testReplaceByIndexDoesNotAllowNegativeOffsets()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $this->builder->replaceByIndex(-1, 'new1');
     }
 
@@ -148,13 +148,13 @@ public function testReplaceByPropertyWithoutName()
 
     public function testReplaceByPropertyDoesNotAllowInvalidOffsets()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $this->builder->replaceByProperty(6, 'new1');
     }
 
     public function testReplaceByPropertyDoesNotAllowNegativeOffsets()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $this->builder->replaceByProperty(-1, 'new1');
     }
 
@@ -190,7 +190,7 @@ public function testReplaceNegative()
      */
     public function testReplaceDoesNotAllowInvalidOffsets($offset)
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $this->builder->replace($offset, 1, new PropertyPath('new1[new2].new3'));
     }
 
@@ -264,13 +264,13 @@ public function testRemove()
 
     public function testRemoveDoesNotAllowInvalidOffsets()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $this->builder->remove(6);
     }
 
     public function testRemoveDoesNotAllowNegativeOffsets()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $this->builder->remove(-1);
     }
 

Tests/PropertyPathTest.php

@@ -25,13 +25,13 @@ public function testToString()
 
     public function testDotIsRequiredBeforeProperty()
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
+        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
         new PropertyPath('[index]property');
     }
 
     public function testDotCannotBePresentAtTheBeginning()
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
+        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
         new PropertyPath('.property');
     }
 
@@ -53,25 +53,25 @@ public function providePathsContainingUnexpectedCharacters()
      */
     public function testUnexpectedCharacters($path)
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
+        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
         new PropertyPath($path);
     }
 
     public function testPathCannotBeEmpty()
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
+        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException::class);
         new PropertyPath('');
     }
 
     public function testPathCannotBeNull()
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
+        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);
         new PropertyPath(null);
     }
 
     public function testPathCannotBeFalse()
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
+        $this->expectException(\Symfony\Component\PropertyAccess\Exception\InvalidArgumentException::class);
         new PropertyPath(false);
     }
 
@@ -120,15 +120,15 @@ public function testGetElement()
 
     public function testGetElementDoesNotAcceptInvalidIndices()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $propertyPath = new PropertyPath('grandpa.parent[child]');
 
         $propertyPath->getElement(3);
     }
 
     public function testGetElementDoesNotAcceptNegativeIndices()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $propertyPath = new PropertyPath('grandpa.parent[child]');
 
         $propertyPath->getElement(-1);
@@ -144,15 +144,15 @@ public function testIsProperty()
 
     public function testIsPropertyDoesNotAcceptInvalidIndices()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $propertyPath = new PropertyPath('grandpa.parent[child]');
 
         $propertyPath->isProperty(3);
     }
 
     public function testIsPropertyDoesNotAcceptNegativeIndices()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $propertyPath = new PropertyPath('grandpa.parent[child]');
 
         $propertyPath->isProperty(-1);
@@ -168,15 +168,15 @@ public function testIsIndex()
 
     public function testIsIndexDoesNotAcceptInvalidIndices()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $propertyPath = new PropertyPath('grandpa.parent[child]');
 
         $propertyPath->isIndex(3);
     }
 
     public function testIsIndexDoesNotAcceptNegativeIndices()
     {
-        $this->expectException('OutOfBoundsException');
+        $this->expectException(\OutOfBoundsException::class);
         $propertyPath = new PropertyPath('grandpa.parent[child]');
 
         $propertyPath->isIndex(-1);