fix: joinPath

joinPath("/", "abc") now returns "/abc"

Author: tomaskraus

src/PI.php

@@ -73,21 +73,25 @@ public static function joinPath($path1, $path2) {
             $path2 = trim($path2, $win_delim);
         }
 
-        //preserve the root (Linux, Mac)
-        $startChar = substr($path1Orig, 0, 1);
-        if ($startChar == $root_delim) {
-            $path1 = $root_delim . $path1;
-        }
 
+        $finalPath;
         if (!$path1 && !$path2) {
-            return "";
+            $finalPath = "";
         } else if (!$path1) {
-            return $path2;
+            $finalPath = $path2;
         } else if (!$path2) {
-            return $path1;
+            $finalPath = $path1;
         } else {
-            return $path1 . $final_delim . $path2;
+            $finalPath = $path1 . $final_delim . $path2;
+        }
+        
+        //preserve the root (Linux, Mac)
+        $startChar = substr($path1Orig, 0, 1);
+        if ($startChar == $root_delim) {
+            $finalPath = $root_delim . $finalPath;
         }
+        
+        return $finalPath;
     }
 
 }

test/PI/JoinPathTest.php

@@ -69,6 +69,9 @@ public function test_preserve_root_delimiter_first_arg() {
         $this->assertEquals("/abc", PI::joinPath("/abc/", ""));
         $this->assertEquals("/abc", PI::joinPath("/abc/", null));
 
+        $this->assertEquals("/abc", PI::joinPath("/", "abc"));
+        $this->assertEquals("/abc", PI::joinPath("/", "/abc"));
+        
         $this->assertEquals("/abc/d", PI::joinPath("/abc", "d"));
         $this->assertEquals("/abc/d", PI::joinPath("/abc", "/d"));
     }