PHPUnit 10.3.1, Psalm 5.14.1, PHPStorm Stubs 2023.2

doctrine · Aug 8, 2023 · b1db02c · b1db02c
1 parent 6b76e92
commit b1db02c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -40,17 +40,17 @@
     "require-dev": {
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
-        "jetbrains/phpstorm-stubs": "dev-master#b51c647ece0a88c59fbc94028daebd047377bcdb",
+        "jetbrains/phpstorm-stubs": "2023.2",
         "phpstan/phpstan": "1.10.26",
         "phpstan/phpstan-phpunit": "1.3.13",
         "phpstan/phpstan-strict-rules": "^1.5",
-        "phpunit/phpunit": "10.2.2",
+        "phpunit/phpunit": "10.3.1",
         "psalm/plugin-phpunit": "0.18.4",
         "slevomat/coding-standard": "8.13.1",
         "squizlabs/php_codesniffer": "3.7.2",
         "symfony/cache": "^5.4|^6.0",
         "symfony/console": "^4.4.30|^5.4|^6.0",
-        "vimeo/psalm": "5.13.1"
+        "vimeo/psalm": "5.14.1"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -49,8 +49,8 @@
         </DeprecatedClass>
         <DeprecatedMethod>
             <errorLevel type="suppress">
-                <!-- TODO for PHPUnit 10 -->
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::withConsecutive"/>
+                <!-- TODO for PHPUnit 11 -->
+                <referencedMethod name="PHPUnit\Framework\TestCase::iniSet"/>
             </errorLevel>
         </DeprecatedMethod>
         <DocblockTypeContradiction>

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -196,7 +196,7 @@ public function testRollBackStartsTransactionInNoAutoCommitMode(): void
 
     public function testSwitchingAutoCommitModeCommitsAllCurrentTransactions(): void
     {
-        $platform = $this->createStub(AbstractPlatform::class);
+        $platform = self::createStub(AbstractPlatform::class);
         $platform
             ->method('supportsSavepoints')
             ->willReturn(true);
@@ -610,7 +610,7 @@ public function testConnectionParamsArePassedToTheQueryCacheProfileInExecuteCach
 
     public function testCustomSchemaManagerFactory(): void
     {
-        $schemaManager = $this->createStub(AbstractSchemaManager::class);
+        $schemaManager = self::createStub(AbstractSchemaManager::class);
         $factory       = $this->createMock(SchemaManagerFactory::class);
         $factory->expects(self::once())->method('createSchemaManager')->willReturn($schemaManager);
 

diff --git a/tests/Functional/Schema/SqliteSchemaManagerTest.php b/tests/Functional/Schema/SqliteSchemaManagerTest.php
@@ -42,6 +42,7 @@ public function createListTableColumns(): Table
 
     public function testListForeignKeysFromExistingDatabase(): void
     {
+        $this->connection->executeStatement('DROP TABLE IF EXISTS user');
         $this->connection->executeStatement(<<<'EOS'
 CREATE TABLE user (
     id INTEGER PRIMARY KEY AUTOINCREMENT,

diff --git a/tests/Platforms/AbstractMySQLPlatformTestCase.php b/tests/Platforms/AbstractMySQLPlatformTestCase.php
@@ -675,8 +675,8 @@ protected function createComparator(): Comparator
     {
         return new MySQL\Comparator(
             $this->platform,
-            $this->createStub(CharsetMetadataProvider::class),
-            $this->createStub(CollationMetadataProvider::class),
+            self::createStub(CharsetMetadataProvider::class),
+            self::createStub(CollationMetadataProvider::class),
             new DefaultTableOptions('utf8mb4', 'utf8mb4_general_ci'),
         );
     }

diff --git a/tests/Platforms/MySQL/ComparatorTest.php b/tests/Platforms/MySQL/ComparatorTest.php
@@ -17,8 +17,8 @@ protected function setUp(): void
     {
         $this->comparator = new Comparator(
             new MySQLPlatform(),
-            $this->createStub(CharsetMetadataProvider::class),
-            $this->createStub(CollationMetadataProvider::class),
+            self::createStub(CharsetMetadataProvider::class),
+            self::createStub(CollationMetadataProvider::class),
             new DefaultTableOptions('utf8mb4', 'utf8mb4_general_ci'),
         );
     }

diff --git a/tests/Schema/Platforms/MySQLSchemaTest.php b/tests/Schema/Platforms/MySQLSchemaTest.php
@@ -68,8 +68,8 @@ private function createComparator(): Comparator
     {
         return new MySQL\Comparator(
             new MySQLPlatform(),
-            $this->createStub(CharsetMetadataProvider::class),
-            $this->createStub(CollationMetadataProvider::class),
+            self::createStub(CharsetMetadataProvider::class),
+            self::createStub(CollationMetadataProvider::class),
             new DefaultTableOptions('utf8mb4', 'utf8mb4_general_ci'),
         );
     }