Add fixes to accommodate for PHPUnit 10

[dependabot skip]
wearerequired · May 30, 2024 · 4d6b82f · 4d6b82f
1 parent 3394425
commit 4d6b82f
Show file tree

Hide file tree

Showing 25 changed files with 61 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -55,7 +55,7 @@
     "wp-cli/rewrite-command": "^2.0",
     "wp-cli/wp-cli-tests": "^4.2.9",
     "wpackagist-plugin/glotpress": "^4.0.0",
-    "yoast/phpunit-polyfills": "^2.0"
+    "yoast/phpunit-polyfills": "^2.0.1"
   },
   "suggest": {
     "wpackagist-plugin/slack": "Send Slack notifications for various events"
@@ -73,6 +73,8 @@
   },
   "autoload-dev": {
     "psr-4": {
+      "Required\\Traduttore\\Tests\\Behat\\": "tests/behat",
+      "Required\\Traduttore\\Tests\\Utils\\": "tests/phpunit/utils",
       "Required\\Traduttore\\Tests\\": "tests/phpunit/tests"
     }
   },

diff --git a/tests/phpunit/tests/Behat/FeatureContext.php → tests/behat/FeatureContext.php b/tests/phpunit/tests/Behat/FeatureContext.php → tests/behat/FeatureContext.php
@@ -15,6 +15,7 @@
 use WP_CLI\Tests\Context\FeatureContext as WP_CLI_FeatureContext;
 use WP_CLI\Utils;
 use function WP_CLI\Tests\Context\wp_cli_behat_env_debug;
+use function WP_CLI\Utils;
 
 /**
  * Feature tests context class with Traduttore-specific steps.

diff --git a/tests/phpunit/tests/Configuration.php b/tests/phpunit/tests/Configuration.php
@@ -5,6 +5,7 @@
 
 namespace Required\Traduttore\Tests;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Configuration as Config;
 
 /**

diff --git a/tests/phpunit/tests/Export.php b/tests/phpunit/tests/Export.php
@@ -5,6 +5,7 @@
 
 namespace Required\Traduttore\Tests;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use PO;
 use Required\Traduttore\Export as E;
 

diff --git a/tests/phpunit/tests/Loader/Git.php b/tests/phpunit/tests/Loader/Git.php
@@ -5,10 +5,10 @@
 
 namespace Required\Traduttore\Tests\Loader;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Loader\Git as GitLoader;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository\GitHub;
-use Required\Traduttore\Tests\TestCase;
 
 /**
  * Test cases for \Required\Traduttore\Loader\Git.

diff --git a/tests/phpunit/tests/Loader/Mercurial.php b/tests/phpunit/tests/Loader/Mercurial.php
@@ -5,10 +5,10 @@
 
 namespace Required\Traduttore\Tests\Loader;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Loader\Mercurial as MercurialLoader;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository\Bitbucket;
-use Required\Traduttore\Tests\TestCase;
 
 /**
  * Test cases for \Required\Traduttore\Loader\Mercurial.

diff --git a/tests/phpunit/tests/Loader/Subversion.php b/tests/phpunit/tests/Loader/Subversion.php
@@ -5,10 +5,10 @@
 
 namespace Required\Traduttore\Tests\Loader;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Loader\Subversion as SubversionLoader;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository\Bitbucket;
-use Required\Traduttore\Tests\TestCase;
 
 /**
  * Test cases for \Required\Traduttore\Loader\Subversion.

diff --git a/tests/phpunit/tests/LoaderFactory.php b/tests/phpunit/tests/LoaderFactory.php
@@ -5,12 +5,12 @@
 
 namespace Required\Traduttore\Tests;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Loader\Git;
 use Required\Traduttore\Loader\Mercurial;
-
+use Required\Traduttore\LoaderFactory as Factory;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
-use Required\Traduttore\LoaderFactory as Factory;
 use Required\Traduttore\Repository\Bitbucket;
 use Required\Traduttore\Repository\GitHub;
 use Required\Traduttore\Repository\GitLab;

diff --git a/tests/phpunit/tests/Project.php b/tests/phpunit/tests/Project.php
@@ -8,6 +8,7 @@
 use DateTime;
 use DateTimeZone;
 use GP_Project;
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project as TraduttoreProject;
 
 /**

diff --git a/tests/phpunit/tests/ProjectLocator.php b/tests/phpunit/tests/ProjectLocator.php
@@ -5,6 +5,7 @@
 
 namespace Required\Traduttore\Tests;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\ProjectLocator as Locator;
 

diff --git a/tests/phpunit/tests/Repository/Bitbucket.php b/tests/phpunit/tests/Repository/Bitbucket.php
@@ -5,10 +5,10 @@
 
 namespace Required\Traduttore\Tests\Repository;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
 use Required\Traduttore\Repository\Bitbucket as BitbucketRepository;
-use Required\Traduttore\Tests\TestCase;
 
 /**
  * Test cases for \Required\Traduttore\Repository\Bitbucket.

diff --git a/tests/phpunit/tests/Repository/GitHub.php b/tests/phpunit/tests/Repository/GitHub.php
@@ -5,10 +5,10 @@
 
 namespace Required\Traduttore\Tests\Repository;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
 use Required\Traduttore\Repository\GitHub as GitHubRepository;
-use Required\Traduttore\Tests\TestCase;
 
 /**
  * Test cases for \Required\Traduttore\Repository\GitHub.

diff --git a/tests/phpunit/tests/Repository/GitLab.php b/tests/phpunit/tests/Repository/GitLab.php
@@ -5,10 +5,10 @@
 
 namespace Required\Traduttore\Tests\Repository;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
 use Required\Traduttore\Repository\GitLab as GitLabRepository;
-use Required\Traduttore\Tests\TestCase;
 
 /**
  * Test cases for \Required\Traduttore\Repository\GitLab.

diff --git a/tests/phpunit/tests/RepositoryFactory.php b/tests/phpunit/tests/RepositoryFactory.php
@@ -5,10 +5,11 @@
 
 namespace Required\Traduttore\Tests;
 
+use Required\Traduttore\Tests\Utils\TestCase;
+use Required\Traduttore\Project;
 use Required\Traduttore\Repository\Bitbucket;
 use Required\Traduttore\Repository\GitHub;
 use Required\Traduttore\Repository\GitLab;
-use Required\Traduttore\Project;
 use Required\Traduttore\RepositoryFactory as Factory;
 
 /**

diff --git a/tests/phpunit/tests/RestrictedSiteAccess.php b/tests/phpunit/tests/RestrictedSiteAccess.php
@@ -5,6 +5,7 @@
 
 namespace Required\Traduttore\Tests;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Plugin;
 
 /**

diff --git a/tests/phpunit/tests/Runner.php b/tests/phpunit/tests/Runner.php
@@ -5,6 +5,7 @@
 
 namespace Required\Traduttore\Tests;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Loader\Git as Loader;
 use Required\Traduttore\Project;
 use Required\Traduttore\Runner as R;

diff --git a/tests/phpunit/tests/TranslationApiRoute.php b/tests/phpunit/tests/TranslationApiRoute.php
@@ -9,15 +9,15 @@
 use GP_Locale;
 use GP_Translation_Set;
 use GP_UnitTest_Factory;
-use GP_UnitTestCase_Route;
+use Required\Traduttore\Tests\Utils\TestCase_Route;
 use ReflectionClass;
 use Required\Traduttore\TranslationApiRoute as Route;
 use Required\Traduttore\ZipProvider as Provider;
 
 /**
  * Test cases for \Required\Traduttore\TranslationApiRoute.
  */
-class TranslationApiRoute extends GP_UnitTestCase_Route {
+class TranslationApiRoute extends TestCase_Route {
 	/**
 	 * @var class-string
 	 */

diff --git a/tests/phpunit/tests/Updater.php b/tests/phpunit/tests/Updater.php
@@ -6,6 +6,7 @@
 namespace Required\Traduttore\Tests;
 
 use GP;
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Configuration;
 use Required\Traduttore\Project;
 use Required\Traduttore\Updater as U;

diff --git a/tests/phpunit/tests/WebhookHandler/Bitbucket.php b/tests/phpunit/tests/WebhookHandler/Bitbucket.php
@@ -5,9 +5,9 @@
 
 namespace Required\Traduttore\Tests\WebhookHandler;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
-use Required\Traduttore\Tests\TestCase;
 use WP_REST_Request;
 
 /**

diff --git a/tests/phpunit/tests/WebhookHandler/GitHub.php b/tests/phpunit/tests/WebhookHandler/GitHub.php
@@ -5,9 +5,9 @@
 
 namespace Required\Traduttore\Tests\WebhookHandler;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
-use Required\Traduttore\Tests\TestCase;
 use WP_REST_Request;
 
 /**

diff --git a/tests/phpunit/tests/WebhookHandler/GitLab.php b/tests/phpunit/tests/WebhookHandler/GitLab.php
@@ -5,9 +5,9 @@
 
 namespace Required\Traduttore\Tests\WebhookHandler;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
-use Required\Traduttore\Tests\TestCase;
 use WP_REST_Request;
 
 /**

diff --git a/tests/phpunit/tests/WebhookHandler/LegacyGitHub.php b/tests/phpunit/tests/WebhookHandler/LegacyGitHub.php
@@ -5,9 +5,9 @@
 
 namespace Required\Traduttore\Tests\WebhookHandler;
 
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\Project;
 use Required\Traduttore\Repository;
-use Required\Traduttore\Tests\TestCase;
 use WP_REST_Request;
 
 /**

diff --git a/tests/phpunit/tests/ZipProvider.php b/tests/phpunit/tests/ZipProvider.php
@@ -7,6 +7,7 @@
 
 use DateTime;
 use GP;
+use Required\Traduttore\Tests\Utils\TestCase;
 use Required\Traduttore\ProjectLocator;
 use Required\Traduttore\ZipProvider as Provider;
 use Translations;
@@ -161,11 +162,9 @@ public function test_generate_zip_file(): void {
 		$this->assertTrue( $provider->generate_zip_file() );
 	}
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState disabled
-	 */
 	public function test_generate_zip_file_missing_wp_filesystem(): void {
+		unset( $GLOBALS['wp_filesystem'] );
+
 		$original = $this->factory()->original->create( [ 'project_id' => $this->translation_set->project_id ] );
 
 		$this->factory()->translation->create(

diff --git a/tests/phpunit/tests/TestCase.php → tests/phpunit/utils/TestCase.php b/tests/phpunit/tests/TestCase.php → tests/phpunit/utils/TestCase.php
@@ -3,7 +3,7 @@
  * Class TestCase
  */
 
-namespace Required\Traduttore\Tests;
+namespace Required\Traduttore\Tests\Utils;
 
 use GP_UnitTest_Factory;
 use GP_UnitTestCase;
@@ -44,4 +44,12 @@ protected function assertErrorResponse( mixed $code, WP_REST_Response|WP_Error $
 			$this->assertSame( $status, $data['status'] );
 		}
 	}
+
+	/**
+	 * Temporary workaround to allow the tests to run on PHPUnit 10.
+	 *
+	 * @link https://core.trac.wordpress.org/ticket/59486
+	 */
+	public function expectDeprecated(): void {
+	}
 }
diff --git a/tests/phpunit/utils/TestCase_Route.php b/tests/phpunit/utils/TestCase_Route.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Class TestCase_Route
+ */
+
+namespace Required\Traduttore\Tests\Utils;
+
+use GP_UnitTestCase_Route;
+
+/**
+ * Base TestCase class for custom routes.
+ */
+class TestCase_Route extends GP_UnitTestCase_Route {
+
+	/**
+	 * Temporary workaround to allow the tests to run on PHPUnit 10.
+	 *
+	 * @link https://core.trac.wordpress.org/ticket/59486
+	 */
+	public function expectDeprecated(): void {
+	}
+}