Unix paths now create unix paths for results. Closes #25

eloquent · Jul 29, 2013 · c5a6816 · c5a6816
1 parent b5b48f1
commit c5a6816
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/src/Eloquent/Pathogen/AbstractPath.php b/src/Eloquent/Pathogen/AbstractPath.php
@@ -964,16 +964,10 @@ protected function createPath(
         $hasTrailingSeparator = null
     ) {
         if ($isAbsolute) {
-            return new AbsolutePath(
-                $atoms,
-                $hasTrailingSeparator
-            );
+            return new AbsolutePath($atoms, $hasTrailingSeparator);
         }
 
-        return new RelativePath(
-            $atoms,
-            $hasTrailingSeparator
-        );
+        return new RelativePath($atoms, $hasTrailingSeparator);
     }
 
     /**

diff --git a/src/Eloquent/Pathogen/Unix/AbsoluteUnixPath.php b/src/Eloquent/Pathogen/Unix/AbsoluteUnixPath.php
@@ -19,4 +19,22 @@
 class AbsoluteUnixPath extends AbstractAbsoluteFileSystemPath implements
     AbsoluteUnixPathInterface
 {
+    /**
+     * @param mixed<string> $atoms
+     * @param boolean       $isAbsolute
+     * @param boolean|null  $hasTrailingSeparator
+     *
+     * @return PathInterface
+     */
+    protected function createPath(
+        $atoms,
+        $isAbsolute,
+        $hasTrailingSeparator = null
+    ) {
+        if ($isAbsolute) {
+            return new static($atoms, $hasTrailingSeparator);
+        }
+
+        return new RelativeUnixPath($atoms, $hasTrailingSeparator);
+    }
 }
diff --git a/src/Eloquent/Pathogen/Unix/RelativeUnixPath.php b/src/Eloquent/Pathogen/Unix/RelativeUnixPath.php
@@ -19,4 +19,18 @@
 class RelativeUnixPath extends AbstractRelativeFileSystemPath implements
     RelativeUnixPathInterface
 {
+    /**
+     * @param mixed<string> $atoms
+     * @param boolean       $isAbsolute
+     * @param boolean|null  $hasTrailingSeparator
+     *
+     * @return PathInterface
+     */
+    protected function createPath(
+        $atoms,
+        $isAbsolute,
+        $hasTrailingSeparator = null
+    ) {
+        return new static($atoms, $hasTrailingSeparator);
+    }
 }
diff --git a/src/Eloquent/Pathogen/Windows/AbsoluteWindowsPath.php b/src/Eloquent/Pathogen/Windows/AbsoluteWindowsPath.php
@@ -288,11 +288,7 @@ protected function createPathWithDrive(
         $drive,
         $hasTrailingSeparator = null
     ) {
-        return new static(
-            $atoms,
-            $drive,
-            $hasTrailingSeparator
-        );
+        return new static($atoms, $drive, $hasTrailingSeparator);
     }
 
     private $drive;