Changeset 51564

Timestamp:

08/06/2021 09:45:32 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace assertFileNotExists() with assertFileDoesNotExist().

The assertFileNotExists() method was hard deprecated in PHPUnit 9.1 and the functionality will be removed in PHPUnit 10.0.

The assertFileDoesNotExist() method was introduced as a replacement in PHPUnit 9.1.

This new PHPUnit method is polyfilled by the PHPUnit Polyfills and switching to it will future-proof the tests some more.

References:

• ​https://github.com/sebastianbergmann/phpunit/blob/9.1.5/ChangeLog-9.1.md#910---2020-04-03
• ​https://github.com/sebastianbergmann/phpunit/issues/4076

Follow-up to [51559-51563].

Props jrf.
See #46149.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesPlugin.php (modified) (1 diff)
• ajax/MediaEdit.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• image/editorImagick.php (modified) (1 diff)
• link/themeFile.php (modified) (2 diffs)
• multisite/ms-files-rewriting.php (modified) (2 diffs)
• multisite/site.php (modified) (2 diffs)
• rest-api/rest-plugins-controller.php (modified) (1 diff)

trunk/tests/phpunit/tests/admin/includesPlugin.php

@@ -404 +404 @@
      */
     public function test_get_mu_plugins_when_mu_plugins_directory_does_not_exist() {
-        $this->assertFileNotExists( WPMU_PLUGIN_DIR );
+        $this->assertFileDoesNotExist( WPMU_PLUGIN_DIR );
         $this->assertSame( array(), get_mu_plugins() );
     }

trunk/tests/phpunit/tests/ajax/MediaEdit.php

@@ -97 +97 @@
 
         foreach ( $files_that_shouldnt_exist as $file ) {
-            $this->assertFileNotExists( $file, 'IMAGE_EDIT_OVERWRITE is leaving garbage image files behind.' );
+            $this->assertFileDoesNotExist( $file, 'IMAGE_EDIT_OVERWRITE is leaving garbage image files behind.' );
         }
     }

trunk/tests/phpunit/tests/functions.php

@@ -174 +174 @@
         $this->assertFileExists( $testdir . 'test-image.png', 'Test image does not exist' );
         $this->assertSame( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );
-        $this->assertFileNotExists( $testdir . 'test-image-1.png' );
+        $this->assertFileDoesNotExist( $testdir . 'test-image-1.png' );
 
         // Check special chars.

trunk/tests/phpunit/tests/image/editorImagick.php

@@ -608 +608 @@
         $editor    = new WP_Image_Editor_Imagick( $file );
 
-        $this->assertFileNotExists( $directory );
+        $this->assertFileDoesNotExist( $directory );
 
         $loaded = $editor->load();

trunk/tests/phpunit/tests/link/themeFile.php

@@ -122 +122 @@
             $this->assertFileExists( WP_CONTENT_DIR . "/themes/theme-file-child/{$file}" );
         } else {
-            $this->assertFileNotExists( WP_CONTENT_DIR . "/themes/theme-file-child/{$file}" );
+            $this->assertFileDoesNotExist( WP_CONTENT_DIR . "/themes/theme-file-child/{$file}" );
         }
 
@@ -128 +128 @@
             $this->assertFileExists( WP_CONTENT_DIR . "/themes/theme-file-parent/{$file}" );
         } else {
-            $this->assertFileNotExists( WP_CONTENT_DIR . "/themes/theme-file-parent/{$file}" );
+            $this->assertFileDoesNotExist( WP_CONTENT_DIR . "/themes/theme-file-parent/{$file}" );
         }
 

trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -77 +77 @@
             // The file on the main site should still exist. The file on the deleted site should not.
             $this->assertFileExists( $file1['file'] );
-            $this->assertFileNotExists( $file2['file'] );
+            $this->assertFileDoesNotExist( $file2['file'] );
 
             wpmu_delete_blog( $blog_id, true );
@@ -83 +83 @@
             // The file on the main site should still exist. The file on the deleted site should not.
             $this->assertFileExists( $file1['file'] );
-            $this->assertFileNotExists( $file2['file'] );
+            $this->assertFileDoesNotExist( $file2['file'] );
         }
     }

trunk/tests/phpunit/tests/multisite/site.php

@@ -392 +392 @@
             // The file on the main site should still exist. The file on the deleted site should not.
             $this->assertFileExists( $file1['file'] );
-            $this->assertFileNotExists( $file2['file'] );
+            $this->assertFileDoesNotExist( $file2['file'] );
 
             wpmu_delete_blog( $blog_id, true );
@@ -398 +398 @@
             // The file on the main site should still exist. The file on the deleted site should not.
             $this->assertFileExists( $file1['file'] );
-            $this->assertFileNotExists( $file2['file'] );
+            $this->assertFileDoesNotExist( $file2['file'] );
         }
 

trunk/tests/phpunit/tests/rest-api/rest-plugins-controller.php

@@ -845 +845 @@
         $this->assertTrue( $response->get_data()['deleted'] );
         $this->assertSame( self::PLUGIN, $response->get_data()['previous']['plugin'] );
-        $this->assertFileNotExists( WP_PLUGIN_DIR . '/' . self::PLUGIN_FILE );
+        $this->assertFileDoesNotExist( WP_PLUGIN_DIR . '/' . self::PLUGIN_FILE );
     }