Fix directory separation problems on Windows machine

symplify · Sep 27, 2023 · 4665b73 · 4665b73
1 parent b4cbe14
commit 4665b73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Differ/PatchDiffer.php b/src/Differ/PatchDiffer.php
@@ -50,7 +50,7 @@ public function diff(OldAndNewFile $oldAndNewFile): string
 
     private function resolveRelativeFilePath(string $beforeFilePath): string
     {
-        $match = Strings::match($beforeFilePath, self::LOCAL_PATH_REGEX);
+        $match = Strings::match(str_replace('\\', '/', $beforeFilePath), self::LOCAL_PATH_REGEX);
 
         if (! isset($match['local_path'])) {
             throw new ShouldNotHappenException();

diff --git a/src/FileSystem/PathResolver.php b/src/FileSystem/PathResolver.php
@@ -18,7 +18,7 @@ final class PathResolver
 
     public static function resolveVendorDirectory(string $filePath): string
     {
-        $match = Strings::match($filePath, self::VENDOR_PACKAGE_DIRECTORY_REGEX);
+        $match = Strings::match(str_replace('\\', '/', $filePath), self::VENDOR_PACKAGE_DIRECTORY_REGEX);
         if (! isset($match['vendor_package_directory'])) {
             throw new ShouldNotHappenException('Could not resolve vendor package directory');
         }