Changeset 54872

Timestamp:

11/24/2022 10:09:39 PM (2 years ago)

Author:

audrasjb

Message:

Coding Standards: Remove extra slashes when concatenating ABSPATH with a path.

Since ABSPATH is defined and documented to end with a forward slash /, this changeset removes the first / from strings appended to ABSPATH in various files, leading to // in the resulting path.

Props TobiasBg, audrasjb, SergeyBiryukov, emanuelx.
Fixes #57074.
See #57071.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-site-health-auto-updates.php (modified) (2 diffs)
• src/wp-admin/includes/class-wp-site-health.php (modified) (1 diff)
• src/wp-admin/includes/file.php (modified) (1 diff)
• tests/phpunit/includes/bootstrap.php (modified) (1 diff)
• tests/phpunit/includes/install.php (modified) (1 diff)
• tests/phpunit/tests/customize/widgets.php (modified) (1 diff)
• tests/phpunit/tests/feed/wpSimplePieFile.php (modified) (1 diff)
• tests/phpunit/tests/pluggable/signatures.php (modified) (2 diffs)
• tests/phpunit/tests/pluggable/wpMail.php (modified) (1 diff)
• tests/phpunit/tests/pomo/po.php (modified) (1 diff)
• tests/phpunit/tests/post.php (modified) (1 diff)
• tests/phpunit/tests/widgets.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php

@@ -278 +278 @@
         // Make sure the `request_filesystem_credentials()` function is available during our REST API call.
         if ( ! function_exists( 'request_filesystem_credentials' ) ) {
-            require_once ABSPATH . '/wp-admin/includes/file.php';
+            require_once ABSPATH . 'wp-admin/includes/file.php';
         }
 
@@ -329 +329 @@
         // Make sure the `get_core_checksums()` function is available during our REST API call.
         if ( ! function_exists( 'get_core_checksums' ) ) {
-            require_once ABSPATH . '/wp-admin/includes/update.php';
+            require_once ABSPATH . 'wp-admin/includes/update.php';
         }
 

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -66 +66 @@
     public function show_site_health_tab( $tab ) {
         if ( 'debug' === $tab ) {
-            require_once ABSPATH . '/wp-admin/site-health-info.php';
+            require_once ABSPATH . 'wp-admin/site-health-info.php';
         }
     }

trunk/src/wp-admin/includes/file.php

@@ -2443 +2443 @@
     // from WP_Site_Health_Auto_Updates::test_check_wp_filesystem_method().
     if ( ! function_exists( 'submit_button' ) ) {
-        require_once ABSPATH . '/wp-admin/includes/template.php';
+        require_once ABSPATH . 'wp-admin/includes/template.php';
     }
     ?>

trunk/tests/phpunit/includes/bootstrap.php

@@ -303 +303 @@
 
 // Load WordPress.
-require_once ABSPATH . '/wp-settings.php';
+require_once ABSPATH . 'wp-settings.php';
 
 // Delete any default posts & related data.

trunk/tests/phpunit/includes/install.php

@@ -38 +38 @@
 tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter_exit' );
 
-require_once ABSPATH . '/wp-settings.php';
+require_once ABSPATH . 'wp-settings.php';
 
-require_once ABSPATH . '/wp-admin/includes/upgrade.php';
-require_once ABSPATH . '/wp-includes/class-wpdb.php';
+require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+require_once ABSPATH . 'wp-includes/class-wpdb.php';
 
 // Override the PHPMailer.

trunk/tests/phpunit/tests/customize/widgets.php

@@ -557 +557 @@
     private function get_test_widget_control_args() {
         global $wp_registered_widgets;
-        require_once ABSPATH . '/wp-admin/includes/widgets.php';
+        require_once ABSPATH . 'wp-admin/includes/widgets.php';
         $widget_id = 'search-2';
         $widget    = $wp_registered_widgets[ $widget_id ];

trunk/tests/phpunit/tests/feed/wpSimplePieFile.php

@@ -20 +20 @@
         parent::set_up_before_class();
 
-        require_once ABSPATH . '/wp-includes/class-simplepie.php';
-        require_once ABSPATH . '/wp-includes/class-wp-simplepie-file.php';
+        require_once ABSPATH . 'wp-includes/class-simplepie.php';
+        require_once ABSPATH . 'wp-includes/class-wp-simplepie-file.php';
     }
 

trunk/tests/phpunit/tests/pluggable/signatures.php

@@ -77 +77 @@
     public function get_defined_pluggable_functions() {
 
-        require_once ABSPATH . '/wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
         $test_functions = array(
@@ -104 +104 @@
 
         foreach ( $test_files as $file ) {
-            preg_match_all( '#^\t?function (\w+)#m', file_get_contents( ABSPATH . '/' . $file ), $functions );
+            preg_match_all( '#^\t?function (\w+)#m', file_get_contents( ABSPATH . $file ), $functions );
 
             foreach ( $functions[1] as $function ) {

trunk/tests/phpunit/tests/pluggable/wpMail.php

@@ -174 +174 @@
 
         // Non-fatal errors.
-        $this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body', "Cc: invalid-address\nBcc: @invalid.address", ABSPATH . '/non-existent-file.html' ) );
+        $this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body', "Cc: invalid-address\nBcc: @invalid.address", ABSPATH . 'non-existent-file.html' ) );
 
         // Fatal errors.

trunk/tests/phpunit/tests/pomo/po.php

@@ -49 +49 @@
         parent::set_up_before_class();
 
-        require_once ABSPATH . '/wp-includes/pomo/po.php';
+        require_once ABSPATH . 'wp-includes/pomo/po.php';
     }
 

trunk/tests/phpunit/tests/post.php

@@ -286 +286 @@
         }
 
-        require_once ABSPATH . '/wp-admin/includes/post.php';
+        require_once ABSPATH . 'wp-admin/includes/post.php';
 
         $post_id = self::factory()->post->create();

trunk/tests/phpunit/tests/widgets.php

@@ -814 +814 @@
 
         wp_widgets_init();
-        require_once ABSPATH . '/wp-admin/includes/widgets.php';
+        require_once ABSPATH . 'wp-admin/includes/widgets.php';
         $widget_id    = 'search-2';
         $widget       = $wp_registered_widgets[ $widget_id ];