Merge pull request #1342 from greg0ire/phpunit10

Phpunit10
doctrine · Jul 16, 2023 · dd84e71 · dd84e71
2 parents b14e0ac + 14fef62
commit dd84e71
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 31 deletions.
diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         "phpstan/phpstan-phpunit": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-symfony": "^1.1",
-        "phpunit/phpunit": "^9.5.24",
+        "phpunit/phpunit": "^10.2",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
         "symfony/process": "^4.4 || ^5.4 || ^6.0",
         "symfony/yaml": "^4.4 || ^5.4 || ^6.0"

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -44,7 +44,6 @@
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming">
         <exclude-pattern>lib/Doctrine/Migrations/AbstractMigration.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Migrations/Tests/Configuration/Loader/AbstractLoaderTest.php</exclude-pattern>
         <exclude-pattern>lib/Doctrine/Migrations/Configuration/Loader/AbstractFileLoader.php</exclude-pattern>
     </rule>
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,6 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          colors="true"
-         verbose="true"
          beStrictAboutOutputDuringTests="true"
 >
     <php>
@@ -16,9 +15,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
             <directory>./lib/</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/JsonLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/JsonLoaderTest.php
@@ -8,7 +8,7 @@
 use Doctrine\Migrations\Configuration\Migration\Exception\JsonNotValid;
 use Doctrine\Migrations\Configuration\Migration\JsonFile;
 
-class JsonLoaderTest extends LoaderTest
+class JsonLoaderTest extends LoaderTestCase
 {
     public function load(string $prefix = ''): Configuration
     {

diff --git a/...ts/Configuration/Migration/LoaderTest.php → ...onfiguration/Migration/LoaderTestCase.php b/...ts/Configuration/Migration/LoaderTest.php → ...onfiguration/Migration/LoaderTestCase.php
@@ -15,7 +15,7 @@
 
 use const DIRECTORY_SEPARATOR;
 
-abstract class LoaderTest extends TestCase
+abstract class LoaderTestCase extends TestCase
 {
     abstract public function load(string $prefix = ''): Configuration;
 

diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/PhpLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/PhpLoaderTest.php
@@ -7,7 +7,7 @@
 use Doctrine\Migrations\Configuration\Configuration;
 use Doctrine\Migrations\Configuration\Migration\PhpFile;
 
-class PhpLoaderTest extends LoaderTest
+class PhpLoaderTest extends LoaderTestCase
 {
     public function load(string $prefix = ''): Configuration
     {

diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/XmlLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/XmlLoaderTest.php
@@ -8,7 +8,7 @@
 use Doctrine\Migrations\Configuration\Migration\Exception\XmlNotValid;
 use Doctrine\Migrations\Configuration\Migration\XmlFile;
 
-class XmlLoaderTest extends LoaderTest
+class XmlLoaderTest extends LoaderTestCase
 {
     public function load(string $prefix = ''): Configuration
     {

diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Migration/YamlLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/YamlLoaderTest.php
@@ -8,7 +8,7 @@
 use Doctrine\Migrations\Configuration\Migration\Exception\YamlNotValid;
 use Doctrine\Migrations\Configuration\Migration\YamlFile;
 
-class YamlLoaderTest extends LoaderTest
+class YamlLoaderTest extends LoaderTestCase
 {
     public function load(string $prefix = ''): Configuration
     {

diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php
@@ -80,7 +80,7 @@ public function testWriteSql(bool $dryRun, $arg, ?string $path): void
     }
 
     /** @return mixed[] */
-    public function getWriteSqlValues(): array
+    public static function getWriteSqlValues(): array
     {
         return [
             // dry-run, write-path, path

diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php
@@ -76,7 +76,7 @@ public function testTargetUnknownVersion(): void
     }
 
     /** @return array<array<int, bool|int>> */
-    public function getMigrateWithMigrationsOrWithout(): array
+    public static function getMigrateWithMigrationsOrWithout(): array
     {
         return [
             // migrations available, allow-no-migrations, expected exit code
@@ -120,7 +120,7 @@ public function testMigrateWhenNoMigrationsAvailable(bool $hasMigrations, bool $
     }
 
     /** @return array<array<bool|string|null>> */
-    public function getTargetAliases(): array
+    public static function getTargetAliases(): array
     {
         return [
             ['A', 'OK', 'A'], // already at A
@@ -250,7 +250,7 @@ public function testExecuteWriteSql(bool $dryRun, $arg, ?string $path): void
     }
 
     /** @return mixed[] */
-    public function getWriteSqlValues(): array
+    public static function getWriteSqlValues(): array
     {
         return [
             // dry-run, write-path, path
@@ -381,7 +381,7 @@ public function testExecuteMigrateAllOrNothing(bool $default, array $input, bool
     }
 
     /** @psalm-return Generator<array{bool, array<string, bool|int|string|null>, bool}> */
-    public function allOrNothing(): Generator
+    public static function allOrNothing(): Generator
     {
         yield [false, ['--all-or-nothing' => false], false];
         yield [false, ['--all-or-nothing' => 0], false];

diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
@@ -134,7 +134,7 @@ public function testMigrationList(): void
     }
 
     /** @return mixed[][] */
-    public function dataIsUpToDate(): array
+    public static function dataIsUpToDate(): array
     {
         return [
             'up-to-date' => [

diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
@@ -103,7 +103,7 @@ public function testNoDependencyFactoryWhenNoCliConfig(): void
     }
 
     /** @return array<int,array<string>> */
-    public function getDependencyFactoryTestDirectories(): array
+    public static function getDependencyFactoryTestDirectories(): array
     {
         return [
             [__DIR__],

diff --git a/tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php b/tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php
@@ -97,7 +97,7 @@ public function testAliasesWithNoExecuted(string $alias, ?string $expectedVersio
     }
 
     /** @return mixed[][] */
-    public function getAliasesWithNoExecuted(): array
+    public static function getAliasesWithNoExecuted(): array
     {
         return [
             ['first', '0'],
@@ -113,7 +113,7 @@ public function getAliasesWithNoExecuted(): array
     }
 
     /** @return mixed[][] */
-    public function getAliases(): array
+    public static function getAliases(): array
     {
         return [
             ['first', '0'],

diff --git a/tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php b/tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php
@@ -504,15 +504,8 @@ public function executeDownShouldAppendDescriptionWhenItIsNotEmpty(): void
 
     protected function setUp(): void
     {
-        // add getSql to mock until method will be added to MetadataStorage interface
-        $this->metadataStorage = $this->getMockBuilder(MetadataStorage::class)
-            ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
-            ->onlyMethods(['ensureInitialized', 'getExecutedMigrations', 'complete', 'reset'])
-            ->addMethods(['getSql'])
-            ->getMock();
+        // use FutureMetadataStorage until getSql is added to MetadataStorage interface
+        $this->metadataStorage = $this->createMock(FutureMetadataStorage::class);
 
         $this->connection = $this->createMock(Connection::class);
         $driverConnection = $this->createStub(DriverConnection::class);
@@ -563,3 +556,9 @@ protected function setUp(): void
             ->willReturn([$stopWatchPeriod]);
     }
 }
+
+interface FutureMetadataStorage extends MetadataStorage
+{
+    /** @return iterable<Query> */
+    public function getSql(ExecutionResult $result): iterable;
+}
diff --git a/tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php b/tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php
@@ -138,7 +138,7 @@ public function testPlanWhenNoMigrations(string $to, array $expectedPlan, string
     }
 
     /** @return mixed[] */
-    public function getPlanUpWhenNoMigrations(): array
+    public static function getPlanUpWhenNoMigrations(): array
     {
         return [
             ['A', ['A'], Direction::UP],
@@ -182,7 +182,7 @@ public function testTargetMigrationNotFound(): void
     }
 
     /** @return mixed[] */
-    public function getPlanUpWhenMigrations(): array
+    public static function getPlanUpWhenMigrations(): array
     {
         return [
             ['0', ['B', 'A'], Direction::DOWN],
@@ -220,7 +220,7 @@ public function testPlanWhenMigrationsOutOfOrder(string $to, array $expectedPlan
     }
 
     /** @return mixed[] */
-    public function getPlanUpWhenMigrationsOutOfOrder(): array
+    public static function getPlanUpWhenMigrationsOutOfOrder(): array
     {
         return [
             ['C',['A'],Direction::UP],