Fix VendorCleanup for Windows

asgrim · Jan 9, 2025 · 4ae2f35 · 4ae2f35
1 parent 3b18514
commit 4ae2f35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/ComposerIntegration/VendorCleanup.php b/src/ComposerIntegration/VendorCleanup.php
@@ -61,17 +61,16 @@ static function (string $path): bool {
         array_walk(
             $toRemove,
             function (string $pathToRemove) use ($vendorDir): void {
+                $fullPathToRemove = $vendorDir . DIRECTORY_SEPARATOR . $pathToRemove;
+
                 $this->output->writeln(
                     sprintf(
-                        '<comment>Removing: %s/%s</comment>',
-                        $vendorDir,
-                        $pathToRemove,
+                        '<comment>Removing: %s</comment>',
+                        $fullPathToRemove,
                     ),
                     OutputInterface::VERBOSITY_VERY_VERBOSE,
                 );
 
-                $fullPathToRemove = $vendorDir . DIRECTORY_SEPARATOR . $pathToRemove;
-
                 if ($this->filesystem->remove($fullPathToRemove)) {
                     return;
                 }

diff --git a/test/unit/ComposerIntegration/VendorCleanupTest.php b/test/unit/ComposerIntegration/VendorCleanupTest.php
@@ -16,6 +16,7 @@
 use function restore_error_handler;
 use function set_error_handler;
 
+use const DIRECTORY_SEPARATOR;
 use const E_WARNING;
 
 #[CoversClass(VendorCleanup::class)]
@@ -86,8 +87,8 @@ public function testVendorDirIsCleaned(): void
             ->method('remove')
             ->willReturnCallback(static function (string $path) use (&$vendor1Removed, &$vendor2Removed): bool {
                 return match ($path) {
-                    self::VENDOR_DIR . '/vendor1' => $vendor1Removed = true,
-                    self::VENDOR_DIR . '/vendor2' => $vendor2Removed = true,
+                    self::VENDOR_DIR . DIRECTORY_SEPARATOR . 'vendor1' => $vendor1Removed = true,
+                    self::VENDOR_DIR . DIRECTORY_SEPARATOR . 'vendor2' => $vendor2Removed = true,
                 };
             });