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

Timestamp:

08/27/2016 09:15:01 AM (9 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-admin/includes/file.php (modified) (4 diffs)

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

@@ -738 +738 @@
     mbstring_binary_safe_encoding();
 
-    require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
-
     $archive = new PclZip($file);
 
@@ -887 +885 @@
     global $wp_filesystem;
 
-    require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
-
     $method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
 
@@ -894 +890 @@
         return false;
 
-    if ( ! class_exists( "WP_Filesystem_$method" ) ) {
+    $map = array(
+        'base' => 'WP_Filesystem_Base',
+        'direct' => 'WP_Filesystem_Direct',
+        'ftpext' => 'WP_Filesystem_FTPext',
+        'ftpsockets' => 'WP_Filesystem_ftpsockets',
+        'ssh2' => 'WP_Filesystem_SSH2',
+    );
+
+    $l = strtolower( $method );
+    if ( array_key_exists( $l, $map ) ) {
+        $classname = $map[ $l ];
+    } else {
+        $classname = "WP_Filesystem_{$method}";
+    }
+
+    if ( ! class_exists( $classname ) ) {
 
         /**
@@ -908 +919 @@
         $abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
 
-        if ( ! file_exists($abstraction_file) )
+        if ( ! file_exists( $abstraction_file ) ) {
             return;
-
-        require_once($abstraction_file);
-    }
-    $method = "WP_Filesystem_$method";
-
-    $wp_filesystem = new $method($args);
+        }
+
+        require_once( $abstraction_file );
+    }
+
+    $wp_filesystem = new $classname( $args );
 
     //Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.