abdullah353 · August 19, 2014 06:39 · Mar 5, 2014 · Mar 5, 2014 · Nov 11, 2009 · Nov 11, 2009
diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -22,7 +22,7 @@
  * SplClassLoader implementation that implements the technical interoperability
  * standards for PHP 5.3 namespaces and class names.
  *
- * http://groups.google.com/group/php-standards/web/final-proposal
+ * http://groups.google.com/group/php-standards/web/psr-0-final-proposal?pli=1
  *
  *     // Example which loads classes for the Doctrine Common package in the
  *     // Doctrine\Common namespace.

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -1,5 +1,23 @@
 <?php
 
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
 /**
  * SplClassLoader implementation that implements the technical interoperability
  * standards for PHP 5.3 namespaces and class names.
@@ -11,6 +29,7 @@
  *     $classLoader = new SplClassLoader('Doctrine\Common', '/path/to/doctrine');
  *     $classLoader->register();
  *
+ * @license http://www.opensource.org/licenses/mit-license.html  MIT License
  * @author Jonathan H. Wage <[email protected]>
  * @author Roman S. Borschel <[email protected]>
  * @author Matthew Weier O'Phinney <[email protected]>

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -123,7 +123,7 @@ public function loadClass($className)
         if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) {
             $fileName = '';
             $namespace = '';
-            if ($lastNsPos = strripos($className, $this->_namespaceSeparator)) {
+            if (false !== ($lastNsPos = strripos($className, $this->_namespaceSeparator))) {
                 $namespace = substr($className, 0, $lastNsPos);
                 $className = substr($className, $lastNsPos + 1);
                 $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -115,8 +115,8 @@ public function unregister()
     /**
      * Loads the given class or interface.
      *
-     * @param string $classname The name of the class to load.
-     * @return boolean TRUE if the class has been successfully loaded, FALSE otherwise.
+     * @param string $className The name of the class to load.
+     * @return void
      */
     public function loadClass($className)
     {

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -120,7 +120,7 @@ public function unregister()
      */
     public function loadClass($className)
     {
-        if (null === $this->_namespace || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
+        if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) {
             $fileName = '';
             $namespace = '';
             if ($lastNsPos = strripos($className, $this->_namespaceSeparator)) {

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -120,13 +120,15 @@ public function unregister()
      */
     public function loadClass($className)
     {
-        if (null === $this->_namespace || $this->_namespace . $this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator)) ) {
+        if (null === $this->_namespace || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
+            $fileName = '';
             $namespace = '';
             if ($lastNsPos = strripos($className, $this->_namespaceSeparator)) {
                 $namespace = substr($className, 0, $lastNsPos);
                 $className = substr($className, $lastNsPos + 1);
+                $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
             }
-            $fileName = str_replace(array($this->_namespaceSeparator, '_'), DIRECTORY_SEPARATOR, $namespace . DIRECTORY_SEPARATOR . $className) . $this->_fileExtension;
+            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
 
             require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
         }

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -120,7 +120,7 @@ public function unregister()
      */
     public function loadClass($className)
     {
-        if (null === $this->_namespace || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
+        if (null === $this->_namespace || $this->_namespace . $this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator)) ) {
             $namespace = '';
             if ($lastNsPos = strripos($className, $this->_namespaceSeparator)) {
                 $namespace = substr($className, 0, $lastNsPos);

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -122,7 +122,6 @@ public function loadClass($className)
     {
         if (null === $this->_namespace || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
             $namespace = '';
-            $fileName  = '';
             if ($lastNsPos = strripos($className, $this->_namespaceSeparator)) {
                 $namespace = substr($className, 0, $lastNsPos);
                 $className = substr($className, $lastNsPos + 1);

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -126,9 +126,8 @@ public function loadClass($className)
             if ($lastNsPos = strripos($className, $this->_namespaceSeparator)) {
                 $namespace = substr($className, 0, $lastNsPos);
                 $className = substr($className, $lastNsPos + 1);
-                $fileName  = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
             }
-            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
+            $fileName = str_replace(array($this->_namespaceSeparator, '_'), DIRECTORY_SEPARATOR, $namespace . DIRECTORY_SEPARATOR . $className) . $this->_fileExtension;
 
             require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
         }

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -123,8 +123,7 @@ public function loadClass($className)
         if (null === $this->_namespace || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
             $namespace = '';
             $fileName  = '';
-            if (strstr($className, $this->_namespaceSeparator)) {
-                $lastNsPos = strrpos($className, $this->_namespaceSeparator);
+            if ($lastNsPos = strripos($className, $this->_namespaceSeparator)) {
                 $namespace = substr($className, 0, $lastNsPos);
                 $className = substr($className, $lastNsPos + 1);
                 $fileName  = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -32,8 +32,8 @@ class SplClassLoader
      */
     public function __construct($ns = null, $includePath = null)
     {
-        $this->_includePath = $includePath;
         $this->_namespace = $ns;
+        $this->_includePath = $includePath;
     }
 
     /**

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -4,10 +4,18 @@
  * SplClassLoader implementation that implements the technical interoperability
  * standards for PHP 5.3 namespaces and class names.
  *
+ * http://groups.google.com/group/php-standards/web/final-proposal
+ *
  *     // Example which loads classes for the Doctrine Common package in the
  *     // Doctrine\Common namespace.
  *     $classLoader = new SplClassLoader('Doctrine\Common', '/path/to/doctrine');
  *     $classLoader->register();
+ *
+ * @author Jonathan H. Wage <[email protected]>
+ * @author Roman S. Borschel <[email protected]>
+ * @author Matthew Weier O'Phinney <[email protected]>
+ * @author Kris Wallsmith <[email protected]>
+ * @author Fabien Potencier <[email protected]>
  */
 class SplClassLoader
 {

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -6,7 +6,7 @@
  *
  *     // Example which loads classes for the Doctrine Common package in the
  *     // Doctrine\Common namespace.
- *     $classLoader = new SplClassLoader('Doctrine\Common');
+ *     $classLoader = new SplClassLoader('Doctrine\Common', '/path/to/doctrine');
  *     $classLoader->register();
  */
 class SplClassLoader
@@ -15,19 +15,19 @@ class SplClassLoader
     private $_namespace;
     private $_includePath;
     private $_namespaceSeparator = '\\';
-    
+
     /**
      * Creates a new <tt>SplClassLoader</tt> that loads classes of the
      * specified namespace.
      * 
      * @param string $ns The namespace to use.
      */
-    public function __construct($includePath = null, $ns = null)
+    public function __construct($ns = null, $includePath = null)
     {
         $this->_includePath = $includePath;
         $this->_namespace = $ns;
     }
-    
+
     /**
      * Sets the namespace separator used by classes in the namespace of this class loader.
      * 
@@ -116,9 +116,9 @@ public function loadClass($className)
             $namespace = '';
             $fileName  = '';
             if (strstr($className, $this->_namespaceSeparator)) {
-                $pos = strrpos($className, $this->_namespaceSeparator);
-                $namespace = substr($className, 0, $pos);
-                $className = substr($className, $pos + 1);
+                $lastNsPos = strrpos($className, $this->_namespaceSeparator);
+                $namespace = substr($className, 0, $lastNsPos);
+                $className = substr($className, $lastNsPos + 1);
                 $fileName  = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
             }
             $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -37,17 +37,37 @@ public function setNamespaceSeparator($sep)
     {
         $this->_namespaceSeparator = $sep;
     }
-
+
+    /**
+     * Gets the namespace seperator used by classes in the namespace of this class loader.
+     *
+     * @return void
+     */
+    public function getNamespaceSeparator()
+    {
+        return $this->_namespaceSeparator;
+    }
+
     /**
      * Sets the base include path for all class files in the namespace of this class loader.
      * 
-     * @param string $basePath
+     * @param string $includePath
      */
     public function setIncludePath($includePath)
     {
         $this->_includePath = $includePath;
     }
-
+
+    /**
+     * Gets the base include path for all class files in the namespace of this class loader.
+     *
+     * @return string $includePath
+     */
+    public function getIncludePath()
+    {
+        return $this->_includePath;
+    }
+
     /**
      * Sets the file extension of class files in the namespace of this class loader.
      * 
@@ -57,15 +77,33 @@ public function setFileExtension($fileExtension)
     {
         $this->_fileExtension = $fileExtension;
     }
-
+
+    /**
+     * Gets the file extension of class files in the namespace of this class loader.
+     *
+     * @return string $fileExtension
+     */
+    public function getFileExtension()
+    {
+        return $this->_fileExtension;
+    }
+
     /**
      * Installs this class loader on the SPL autoload stack.
      */
     public function register()
     {
         spl_autoload_register(array($this, 'loadClass'));
     }
-
+
+    /**
+     * Uninstalls this class loader from the SPL autoloader stack.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
     /**
      * Loads the given class or interface.
      *
@@ -75,9 +113,17 @@ public function register()
     public function loadClass($className)
     {
         if (null === $this->_namespace || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
-              require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '')
-                    . str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $className)
-                    . $this->_fileExtension;
+            $namespace = '';
+            $fileName  = '';
+            if (strstr($className, $this->_namespaceSeparator)) {
+                $pos = strrpos($className, $this->_namespaceSeparator);
+                $namespace = substr($className, 0, $pos);
+                $className = substr($className, $pos + 1);
+                $fileName  = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+            }
+            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
+
+            require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
         }
     }
 }
diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -74,7 +74,7 @@ public function register()
      */
     public function loadClass($className)
     {
-        if ($this->_namespace === null || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
+        if (null === $this->_namespace || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
               require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '')
                     . str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $className)
                     . $this->_fileExtension;

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -22,10 +22,10 @@ class SplClassLoader
      * 
      * @param string $ns The namespace to use.
      */
-    public function __construct($ns, $includePath = null)
+    public function __construct($includePath = null, $ns = null)
     {
-        $this->_namespace = $ns;
         $this->_includePath = $includePath;
+        $this->_namespace = $ns;
     }
 
     /**
@@ -74,7 +74,7 @@ public function register()
      */
     public function loadClass($className)
     {
-        if (0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
+        if ($this->_namespace === null || 0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
               require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '')
                     . str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $className)
                     . $this->_fileExtension;

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -22,9 +22,10 @@ class SplClassLoader
      * 
      * @param string $ns The namespace to use.
      */
-    public function __construct($ns)
+    public function __construct($ns, $includePath = null)
     {
         $this->_namespace = $ns;
+        $this->_includePath = $includePath;
     }
 
     /**

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -73,14 +73,10 @@ public function register()
      */
     public function loadClass($className)
     {
-        if (strpos($className, $this->_namespace.$this->_namespaceSeparator) !== 0) {
-            return false;
+        if (0 === strpos($className, $this->_namespace.$this->_namespaceSeparator)) {
+              require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '')
+                    . str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $className)
+                    . $this->_fileExtension;
         }
-
-        require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '')
-               . str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $className)
-               . $this->_fileExtension;
-
-        return true;
     }
 }
diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -73,10 +73,6 @@ public function register()
      */
     public function loadClass($className)
     {
-        if (class_exists($className, false) || interface_exists($className, false)) {
-            return false;
-        }
-
         if (strpos($className, $this->_namespace.$this->_namespaceSeparator) !== 0) {
             return false;
         }

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -1,3 +1,14 @@
+<?php
+
+/**
+ * SplClassLoader implementation that implements the technical interoperability
+ * standards for PHP 5.3 namespaces and class names.
+ *
+ *     // Example which loads classes for the Doctrine Common package in the
+ *     // Doctrine\Common namespace.
+ *     $classLoader = new SplClassLoader('Doctrine\Common');
+ *     $classLoader->register();
+ */
 class SplClassLoader
 {
     private $_fileExtension = '.php';

diff --git a/SplClassLoader.php b/SplClassLoader.php
@@ -0,0 +1,79 @@
+class SplClassLoader
+{
+    private $_fileExtension = '.php';
+    private $_namespace;
+    private $_includePath;
+    private $_namespaceSeparator = '\\';
+
+    /**
+     * Creates a new <tt>SplClassLoader</tt> that loads classes of the
+     * specified namespace.
+     * 
+     * @param string $ns The namespace to use.
+     */
+    public function __construct($ns)
+    {
+        $this->_namespace = $ns;
+    }
+
+    /**
+     * Sets the namespace separator used by classes in the namespace of this class loader.
+     * 
+     * @param string $sep The separator to use.
+     */
+    public function setNamespaceSeparator($sep)
+    {
+        $this->_namespaceSeparator = $sep;
+    }
+
+    /**
+     * Sets the base include path for all class files in the namespace of this class loader.
+     * 
+     * @param string $basePath
+     */
+    public function setIncludePath($includePath)
+    {
+        $this->_includePath = $includePath;
+    }
+
+    /**
+     * Sets the file extension of class files in the namespace of this class loader.
+     * 
+     * @param string $fileExtension
+     */
+    public function setFileExtension($fileExtension)
+    {
+        $this->_fileExtension = $fileExtension;
+    }
+
+    /**
+     * Installs this class loader on the SPL autoload stack.
+     */
+    public function register()
+    {
+        spl_autoload_register(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $classname The name of the class to load.
+     * @return boolean TRUE if the class has been successfully loaded, FALSE otherwise.
+     */
+    public function loadClass($className)
+    {
+        if (class_exists($className, false) || interface_exists($className, false)) {
+            return false;
+        }
+
+        if (strpos($className, $this->_namespace.$this->_namespaceSeparator) !== 0) {
+            return false;
+        }
+
+        require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '')
+               . str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $className)
+               . $this->_fileExtension;
+
+        return true;
+    }
+}