Changeset 38399 for trunk/src/wp-includes/admin-bar.php

Timestamp:

08/27/2016 09:15:01 AM (8 years ago)

Author:

wonderboymusic

Message:

Bootstrap: Autoload classes using a Composer-generated PHP 5.2-compatible Autoloader.

• wp-admin and wp-includes are scanned for classes to autoload
• Several 3rd-party and Ryan McCue-shaped libraries are excluded when the classmap is generated, see composer.json: autoload.exclude-from-classmap
• wp-vendor/autoload_52.php is included at the top of wp-settings.php - no changes need to be made to unit tests to include the autoloader
• An avalanche of require() and require_once() calls that loaded class files have been removed from the codebase.

The following files have been added to svn:ignore - they are not 5.2-compatible and fail during pre-commit:

• src/wp-vendor/autoload.php
• src/wp-vendor/composer/autoload_real.php
• src/wp-vendor/composer/autoload_static.php
• src/wp-vendor/composer/ClassLoader.php

We favor these files instead:

• src/wp-vendor/autoload_52.php
• src/wp-vendor/composer/autoload_real_52.php
• src/wp-vendor/composer/ClassLoader52.php

When new PHP classes are added to the codebase, simply run composer install or composer update from the project root to update the autoloader.

The future is now.

See #36335.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (3 diffs)

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

@@ -24 +24 @@
     global $wp_admin_bar;
 
-    if ( ! is_admin_bar_showing() )
+    if ( ! is_admin_bar_showing() ) {
         return false;
-
-    /* Load the admin bar class code ready for instantiation */
-    require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
+    }
 
     /* Instantiate the admin bar */
@@ -40 +38 @@
      */
     $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-    if ( class_exists( $admin_bar_class ) )
+    if ( class_exists( $admin_bar_class ) ) {
         $wp_admin_bar = new $admin_bar_class;
-    else
+    } else {
         return false;
-
+    }
     $wp_admin_bar->initialize();
     $wp_admin_bar->add_menus();
@@ -295 +293 @@
 
     if ( is_network_admin() ) {
-        /* translators: %s: site name */ 
+        /* translators: %s: site name */
         $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
     } elseif ( is_user_admin() ) {
-        /* translators: %s: site name */ 
+        /* translators: %s: site name */
         $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
     }