convert to PHPUnit 10

LordSimal · LordSimal · commit 4dcf1bbbb456 · 2023-05-30T22:38:23.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ nbproject/*
 .vscode
 .DS_Store
 .cache
+.phpunit.cache
 .project
 .settings
 .svn
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     "require-dev": {
         "cakephp/authorization": "3.x-dev",
         "cakephp/cakephp-codesniffer": "5.x-dev",
-        "phpunit/phpunit": "^9.5.19"
+        "phpunit/phpunit": "^10.1.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="./tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         cacheDirectory=".phpunit.cache"
+         bootstrap="./tests/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+>
     <testsuites>
         <testsuite name="debug-kit">
             <directory>tests/TestCase</directory>
         </testsuite>
     </testsuites>
 
     <extensions>
-        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension"/>
+        <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
     </extensions>
 
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">src/</directory>
         </include>
-    </coverage>
+    </source>
 
     <php>
         <ini name="memory_limit" value="-1"/>
diff --git a/src/ToolbarService.php b/src/ToolbarService.php
@@ -102,7 +102,7 @@ public function registry(): PanelRegistry
      */
     public function isEnabled(): bool
     {
-        if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
+        if (defined('PHPUNIT_COMPOSER_INSTALL') && !$GLOBALS['FORCE_DEBUGKIT_TOOLBAR']) {
             return false;
         }
         $enabled = (bool)Configure::read('debug')
diff --git a/tests/TestCase/Database/Log/DebugLogTest.php b/tests/TestCase/Database/Log/DebugLogTest.php
@@ -109,7 +109,7 @@ public function testLogIgnoreReflectionDisabled($sql)
         $this->assertCount(1, $logger->queries());
     }
 
-    public function schemaQueryProvider()
+    public static function schemaQueryProvider()
     {
         return [
             // MySQL
diff --git a/tests/TestCase/Middleware/DebugKitMiddlewareTest.php b/tests/TestCase/Middleware/DebugKitMiddlewareTest.php
@@ -55,8 +55,8 @@ public function setUp(): void
         $connection = ConnectionManager::get('test');
         $this->skipIf($connection->getDriver() instanceof Sqlite, 'Schema insertion/removal breaks SQLite');
         $this->oldConfig = Configure::read('DebugKit');
-        $this->restore = $GLOBALS['__PHPUNIT_BOOTSTRAP'];
-        unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);
+        $this->restore = $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'];
+        $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'] = true;
     }
 
     /**
@@ -69,7 +69,7 @@ public function tearDown(): void
         parent::tearDown();
 
         Configure::write('DebugKit', $this->oldConfig);
-        $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $this->restore;
+        $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'] = $this->restore;
     }
 
     protected function handler()
@@ -125,7 +125,7 @@ public function testInvokeSaveData()
         $this->assertNotNull($result->panels[11]->summary);
         $this->assertSame('Sql Log', $result->panels[11]->title);
 
-        $timeStamp = filemtime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'main.js');
+        $timeStamp = filectime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'main.js');
 
         $expected = '<html><title>test</title><body><p>some text</p>' .
             '<script id="__debug_kit_script" data-id="' . $result->id . '" ' .
diff --git a/tests/TestCase/Panel/PackagesPanelTest.php b/tests/TestCase/Panel/PackagesPanelTest.php
@@ -44,7 +44,7 @@ public function setUp(): void
      *
      * @return array
      */
-    public function packagesProvider()
+    public static function packagesProvider()
     {
         return [
             'requirements' => ['packages'],
diff --git a/tests/TestCase/ToolbarServiceTest.php b/tests/TestCase/ToolbarServiceTest.php
@@ -58,8 +58,8 @@ public function setUp(): void
 
         $connection = ConnectionManager::get('test');
         $this->skipIf($connection->getDriver() instanceof Sqlite, 'Schema insertion/removal breaks SQLite');
-        $this->restore = $GLOBALS['__PHPUNIT_BOOTSTRAP'];
-        unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);
+        $this->restore = $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'];
+        $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'] = true;
     }
 
     /**
@@ -71,7 +71,7 @@ public function tearDown(): void
     {
         parent::tearDown();
         putenv('HTTP_HOST=');
-        $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $this->restore;
+        $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'] = $this->restore;
     }
 
     /**
@@ -417,7 +417,7 @@ public function testIsEnabledProductionEnv($domain, $isEnabled)
         $this->assertTrue($bar->isEnabled(), 'When forced should always be on.');
     }
 
-    public function domainsProvider()
+    public static function domainsProvider()
     {
         return [
             ['localhost', true],
diff --git a/tests/TestCase/View/Helper/CredentialsHelperTest.php b/tests/TestCase/View/Helper/CredentialsHelperTest.php
@@ -75,7 +75,7 @@ public function testFilter($in, $out)
      *
      * @return array input, expected output
      */
-    public function credentialsProvider()
+    public static function credentialsProvider()
     {
         return [
             [null, null],

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function registry(): PanelRegistry`
`102`	`102`	`*/`
`103`	`103`	`public function isEnabled(): bool`
`104`	`104`	`{`
`105`		`- if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {`
	`105`	`+ if (defined('PHPUNIT_COMPOSER_INSTALL') && !$GLOBALS['FORCE_DEBUGKIT_TOOLBAR']) {`
`106`	`106`	`return false;`
`107`	`107`	`}`
`108`	`108`	`$enabled = (bool)Configure::read('debug')`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function testLogIgnoreReflectionDisabled($sql)`
`109`	`109`	`$this->assertCount(1, $logger->queries());`
`110`	`110`	`}`
`111`	`111`
`112`		`- public function schemaQueryProvider()`
	`112`	`+ public static function schemaQueryProvider()`
`113`	`113`	`{`
`114`	`114`	`return [`
`115`	`115`	`// MySQL`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function setUp(): void`
`44`	`44`	`*`
`45`	`45`	`* @return array`
`46`	`46`	`*/`
`47`		`- public function packagesProvider()`
	`47`	`+ public static function packagesProvider()`
`48`	`48`	`{`
`49`	`49`	`return [`
`50`	`50`	`'requirements' => ['packages'],`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ public function setUp(): void`
`58`	`58`
`59`	`59`	`$connection = ConnectionManager::get('test');`
`60`	`60`	`$this->skipIf($connection->getDriver() instanceof Sqlite, 'Schema insertion/removal breaks SQLite');`
`61`		`- $this->restore = $GLOBALS['__PHPUNIT_BOOTSTRAP'];`
`62`		`- unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);`
	`61`	`+ $this->restore = $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'];`
	`62`	`+ $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'] = true;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`@@ -71,7 +71,7 @@ public function tearDown(): void`
`71`	`71`	`{`
`72`	`72`	`parent::tearDown();`
`73`	`73`	`putenv('HTTP_HOST=');`
`74`		`- $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $this->restore;`
	`74`	`+ $GLOBALS['FORCE_DEBUGKIT_TOOLBAR'] = $this->restore;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`@@ -417,7 +417,7 @@ public function testIsEnabledProductionEnv($domain, $isEnabled)`
`417`	`417`	`$this->assertTrue($bar->isEnabled(), 'When forced should always be on.');`
`418`	`418`	`}`
`419`	`419`
`420`		`- public function domainsProvider()`
	`420`	`+ public static function domainsProvider()`
`421`	`421`	`{`
`422`	`422`	`return [`
`423`	`423`	`['localhost', true],`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function testFilter($in, $out)`
`75`	`75`	`*`
`76`	`76`	`* @return array input, expected output`
`77`	`77`	`*/`
`78`		`- public function credentialsProvider()`
	`78`	`+ public static function credentialsProvider()`
`79`	`79`	`{`
`80`	`80`	`return [`
`81`	`81`	`[null, null],`