PHPORM-299 Enable PHPUnit 11 (#3286)

GromNaN · web-flow · commit faacf63ac158 · 2025-02-24T21:18:54.000+01:00
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "laravel/scout": "^10.3",
         "league/flysystem-gridfs": "^3.28",
         "league/flysystem-read-only": "^3.0",
-        "phpunit/phpunit": "^10.3",
+        "phpunit/phpunit": "^10.3|^11.5.3",
         "orchestra/testbench": "^8.0|^9.0",
         "mockery/mockery": "^1.4.4@stable",
         "doctrine/coding-standard": "12.0.x-dev",
diff --git a/tests/AuthTest.php b/tests/AuthTest.php
@@ -17,10 +17,10 @@ class AuthTest extends TestCase
 {
     public function tearDown(): void
     {
-        parent::setUp();
-
         User::truncate();
         DB::table('password_reset_tokens')->truncate();
+
+        parent::tearDown();
     }
 
     public function testAuthAttempt()
diff --git a/tests/Eloquent/CallBuilderTest.php b/tests/Eloquent/CallBuilderTest.php
@@ -21,6 +21,8 @@ final class CallBuilderTest extends TestCase
     protected function tearDown(): void
     {
         User::truncate();
+
+        parent::tearDown();
     }
 
     #[Dataprovider('provideFunctionNames')]
diff --git a/tests/Eloquent/MassPrunableTest.php b/tests/Eloquent/MassPrunableTest.php
@@ -20,6 +20,8 @@ public function tearDown(): void
     {
         User::truncate();
         Soft::truncate();
+
+        parent::tearDown();
     }
 
     public function testPruneWithQuery(): void
diff --git a/tests/EmbeddedRelationsTest.php b/tests/EmbeddedRelationsTest.php
@@ -20,6 +20,8 @@ public function tearDown(): void
     {
         Mockery::close();
         User::truncate();
+
+        parent::tearDown();
     }
 
     public function testEmbedsManySave()
diff --git a/tests/GeospatialTest.php b/tests/GeospatialTest.php
@@ -53,6 +53,8 @@ public function setUp(): void
     public function tearDown(): void
     {
         Schema::drop('locations');
+
+        parent::tearDown();
     }
 
     public function testGeoWithin()
diff --git a/tests/HybridRelationsTest.php b/tests/HybridRelationsTest.php
@@ -42,6 +42,8 @@ public function tearDown(): void
         Skill::truncate();
         Experience::truncate();
         Label::truncate();
+
+        parent::tearDown();
     }
 
     public function testSqlRelations()
diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -56,6 +56,8 @@ public function tearDown(): void
         Book::truncate();
         Item::truncate();
         Guarded::truncate();
+
+        parent::tearDown();
     }
 
     public function testNewModel(): void
diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -43,6 +43,8 @@ public function tearDown(): void
     {
         DB::table('users')->truncate();
         DB::table('items')->truncate();
+
+        parent::tearDown();
     }
 
     public function testDeleteWithId()
diff --git a/tests/RelationsTest.php b/tests/RelationsTest.php
@@ -35,6 +35,8 @@ public function tearDown(): void
         Photo::truncate();
         Label::truncate();
         Skill::truncate();
+
+        parent::tearDown();
     }
 
     public function testHasMany(): void
diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -26,6 +26,8 @@ public function tearDown(): void
         assert($database instanceof Database);
         $database->dropCollection('newcollection');
         $database->dropCollection('newcollection_two');
+
+        parent::tearDown();
     }
 
     public function testCreate(): void
@@ -37,10 +39,8 @@ public function testCreate(): void
 
     public function testCreateWithCallback(): void
     {
-        $instance = $this;
-
-        Schema::create('newcollection', function ($collection) use ($instance) {
-            $instance->assertInstanceOf(Blueprint::class, $collection);
+        Schema::create('newcollection', static function ($collection) {
+            self::assertInstanceOf(Blueprint::class, $collection);
         });
 
         $this->assertTrue(Schema::hasCollection('newcollection'));
@@ -66,14 +66,12 @@ public function testDrop(): void
 
     public function testBluePrint(): void
     {
-        $instance = $this;
-
-        Schema::table('newcollection', function ($collection) use ($instance) {
-            $instance->assertInstanceOf(Blueprint::class, $collection);
+        Schema::table('newcollection', static function ($collection) {
+            self::assertInstanceOf(Blueprint::class, $collection);
         });
 
-        Schema::table('newcollection', function ($collection) use ($instance) {
-            $instance->assertInstanceOf(Blueprint::class, $collection);
+        Schema::table('newcollection', static function ($collection) {
+            self::assertInstanceOf(Blueprint::class, $collection);
         });
     }
 
diff --git a/tests/SchemaVersionTest.php b/tests/SchemaVersionTest.php
@@ -15,6 +15,8 @@ class SchemaVersionTest extends TestCase
     public function tearDown(): void
     {
         SchemaVersion::truncate();
+
+        parent::tearDown();
     }
 
     public function testWithBasicDocument()
diff --git a/tests/Scout/ScoutEngineTest.php b/tests/Scout/ScoutEngineTest.php
@@ -141,7 +141,7 @@ public function testSearch(Closure $builder, array $expectedPipeline): void
         $this->assertEquals($data, $result);
     }
 
-    public function provideSearchPipelines(): iterable
+    public static function provideSearchPipelines(): iterable
     {
         $defaultPipeline = [
             [
@@ -377,11 +377,11 @@ function () {
 
         yield 'with callback' => [
             fn () => new Builder(new SearchableModel(), 'query', callback: function (...$args) {
-                $this->assertCount(3, $args);
-                $this->assertInstanceOf(Collection::class, $args[0]);
-                $this->assertSame('collection_searchable', $args[0]->getCollectionName());
-                $this->assertSame('query', $args[1]);
-                $this->assertNull($args[2]);
+                self::assertCount(3, $args);
+                self::assertInstanceOf(Collection::class, $args[0]);
+                self::assertSame('collection_searchable', $args[0]->getCollectionName());
+                self::assertSame('query', $args[1]);
+                self::assertNull($args[2]);
 
                 return $args[0]->aggregate(['pipeline']);
             }),
diff --git a/tests/SeederTest.php b/tests/SeederTest.php
@@ -14,6 +14,8 @@ class SeederTest extends TestCase
     public function tearDown(): void
     {
         User::truncate();
+
+        parent::tearDown();
     }
 
     public function testSeed(): void
diff --git a/tests/Ticket/GH2489Test.php b/tests/Ticket/GH2489Test.php
@@ -13,6 +13,8 @@ class GH2489Test extends TestCase
     public function tearDown(): void
     {
         Location::truncate();
+
+        parent::tearDown();
     }
 
     public function testQuerySubdocumentsUsingWhereInId()
diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -12,6 +12,8 @@ class ValidationTest extends TestCase
     public function tearDown(): void
     {
         User::truncate();
+
+        parent::tearDown();
     }
 
     public function testUnique(): void

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ class AuthTest extends TestCase`
`17`	`17`	`{`
`18`	`18`	`public function tearDown(): void`
`19`	`19`	`{`
`20`		`- parent::setUp();`
`21`		`-`
`22`	`20`	`User::truncate();`
`23`	`21`	`DB::table('password_reset_tokens')->truncate();`
	`22`	`+`
	`23`	`+ parent::tearDown();`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function testAuthAttempt()`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ final class CallBuilderTest extends TestCase`
`21`	`21`	`protected function tearDown(): void`
`22`	`22`	`{`
`23`	`23`	`User::truncate();`
	`24`	`+`
	`25`	`+ parent::tearDown();`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`#[Dataprovider('provideFunctionNames')]`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public function tearDown(): void`
`20`	`20`	`{`
`21`	`21`	`User::truncate();`
`22`	`22`	`Soft::truncate();`
	`23`	`+`
	`24`	`+ parent::tearDown();`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`public function testPruneWithQuery(): void`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ public function setUp(): void`
`53`	`53`	`public function tearDown(): void`
`54`	`54`	`{`
`55`	`55`	`Schema::drop('locations');`
	`56`	`+`
	`57`	`+ parent::tearDown();`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`public function testGeoWithin()`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ public function tearDown(): void`
`42`	`42`	`Skill::truncate();`
`43`	`43`	`Experience::truncate();`
`44`	`44`	`Label::truncate();`
	`45`	`+`
	`46`	`+ parent::tearDown();`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`public function testSqlRelations()`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public function tearDown(): void`
`56`	`56`	`Book::truncate();`
`57`	`57`	`Item::truncate();`
`58`	`58`	`Guarded::truncate();`
	`59`	`+`
	`60`	`+ parent::tearDown();`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`public function testNewModel(): void`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public function tearDown(): void`
`43`	`43`	`{`
`44`	`44`	`DB::table('users')->truncate();`
`45`	`45`	`DB::table('items')->truncate();`
	`46`	`+`
	`47`	`+ parent::tearDown();`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`public function testDeleteWithId()`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public function tearDown(): void`
`35`	`35`	`Photo::truncate();`
`36`	`36`	`Label::truncate();`
`37`	`37`	`Skill::truncate();`
	`38`	`+`
	`39`	`+ parent::tearDown();`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`public function testHasMany(): void`