Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit ef642d5beb3e · 2023-02-07T10:48:05.000+01:00
* 5.4:
  minor #49253 [PHPUnit 10] Use `TestCase` suffix for abstract tests in `/Tests/` (OskarStark)
diff --git a/Tests/PropertyAccessorArrayAccessTestCase.php b/Tests/PropertyAccessorArrayAccessTestCase.php
@@ -16,7 +16,7 @@
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
-abstract class PropertyAccessorArrayAccessTest extends TestCase
+abstract class PropertyAccessorArrayAccessTestCase extends TestCase
 {
     /**
      * @var PropertyAccessor
diff --git a/Tests/PropertyAccessorArrayObjectTest.php b/Tests/PropertyAccessorArrayObjectTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\PropertyAccess\Tests;
 
-class PropertyAccessorArrayObjectTest extends PropertyAccessorCollectionTest
+class PropertyAccessorArrayObjectTest extends PropertyAccessorCollectionTestCase
 {
     protected static function getContainer(array $array)
     {
diff --git a/Tests/PropertyAccessorArrayTest.php b/Tests/PropertyAccessorArrayTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\PropertyAccess\Tests;
 
-class PropertyAccessorArrayTest extends PropertyAccessorCollectionTest
+class PropertyAccessorArrayTest extends PropertyAccessorCollectionTestCase
 {
     protected static function getContainer(array $array)
     {
diff --git a/Tests/PropertyAccessorCollectionTestCase.php b/Tests/PropertyAccessorCollectionTestCase.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 
-class PropertyAccessorCollectionTest_Car
+class PropertyAccessorCollectionTestCase_Car
 {
     private $axes;
 
@@ -45,7 +45,7 @@ public function getAxes()
     }
 }
 
-class PropertyAccessorCollectionTest_CarOnlyAdder
+class PropertyAccessorCollectionTestCase_CarOnlyAdder
 {
     public function addAxis($axis)
     {
@@ -56,7 +56,7 @@ public function getAxes()
     }
 }
 
-class PropertyAccessorCollectionTest_CarOnlyRemover
+class PropertyAccessorCollectionTestCase_CarOnlyRemover
 {
     public function removeAxis($axis)
     {
@@ -67,14 +67,14 @@ public function getAxes()
     }
 }
 
-class PropertyAccessorCollectionTest_CarNoAdderAndRemover
+class PropertyAccessorCollectionTestCase_CarNoAdderAndRemover
 {
     public function getAxes()
     {
     }
 }
 
-class PropertyAccessorCollectionTest_CompositeCar
+class PropertyAccessorCollectionTestCase_CompositeCar
 {
     public function getStructure()
     {
@@ -85,7 +85,7 @@ public function setStructure($structure)
     }
 }
 
-class PropertyAccessorCollectionTest_CarStructure
+class PropertyAccessorCollectionTestCase_CarStructure
 {
     public function addAxis($axis)
     {
@@ -100,7 +100,7 @@ public function getAxes()
     }
 }
 
-abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAccessTest
+abstract class PropertyAccessorCollectionTestCase extends PropertyAccessorArrayAccessTestCase
 {
     public function testSetValueCallsAdderAndRemoverForCollections()
     {
@@ -111,7 +111,7 @@ public function testSetValueCallsAdderAndRemoverForCollections()
 
         // Don't use a mock in order to test whether the collections are
         // modified while iterating them
-        $car = new PropertyAccessorCollectionTest_Car($axesBefore);
+        $car = new PropertyAccessorCollectionTestCase_Car($axesBefore);
 
         $this->propertyAccessor->setValue($car, 'axes', $axesMerged);
 
@@ -151,7 +151,7 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
     public function testSetValueFailsIfNoAdderNorRemoverFound()
     {
         $this->expectException(NoSuchPropertyException::class);
-        $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./');
+        $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTestCase_CarNoAdderAndRemover_[^"]*"./');
         $car = $this->createMock(__CLASS__.'_CarNoAdderAndRemover');
         $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
         $axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
@@ -165,33 +165,33 @@ public function testSetValueFailsIfNoAdderNorRemoverFound()
 
     public function testIsWritableReturnsTrueIfAdderAndRemoverExists()
     {
-        $car = new PropertyAccessorCollectionTest_Car();
+        $car = new PropertyAccessorCollectionTestCase_Car();
         $this->assertTrue($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyAdderExists()
     {
-        $car = new PropertyAccessorCollectionTest_CarOnlyAdder();
+        $car = new PropertyAccessorCollectionTestCase_CarOnlyAdder();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyRemoverExists()
     {
-        $car = new PropertyAccessorCollectionTest_CarOnlyRemover();
+        $car = new PropertyAccessorCollectionTestCase_CarOnlyRemover();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
     {
-        $car = new PropertyAccessorCollectionTest_CarNoAdderAndRemover();
+        $car = new PropertyAccessorCollectionTestCase_CarNoAdderAndRemover();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
     {
         $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();
+        $this->expectExceptionMessageMatches('/The property "axes" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\PropertyAccessorCollectionTestCase_Car" can be defined with the methods "addAxis\(\)", "removeAxis\(\)" but the new value must be an array or an instance of \\\Traversable\./');
+        $car = new PropertyAccessorCollectionTestCase_Car();
 
         $this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
     }
diff --git a/Tests/PropertyAccessorNonTraversableArrayObjectTest.php b/Tests/PropertyAccessorNonTraversableArrayObjectTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\PropertyAccess\Tests\Fixtures\NonTraversableArrayObject;
 
-class PropertyAccessorNonTraversableArrayObjectTest extends PropertyAccessorArrayAccessTest
+class PropertyAccessorNonTraversableArrayObjectTest extends PropertyAccessorArrayAccessTestCase
 {
     protected static function getContainer(array $array)
     {
diff --git a/Tests/PropertyAccessorTraversableArrayObjectTest.php b/Tests/PropertyAccessorTraversableArrayObjectTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TraversableArrayObject;
 
-class PropertyAccessorTraversableArrayObjectTest extends PropertyAccessorCollectionTest
+class PropertyAccessorTraversableArrayObjectTest extends PropertyAccessorCollectionTestCase
 {
     protected static function getContainer(array $array)
     {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Symfony\Component\PropertyAccess\PropertyAccess;`
`17`	`17`	`use Symfony\Component\PropertyAccess\PropertyAccessor;`
`18`	`18`
`19`		`-abstract class PropertyAccessorArrayAccessTest extends TestCase`
	`19`	`+abstract class PropertyAccessorArrayAccessTestCase extends TestCase`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @var PropertyAccessor`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\PropertyAccess\Tests;`
`13`	`13`
`14`		`-class PropertyAccessorArrayObjectTest extends PropertyAccessorCollectionTest`
	`14`	`+class PropertyAccessorArrayObjectTest extends PropertyAccessorCollectionTestCase`
`15`	`15`	`{`
`16`	`16`	`protected static function getContainer(array $array)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;`
`15`	`15`
`16`		`-class PropertyAccessorCollectionTest_Car`
	`16`	`+class PropertyAccessorCollectionTestCase_Car`
`17`	`17`	`{`
`18`	`18`	`private $axes;`
`19`	`19`
`@@ -45,7 +45,7 @@ public function getAxes()`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-class PropertyAccessorCollectionTest_CarOnlyAdder`
	`48`	`+class PropertyAccessorCollectionTestCase_CarOnlyAdder`
`49`	`49`	`{`
`50`	`50`	`public function addAxis($axis)`
`51`	`51`	`{`
`@@ -56,7 +56,7 @@ public function getAxes()`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`-class PropertyAccessorCollectionTest_CarOnlyRemover`
	`59`	`+class PropertyAccessorCollectionTestCase_CarOnlyRemover`
`60`	`60`	`{`
`61`	`61`	`public function removeAxis($axis)`
`62`	`62`	`{`
`@@ -67,14 +67,14 @@ public function getAxes()`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-class PropertyAccessorCollectionTest_CarNoAdderAndRemover`
	`70`	`+class PropertyAccessorCollectionTestCase_CarNoAdderAndRemover`
`71`	`71`	`{`
`72`	`72`	`public function getAxes()`
`73`	`73`	`{`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`-class PropertyAccessorCollectionTest_CompositeCar`
	`77`	`+class PropertyAccessorCollectionTestCase_CompositeCar`
`78`	`78`	`{`
`79`	`79`	`public function getStructure()`
`80`	`80`	`{`
`@@ -85,7 +85,7 @@ public function setStructure($structure)`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`-class PropertyAccessorCollectionTest_CarStructure`
	`88`	`+class PropertyAccessorCollectionTestCase_CarStructure`
`89`	`89`	`{`
`90`	`90`	`public function addAxis($axis)`
`91`	`91`	`{`
`@@ -100,7 +100,7 @@ public function getAxes()`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`-abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAccessTest`
	`103`	`+abstract class PropertyAccessorCollectionTestCase extends PropertyAccessorArrayAccessTestCase`
`104`	`104`	`{`
`105`	`105`	`public function testSetValueCallsAdderAndRemoverForCollections()`
`106`	`106`	`{`
`@@ -111,7 +111,7 @@ public function testSetValueCallsAdderAndRemoverForCollections()`
`111`	`111`
`112`	`112`	`// Don't use a mock in order to test whether the collections are`
`113`	`113`	`// modified while iterating them`
`114`		`- $car = new PropertyAccessorCollectionTest_Car($axesBefore);`
	`114`	`+ $car = new PropertyAccessorCollectionTestCase_Car($axesBefore);`
`115`	`115`
`116`	`116`	`$this->propertyAccessor->setValue($car, 'axes', $axesMerged);`
`117`	`117`
`@@ -151,7 +151,7 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()`
`151`	`151`	`public function testSetValueFailsIfNoAdderNorRemoverFound()`
`152`	`152`	`{`
`153`	`153`	`$this->expectException(NoSuchPropertyException::class);`
`154`		`- $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./');`
	`154`	`+ $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTestCase_CarNoAdderAndRemover_[^"]*"./');`
`155`	`155`	`$car = $this->createMock(__CLASS__.'_CarNoAdderAndRemover');`
`156`	`156`	`$axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);`
`157`	`157`	`$axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);`
`@@ -165,33 +165,33 @@ public function testSetValueFailsIfNoAdderNorRemoverFound()`
`165`	`165`
`166`	`166`	`public function testIsWritableReturnsTrueIfAdderAndRemoverExists()`
`167`	`167`	`{`
`168`		`- $car = new PropertyAccessorCollectionTest_Car();`
	`168`	`+ $car = new PropertyAccessorCollectionTestCase_Car();`
`169`	`169`	`$this->assertTrue($this->propertyAccessor->isWritable($car, 'axes'));`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`public function testIsWritableReturnsFalseIfOnlyAdderExists()`
`173`	`173`	`{`
`174`		`- $car = new PropertyAccessorCollectionTest_CarOnlyAdder();`
	`174`	`+ $car = new PropertyAccessorCollectionTestCase_CarOnlyAdder();`
`175`	`175`	`$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`public function testIsWritableReturnsFalseIfOnlyRemoverExists()`
`179`	`179`	`{`
`180`		`- $car = new PropertyAccessorCollectionTest_CarOnlyRemover();`
	`180`	`+ $car = new PropertyAccessorCollectionTestCase_CarOnlyRemover();`
`181`	`181`	`$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()`
`185`	`185`	`{`
`186`		`- $car = new PropertyAccessorCollectionTest_CarNoAdderAndRemover();`
	`186`	`+ $car = new PropertyAccessorCollectionTestCase_CarNoAdderAndRemover();`
`187`	`187`	`$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()`
`191`	`191`	`{`
`192`	`192`	`$this->expectException(NoSuchPropertyException::class);`
`193`		`- $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\./');`
`194`		`- $car = new PropertyAccessorCollectionTest_Car();`
	`193`	`+ $this->expectExceptionMessageMatches('/The property "axes" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\PropertyAccessorCollectionTestCase_Car" can be defined with the methods "addAxis\(\)", "removeAxis\(\)" but the new value must be an array or an instance of \\\Traversable\./');`
	`194`	`+ $car = new PropertyAccessorCollectionTestCase_Car();`
`195`	`195`
`196`	`196`	`$this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');`
`197`	`197`	`}`