Merge pull request #100 from szaleq/fix/paths-on-windows

Fix invalid paths on Windows
BrianHenryIE · Apr 26, 2024 · 7df991f · 7df991f
2 parents a88e1a7 + e135480
commit 7df991f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/Composer/ComposerPackage.php b/src/Composer/ComposerPackage.php
@@ -123,10 +123,10 @@ public function __construct(Composer $composer, array $overrideAutoload = null)
             $this->relativePath = $this->packageName;
             $this->packageAbsolutePath = realpath($vendorDirectory . DIRECTORY_SEPARATOR . $this->packageName) . DIRECTORY_SEPARATOR;
         // If the package is symlinked, the path will be outside the working directory.
-        } elseif (0 !== strpos($absolutePath, getcwd()) && 1 === preg_match('/.*\/([^\/]*\/[^\/]*)\/[^\/]*/', $vendorDirectory, $output_array)) {
+        } elseif (0 !== strpos($absolutePath, getcwd()) && 1 === preg_match('/.*[\/\\\\]([^\/\\\\]*[\/\\\\][^\/\\\\]*)[\/\\\\][^\/\\\\]*/', $vendorDirectory, $output_array)) {
             $this->relativePath = $output_array[1];
-        } elseif (1 === preg_match('/.*\/([^\/]*\/[^\/]*)\/composer.json/', $composerJsonFileAbsolute, $output_array)) {
-            // Not every package gets installed to a folder matching its name (crewlabs/unsplash).
+        } elseif (1 === preg_match('/.*[\/\\\\]([^\/\\\\]+[\/\\\\][^\/\\\\]+)[\/\\\\]composer.json/', $composerJsonFileAbsolute, $output_array)) {
+        // Not every package gets installed to a folder matching its name (crewlabs/unsplash).
             $this->relativePath = $output_array[1];
         }
 

diff --git a/src/FileEnumerator.php b/src/FileEnumerator.php
@@ -9,6 +9,7 @@
 
 use BrianHenryIE\Strauss\Composer\ComposerPackage;
 use BrianHenryIE\Strauss\Composer\Extra\StraussConfig;
+use BrianHenryIE\Strauss\Helpers\Path;
 use League\Flysystem\Filesystem;
 use League\Flysystem\Local\LocalFilesystemAdapter;
 use RecursiveDirectoryIterator;
@@ -125,7 +126,7 @@ public function compileFileList(): DiscoveredFiles
                             $this->addFile($dependency, $namespaceRelativePath, $type);
                         } elseif (is_dir($sourceAbsolutePath)) {
                             // trailingslashit(). (to remove duplicates).
-                            $sourcePath = rtrim($sourceAbsolutePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+                            $sourcePath = Path::normalize($sourceAbsolutePath);
 
 //                          $this->findFilesInDirectory()
                             $finder = new Finder();
@@ -139,7 +140,7 @@ public function compileFileList(): DiscoveredFiles
                                     continue;
                                 }
 
-                                $namespaceRelativePath = rtrim($namespaceRelativePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+                                $namespaceRelativePath = Path::normalize($namespaceRelativePath);
 
                                 $this->addFile(
                                     $dependency,

diff --git a/src/Helpers/Path.php b/src/Helpers/Path.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BrianHenryIE\Strauss\Helpers;
+
+class Path
+{
+    public static function normalize(string $path): string
+    {
+        return rtrim(preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $path), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+    }
+}