[4.x] PHPUnit 10 (#9529)

.gitignore

@@ -4,6 +4,7 @@
 node_modules
 .DS_Store
 .phpunit.result.cache
+.phpunit.cache
 .php-cs-fixer.cache
 tests/Fakes/Composer/Package/test-package/composer.json
 resources/dist

composer.json

@@ -43,7 +43,7 @@
         "laravel/pint": "^1.0",
         "mockery/mockery": "^1.3.3",
         "orchestra/testbench": "^7.0 || ^8.0",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.0 || ^10.0"
     },
     "config": {
         "optimize-autoloader": true,

phpunit.xml.dist

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          backupGlobals="false"
-         backupStaticAttributes="false"
+         backupStaticProperties="false"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
+         cacheDirectory=".phpunit.cache"
          stopOnFailure="false">
     <testsuites>
         <testsuite name="Tests">

tests/API/APITest.php

@@ -44,7 +44,7 @@ public function it_handles_not_found_entries($url, $requestShouldSucceed)
         }
     }
 
-    public function entryNotFoundProvider()
+    public static function entryNotFoundProvider()
     {
         return [
             'valid entry id' => ['/api/collections/pages/entries/about', true],
@@ -53,15 +53,15 @@ public function entryNotFoundProvider()
         ];
     }
 
-    public function exampleFilters()
+    public static function exampleFiltersProvider()
     {
         return [['status:is'], ['published:is'], ['title:is']];
     }
 
     /**
      * @test
      *
-     * @dataProvider exampleFilters
+     * @dataProvider exampleFiltersProvider
      */
     public function it_cannot_filter_entries_by_default($filter)
     {
@@ -416,7 +416,7 @@ public function it_replaces_terms_using_live_preview_token()
         ]);
     }
 
-    public function userPasswordFilterProvider()
+    public static function userPasswordFilterProvider()
     {
         return collect([
             'password',
@@ -449,7 +449,7 @@ public function it_handles_not_found_terms($url, $requestShouldSucceed)
         }
     }
 
-    public function termNotFoundProvider()
+    public static function termNotFoundProvider()
     {
         return [
             'valid term id' => ['/api/taxonomies/tags/terms/test', true],

tests/API/CacherTest.php

@@ -105,7 +105,7 @@ public function it_doesnt_bypass_cache_when_using_an_invalid_token($endpoint, $h
         $this->assertEquals([$cacheKey], Cache::get('api-cache:tracked-responses'));
     }
 
-    public function bypassCacheProvider()
+    public static function bypassCacheProvider()
     {
         $endpoint = '/api/collections/articles/entries';
 

tests/API/FilterAuthorizerTest.php

@@ -35,7 +35,7 @@ public function setUp(): void
         Facades\Form::make('newsletter')->save();
     }
 
-    public function configFileProvider()
+    public static function configFileProvider()
     {
         return [
             ['api'],

tests/API/ResourceAuthorizerTest.php

@@ -35,7 +35,7 @@ public function setUp(): void
         Facades\Form::make('newsletter')->save();
     }
 
-    public function configFileProvider()
+    public static function configFileProvider()
     {
         return [
             ['api'],

tests/Actions/DuplicateEntryTest.php

@@ -94,7 +94,7 @@ public function it_authorizes(
         $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorize($user, $item));
     }
 
-    public function authorizationProvider()
+    public static function authorizationProvider()
     {
         return [
             'no permission' => [
@@ -160,7 +160,7 @@ public function it_authorizes_in_bulk(
         $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorizeBulk($user, $items));
     }
 
-    public function bulkAuthorizationProvider()
+    public static function bulkAuthorizationProvider()
     {
         return [
             'no permission' => [

tests/Antlers/Fixtures/Addon/Tags/Test.php → tests/Antlers/Fixtures/Addon/Tags/TestTags.php

@@ -4,10 +4,12 @@
 
 use Statamic\Tags\Tags;
 
-class Test extends Tags
+class TestTags extends Tags
 {
     public static $lastValue = null;
 
+    public static $handle = 'test';
+
     public function index()
     {
         self::$lastValue = $this->params->get('variable');

tests/Antlers/Fixtures/Addon/Tags/VarTest.php → tests/Antlers/Fixtures/Addon/Tags/VarTestTags.php

@@ -4,7 +4,7 @@
 
 use Statamic\Tags\Tags;
 
-class VarTest extends Tags
+class VarTestTags extends Tags
 {
     protected static $handle = 'var_test';
     public static $var = null;

tests/Antlers/Runtime/AntlersQueryBuilderTest.php

@@ -9,7 +9,7 @@
 use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
 use Statamic\View\Antlers\Language\Runtime\NodeProcessor;
 use Tests\Antlers\Fixtures\Addon\Modifiers\IsBuilder;
-use Tests\Antlers\Fixtures\Addon\Tags\VarTest;
+use Tests\Antlers\Fixtures\Addon\Tags\VarTestTags as VarTest;
 use Tests\Antlers\ParserTestCase;
 
 class AntlersQueryBuilderTest extends ParserTestCase

tests/Antlers/Runtime/ConditionLogicTest.php

@@ -14,7 +14,7 @@
 use Statamic\Taxonomies\TermCollection;
 use Statamic\View\Antlers\Language\Exceptions\AntlersException;
 use Statamic\View\Cascade;
-use Tests\Antlers\Fixtures\Addon\Tags\VarTest;
+use Tests\Antlers\Fixtures\Addon\Tags\VarTestTags as VarTest;
 use Tests\Antlers\ParserTestCase;
 use Tests\FakesViews;
 use Tests\PreventSavingStacheItemsToDisk;