Changeset 2762

Timestamp:

03/17/2016 06:42:01 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Account for dashes in folder names when loading a class.

Example:
Admin\List_Table => /admin/list-table/.

Also adds some property/method docs.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-autoloader.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-autoloader.php

@@ -8 +8 @@
  */
 class Autoloader {
+
+    /**
+     * Namespace separator.
+     */
     const NS_SEPARATOR = '\\';
+
+    /**
+     * The prefix to compare classes against.
+     *
+     * @var string
+     * @access protected
+     */
     protected $prefix;
+
+    /**
+     * Length of the prefix string.
+     *
+     * @var int
+     * @access protected
+     */
     protected $prefix_length;
+
+    /**
+     * Path to the file to be loaded.
+     *
+     * @var string
+     * @access protected
+     */
     protected $path;
 
+    /**
+     * Constructor.
+     *
+     * @param string $prefix Prefix all classes have in common.
+     * @param string $path   Path to the files to be loaded.
+     */
     public function __construct( $prefix, $path ) {
         $this->prefix        = $prefix;
@@ -19 +50 @@
     }
 
+    /**
+     * Loads a class if it starts with `$this->prefix`.
+     *
+     * @param string $class The class to be loaded.
+     */
     public function load( $class ) {
         if ( strpos( $class, $this->prefix . self::NS_SEPARATOR ) !== 0 ) {
@@ -31 +67 @@
         if ( false !== ( $last_ns_pos = strripos( $class, self::NS_SEPARATOR ) ) ) {
             $namespace = substr( $class, 0, $last_ns_pos );
+            $namespace = str_replace( '_', '-', $namespace );
             $class     = substr( $class, $last_ns_pos + 1 );
             $file      = str_replace( self::NS_SEPARATOR, DIRECTORY_SEPARATOR, $namespace ) . DIRECTORY_SEPARATOR;
@@ -45 +82 @@
 }
 
+/**
+ * Registers Autoloader's autoload function.
+ *
+ * @param string $prefix
+ * @param string $path
+ */
 function register_class_path( $prefix, $path ) {
     $loader = new Autoloader( $prefix, $path );