Path improvements

packaged · Apr 18, 2019 · b16f9c8 · b16f9c8
1 parent c876801
commit b16f9c8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/Path.php b/src/Path.php
@@ -55,28 +55,28 @@ public static function url(...$parts)
   /**
    * Concatenate a path with a custom separator
    *
-   * @param string   $directorySeparator
+   * @param string   $separator
    * @param string[] $pathComponents
    *
    * @return string
    */
-  public static function custom($directorySeparator, array $pathComponents)
+  public static function custom($separator, array $pathComponents)
   {
     $fullPath = [];
-    $charList = '/\\' . $directorySeparator;
+    $charList = '/\\' . $separator;
     foreach($pathComponents as $section)
     {
-      if($section !== '')
+      if(isset($section[1]))
       {
-        if(empty($fullPath) && $section[0] === $directorySeparator && $section !== $directorySeparator)
-        {
-          $fullPath[] = '';
-        }
-        $fullPath[] = trim($section, $charList);
+        $fullPath[] = empty($fullPath) ? rtrim($section, $charList) : trim($section, $charList);
+      }
+      else if(isset($section[0]))
+      {
+        $fullPath[] = $section == $separator ? '' : $section;
       }
     }
 
-    return implode($directorySeparator, $fullPath);
+    return ($fullPath[0] == '' && count($fullPath) === 1 ? $separator : implode($separator, $fullPath));
   }
 
   /**

diff --git a/tests/PathTest.php b/tests/PathTest.php
@@ -79,7 +79,9 @@ public function testUrl()
   {
     $this->assertEquals('/', Path::url('/', ''));
     $this->assertEquals('/test', Path::url('/', '/test'));
+    $this->assertEquals('/test', Path::url('/', '', '/test', ''));
     $this->assertEquals('/test/subdir/test', Path::url('/test', '/subdir/test/'));
+    $this->assertEquals('/test/subdir/test/', Path::url('/test', '/subdir/test', '/'));
     $this->assertEquals('test/subdir/test', Path::url('test', '/subdir/test/'));
   }
 }