Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 7e2aa3f3b3c8 · 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/Store/AbstractRedisStoreTestCase.php b/Tests/Store/AbstractRedisStoreTestCase.php
@@ -20,7 +20,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-abstract class AbstractRedisStoreTest extends AbstractStoreTest
+abstract class AbstractRedisStoreTestCase extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/Tests/Store/AbstractStoreTestCase.php b/Tests/Store/AbstractStoreTestCase.php
@@ -19,7 +19,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-abstract class AbstractStoreTest extends TestCase
+abstract class AbstractStoreTestCase extends TestCase
 {
     abstract protected function getStore(): PersistingStoreInterface;
 
diff --git a/Tests/Store/BlockingStoreTestTrait.php b/Tests/Store/BlockingStoreTestTrait.php
@@ -21,7 +21,7 @@
 trait BlockingStoreTestTrait
 {
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      *
      * @return PersistingStoreInterface
      */
diff --git a/Tests/Store/CombinedStoreTest.php b/Tests/Store/CombinedStoreTest.php
@@ -26,7 +26,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  * @group integration
  */
-class CombinedStoreTest extends AbstractStoreTest
+class CombinedStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php b/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php
@@ -26,7 +26,7 @@
  * @requires extension pdo_pgsql
  * @group integration
  */
-class DoctrineDbalPostgreSqlStoreTest extends AbstractStoreTest
+class DoctrineDbalPostgreSqlStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/Tests/Store/DoctrineDbalStoreTest.php b/Tests/Store/DoctrineDbalStoreTest.php
@@ -26,7 +26,7 @@ class_exists(\Doctrine\DBAL\Platforms\PostgreSqlPlatform::class);
  *
  * @requires extension pdo_sqlite
  */
-class DoctrineDbalStoreTest extends AbstractStoreTest
+class DoctrineDbalStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/Tests/Store/ExpiringStoreTestTrait.php b/Tests/Store/ExpiringStoreTestTrait.php
@@ -30,7 +30,7 @@ trait ExpiringStoreTestTrait
     abstract protected function getClockDelay();
 
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      */
     abstract protected function getStore();
 
diff --git a/Tests/Store/FlockStoreTest.php b/Tests/Store/FlockStoreTest.php
@@ -19,7 +19,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-class FlockStoreTest extends AbstractStoreTest
+class FlockStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/Tests/Store/InMemoryStoreTest.php b/Tests/Store/InMemoryStoreTest.php
@@ -17,7 +17,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-class InMemoryStoreTest extends AbstractStoreTest
+class InMemoryStoreTest extends AbstractStoreTestCase
 {
     use SharedLockStoreTestTrait;
 
diff --git a/Tests/Store/MemcachedStoreTest.php b/Tests/Store/MemcachedStoreTest.php
@@ -23,7 +23,7 @@
  * @requires extension memcached
  * @group integration
  */
-class MemcachedStoreTest extends AbstractStoreTest
+class MemcachedStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/Tests/Store/MongoDbStoreTest.php b/Tests/Store/MongoDbStoreTest.php
@@ -25,7 +25,7 @@
  * @requires extension mongodb
  * @group integration
  */
-class MongoDbStoreTest extends AbstractStoreTest
+class MongoDbStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/Tests/Store/PdoStoreTest.php b/Tests/Store/PdoStoreTest.php
@@ -22,7 +22,7 @@
  * @requires extension pdo_sqlite
  * @group integration
  */
-class PdoStoreTest extends AbstractStoreTest
+class PdoStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/Tests/Store/PostgreSqlStoreTest.php b/Tests/Store/PostgreSqlStoreTest.php
@@ -23,7 +23,7 @@
  * @requires extension pdo_pgsql
  * @group integration
  */
-class PostgreSqlStoreTest extends AbstractStoreTest
+class PostgreSqlStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/Tests/Store/PredisStoreTest.php b/Tests/Store/PredisStoreTest.php
@@ -17,7 +17,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  * @group integration
  */
-class PredisStoreTest extends AbstractRedisStoreTest
+class PredisStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/Tests/Store/RedisArrayStoreTest.php b/Tests/Store/RedisArrayStoreTest.php
@@ -19,7 +19,7 @@
  * @requires extension redis
  * @group integration
  */
-class RedisArrayStoreTest extends AbstractRedisStoreTest
+class RedisArrayStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/Tests/Store/RedisClusterStoreTest.php b/Tests/Store/RedisClusterStoreTest.php
@@ -19,7 +19,7 @@
  * @requires extension redis
  * @group integration
  */
-class RedisClusterStoreTest extends AbstractRedisStoreTest
+class RedisClusterStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/Tests/Store/RedisStoreTest.php b/Tests/Store/RedisStoreTest.php
@@ -21,7 +21,7 @@
  * @requires extension redis
  * @group integration
  */
-class RedisStoreTest extends AbstractRedisStoreTest
+class RedisStoreTest extends AbstractRedisStoreTestCase
 {
     use SharedLockStoreTestTrait;
 
diff --git a/Tests/Store/SemaphoreStoreTest.php b/Tests/Store/SemaphoreStoreTest.php
@@ -20,7 +20,7 @@
  *
  * @requires extension sysvsem
  */
-class SemaphoreStoreTest extends AbstractStoreTest
+class SemaphoreStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use UnserializableTestTrait;
diff --git a/Tests/Store/SharedLockStoreTestTrait.php b/Tests/Store/SharedLockStoreTestTrait.php
@@ -21,7 +21,7 @@
 trait SharedLockStoreTestTrait
 {
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      *
      * @return PersistingStoreInterface
      */
diff --git a/Tests/Store/UnserializableTestTrait.php b/Tests/Store/UnserializableTestTrait.php
@@ -21,7 +21,7 @@
 trait UnserializableTestTrait
 {
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      *
      * @return PersistingStoreInterface
      */
diff --git a/Tests/Store/ZookeeperStoreTest.php b/Tests/Store/ZookeeperStoreTest.php
@@ -21,7 +21,7 @@
  * @requires extension zookeeper
  * @group integration
  */
-class ZookeeperStoreTest extends AbstractStoreTest
+class ZookeeperStoreTest extends AbstractStoreTestCase
 {
     use UnserializableTestTrait;
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`/**`
`21`	`21`	`* @author Jérémy Derussé <jeremy@derusse.com>`
`22`	`22`	`*/`
`23`		`-abstract class AbstractRedisStoreTest extends AbstractStoreTest`
	`23`	`+abstract class AbstractRedisStoreTestCase extends AbstractStoreTestCase`
`24`	`24`	`{`
`25`	`25`	`use ExpiringStoreTestTrait;`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`/**`
`20`	`20`	`* @author Jérémy Derussé <jeremy@derusse.com>`
`21`	`21`	`*/`
`22`		`-abstract class AbstractStoreTest extends TestCase`
	`22`	`+abstract class AbstractStoreTestCase extends TestCase`
`23`	`23`	`{`
`24`	`24`	`abstract protected function getStore(): PersistingStoreInterface;`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`trait BlockingStoreTestTrait`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`		`- * @see AbstractStoreTest::getStore()`
	`24`	`+ * @see AbstractStoreTestCase::getStore()`
`25`	`25`	`*`
`26`	`26`	`* @return PersistingStoreInterface`
`27`	`27`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* @author Jérémy Derussé <jeremy@derusse.com>`
`27`	`27`	`* @group integration`
`28`	`28`	`*/`
`29`		`-class CombinedStoreTest extends AbstractStoreTest`
	`29`	`+class CombinedStoreTest extends AbstractStoreTestCase`
`30`	`30`	`{`
`31`	`31`	`use ExpiringStoreTestTrait;`
`32`	`32`	`use SharedLockStoreTestTrait;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class_exists(\Doctrine\DBAL\Platforms\PostgreSqlPlatform::class);`
`26`	`26`	`*`
`27`	`27`	`* @requires extension pdo_sqlite`
`28`	`28`	`*/`
`29`		`-class DoctrineDbalStoreTest extends AbstractStoreTest`
	`29`	`+class DoctrineDbalStoreTest extends AbstractStoreTestCase`
`30`	`30`	`{`
`31`	`31`	`use ExpiringStoreTestTrait;`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* @author Jérémy Derussé <jeremy@derusse.com>`
`19`	`19`	`*/`
`20`		`-class InMemoryStoreTest extends AbstractStoreTest`
	`20`	`+class InMemoryStoreTest extends AbstractStoreTestCase`
`21`	`21`	`{`
`22`	`22`	`use SharedLockStoreTestTrait;`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* @requires extension memcached`
`24`	`24`	`* @group integration`
`25`	`25`	`*/`
`26`		`-class MemcachedStoreTest extends AbstractStoreTest`
	`26`	`+class MemcachedStoreTest extends AbstractStoreTestCase`
`27`	`27`	`{`
`28`	`28`	`use ExpiringStoreTestTrait;`
`29`	`29`