0.0.4

Author: KanDisheng

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "codemommy/autoloadphp",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "Automatic load namespaces, classes and files",
     "keywords": [
         "CodeMommy",

private/Path.php

@@ -13,30 +13,6 @@
  */
 class Path
 {
-    /**
-     * Remove First Slash
-     * @param $string
-     */
-    public static function removeFirstSlash(&$string)
-    {
-        if (substr($string, 0, 1) == '/' || substr($string, 0, 1) == '\\') {
-            $string = substr($string, 1);
-            self::removeFirstSlash($string);
-        }
-    }
-
-    /**
-     * Remove Last Slash
-     * @param $string
-     */
-    public static function removeLastSlash(&$string)
-    {
-        if (substr($string, -1) == '/' || substr($string, -1) == '\\') {
-            $string = substr($string, 0, -1);
-            self::removeLastSlash($string);
-        }
-    }
-
     /**
      * Replace Slash
      * @param $string

source/Autoload.php

@@ -26,16 +26,14 @@ public static function directory($directory, $namespaceRoot)
     {
         spl_autoload_register(function ($className) use ($directory, $namespaceRoot) {
             Path::replaceSlash($directory);
-            Path::removeLastSlash($directory);
+            $directory = rtrim($directory, '/\\');
             Path::replaceSlash($namespaceRoot);
-            Path::removeFirstSlash($namespaceRoot);
-            Path::removeLastSlash($namespaceRoot);
+            $namespaceRoot = trim($namespaceRoot, '/\\');
             Path::replaceSlash($className);
-            Path::removeFirstSlash($className);
-            Path::removeLastSlash($className);
+            $className = trim($className, '/\\');
             if (substr($className, 0, strlen($namespaceRoot)) == $namespaceRoot) {
                 $className = substr($className, strlen($namespaceRoot));
-                Path::removeFirstSlash($className);
+                $className = ltrim($className, '/\\');
             }
             $extensionList = array('php', 'class.php');
             foreach ($extensionList as $extension) {
@@ -56,11 +54,9 @@ public static function file($file, $className)
     {
         spl_autoload_register(function ($name) use ($file, $className) {
             Path::replaceSlash($className);
-            Path::removeFirstSlash($className);
-            Path::removeLastSlash($className);
+            $className = trim($className, '/\\');
             Path::replaceSlash($name);
-            Path::removeFirstSlash($name);
-            Path::removeLastSlash($name);
+            $name = trim($name, '/\\');
             if ($className == $name) {
                 if (is_file($file)) {
                     require_once($file);

test/PathTest.php

@@ -20,28 +20,6 @@
  */
 class PathTest extends TestCase
 {
-    /**
-     * Test Remove First Slash
-     * @return void
-     */
-    public function testRemoveFirstSlash()
-    {
-        $string = '/\\CodeMommy';
-        Path::removeFirstSlash($string);
-        $this->assertEquals($string, 'CodeMommy');
-    }
-
-    /**
-     * Test Remove Last Slash
-     * @return void
-     */
-    public function testRemoveLastSlash()
-    {
-        $string = 'CodeMommy/\\';
-        Path::removeLastSlash($string);
-        $this->assertEquals($string, 'CodeMommy');
-    }
-
     /**
      * Test Replace Slash
      * @return void