Merge branch 'main' into update-phpunit-config

swissspidy · web-flow · commit 6191c856e77f · 2024-10-01T18:14:43.000+02:00
diff --git a/php/WP_CLI/Extractor.php b/php/WP_CLI/Extractor.php
@@ -48,7 +48,7 @@ private static function extract_zip( $zipfile, $dest ) {
 			throw new Exception( "Could not create folder '{$dest}'." );
 		}
 
-		if ( ! file( $zipfile )
+		if ( ! file_exists( $zipfile )
 			|| ! is_readable( $zipfile )
 			|| filesize( $zipfile ) <= 0 ) {
 			throw new Exception( "Invalid zip file '{$zipfile}'." );
@@ -127,7 +127,7 @@ private static function extract_tarball( $tarball, $dest ) {
 			$tarball = "./{$tarball}";
 		}
 
-		if ( ! file( $tarball )
+		if ( ! file_exists( $tarball )
 			|| ! is_readable( $tarball )
 			|| filesize( $tarball ) <= 0 ) {
 			throw new Exception( "Invalid zip file '{$tarball}'." );
diff --git a/tests/CommandFactoryTest.php b/tests/CommandFactoryTest.php
@@ -2,10 +2,12 @@
 
 use WP_CLI\Tests\TestCase;
 
-require_once dirname( __DIR__ ) . '/php/class-wp-cli-command.php';
-
 class CommandFactoryTest extends TestCase {
 
+	public static function set_up_before_class() {
+		require_once dirname( __DIR__ ) . '/php/class-wp-cli-command.php';
+	}
+
 	/**
 	 * @dataProvider dataProviderExtractLastDocComment
 	 */
diff --git a/tests/FileCacheTest.php b/tests/FileCacheTest.php
@@ -5,10 +5,12 @@
 use WP_CLI\Tests\TestCase;
 use WP_CLI\Utils;
 
-require_once dirname( __DIR__ ) . '/php/class-wp-cli.php';
-
 class FileCacheTest extends TestCase {
 
+	public static function set_up_before_class() {
+		require_once dirname( __DIR__ ) . '/php/class-wp-cli.php';
+	}
+
 	/**
 	 * Test get_root() deals with backslashed directory.
 	 */
diff --git a/tests/HelpTest.php b/tests/HelpTest.php
@@ -2,12 +2,14 @@
 
 use WP_CLI\Tests\TestCase;
 
-require_once dirname( __DIR__ ) . '/php/class-wp-cli.php';
-require_once dirname( __DIR__ ) . '/php/class-wp-cli-command.php';
-require_once dirname( __DIR__ ) . '/php/commands/help.php';
-
 class HelpTest extends TestCase {
 
+	public static function set_up_before_class() {
+		require_once dirname( __DIR__ ) . '/php/class-wp-cli.php';
+		require_once dirname( __DIR__ ) . '/php/class-wp-cli-command.php';
+		require_once dirname( __DIR__ ) . '/php/commands/help.php';
+	}
+
 	public function test_parse_reference_links() {
 		$test_class = new ReflectionClass( 'Help_Command' );
 		$method     = $test_class->getMethod( 'parse_reference_links' );
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -5,11 +5,13 @@
 use WP_CLI\Tests\TestCase;
 use WP_CLI\Utils;
 
-require_once dirname( __DIR__ ) . '/php/class-wp-cli.php';
-require_once __DIR__ . '/mock-requests-transport.php';
-
 class UtilsTest extends TestCase {
 
+	public static function set_up_before_class() {
+		require_once dirname( __DIR__ ) . '/php/class-wp-cli.php';
+		require_once __DIR__ . '/mock-requests-transport.php';
+	}
+
 	public function testIncrementVersion() {
 		// Keyword increments.
 		$this->assertEquals(
diff --git a/tests/WP_CLI/WpOrgApiTest.php b/tests/WP_CLI/WpOrgApiTest.php
@@ -3,10 +3,12 @@
 use WP_CLI\Tests\TestCase;
 use WP_CLI\WpOrgApi;
 
-require_once dirname( __DIR__ ) . '/mock-requests-transport.php';
-
 class WpOrgApiTest extends TestCase {
 
+	public static function set_up_before_class() {
+		require_once dirname( __DIR__ ) . '/mock-requests-transport.php';
+	}
+
 	public static function data_http_request_verify() {
 		return [
 			'can retrieve core checksums'              => [
