Changeset 47198 for trunk/src/wp-includes/script-loader.php

Timestamp:

02/06/2020 06:31:22 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace dirname( __FILE__ ) calls with __DIR__ magic constant.

This avoids the performance overhead of the function call every time dirname( __FILE__ ) was used instead of __DIR__.

This commit also includes:

• Removing unnecessary parentheses from include/require statements. These are language constructs, not function calls.
• Replacing include statements for several files with require_once, for consistency:
  • wp-admin/admin-header.php
  • wp-admin/admin-footer.php
  • wp-includes/version.php

Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082.

File:

• trunk/src/wp-includes/script-loader.php (modified) (6 diffs)

trunk/src/wp-includes/script-loader.php

@@ -18 +18 @@
 
 /** WordPress Dependency Class */
-require( ABSPATH . WPINC . '/class-wp-dependency.php' );
+require ABSPATH . WPINC . '/class-wp-dependency.php';
 
 /** WordPress Dependencies Class */
-require( ABSPATH . WPINC . '/class.wp-dependencies.php' );
+require ABSPATH . WPINC . '/class.wp-dependencies.php';
 
 /** WordPress Scripts Class */
-require( ABSPATH . WPINC . '/class.wp-scripts.php' );
+require ABSPATH . WPINC . '/class.wp-scripts.php';
 
 /** WordPress Scripts Functions */
-require( ABSPATH . WPINC . '/functions.wp-scripts.php' );
+require ABSPATH . WPINC . '/functions.wp-scripts.php';
 
 /** WordPress Styles Class */
-require( ABSPATH . WPINC . '/class.wp-styles.php' );
+require ABSPATH . WPINC . '/class.wp-styles.php';
 
 /** WordPress Styles Functions */
-require( ABSPATH . WPINC . '/functions.wp-styles.php' );
+require ABSPATH . WPINC . '/functions.wp-styles.php';
 
 /**
@@ -255 +255 @@
         'i18n',
         'is-shallow-equal',
-        'keyboard-shortcuts',
         'keycodes',
         'list-reusable-blocks',
@@ -296 +295 @@
         }
 
-        $asset_file   = include ABSPATH . WPINC . "/assets/dist/$package$suffix.asset.php";
+        $asset_file   = require ABSPATH . WPINC . "/assets/dist/$package$suffix.asset.php";
         $dependencies = $asset_file['dependencies'];
 
@@ -597 +596 @@
     if ( $suffixes === null ) {
         // Include an unmodified $wp_version.
-        include( ABSPATH . WPINC . '/version.php' );
+        require ABSPATH . WPINC . '/version.php';
 
         $develop_src = false !== strpos( $wp_version, '-src' );
@@ -1667 +1666 @@
 function wp_default_styles( &$styles ) {
     // Include an unmodified $wp_version.
-    include( ABSPATH . WPINC . '/version.php' );
+    require ABSPATH . WPINC . '/version.php';
 
     if ( ! defined( 'SCRIPT_DEBUG' ) ) {
@@ -2043 +2042 @@
     }
 
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' );
+    require_once ABSPATH . 'wp-admin/includes/class-wp-community-events.php';
 
     $user_id            = get_current_user_id();