CLI-1186: push:artifact fails if empty directory exists (#1625)

acquia · Nov 8, 2023 · b4108ba · b4108ba
1 parent fbdc845
commit b4108ba
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 127 deletions.
diff --git a/assets/symfony-fs-mirror.patch b/assets/symfony-fs-mirror.patch
diff --git a/composer.json b/composer.json
@@ -18,7 +18,6 @@
         "bugsnag/bugsnag": "^3.0",
         "composer/semver": "^3.3",
         "consolidation/self-update": "^2.1.0",
-        "cweagans/composer-patches": "^1.7",
         "dflydev/dot-access-data": "^3",
         "grasmash/expander": "^3",
         "guzzlehttp/guzzle": "^7.4",
@@ -96,7 +95,6 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "phpstan/extension-installer": true,
-            "cweagans/composer-patches": true,
             "phpro/grumphp": true,
             "symfony/flex": true,
             "infection/extension-installer": true,
@@ -106,14 +104,6 @@
     "extra": {
         "branch-alias": {
             "dev-main": "2.x-dev"
-        },
-        "patches": {
-            "symfony/filesystem": [
-                "assets/symfony-fs-mirror.patch"
-            ]
-        },
-        "patchLevel": {
-            "symfony/filesystem": "-p5"
         }
     },
     "prefer-stable": true,

diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/Push/PushArtifactCommand.php b/src/Command/Push/PushArtifactCommand.php
@@ -216,7 +216,8 @@ private function buildArtifact(Closure $outputCallback, string $artifactDir): vo
       ->ignoreVCSIgnored(TRUE);
     $targetFinder = $this->localMachineHelper->getFinder();
     $targetFinder->in($artifactDir)->ignoreDotFiles(FALSE);
-    $this->localMachineHelper->getFilesystem()->mirror($this->dir, $artifactDir, $originFinder, ['override' => TRUE, 'delete' => TRUE], $targetFinder);
+    $this->localMachineHelper->getFilesystem()->remove($targetFinder);
+    $this->localMachineHelper->getFilesystem()->mirror($this->dir, $artifactDir, $originFinder, ['override' => TRUE]);
 
     $this->localMachineHelper->checkRequiredBinariesExist(['composer']);
     $outputCallback('out', 'Installing Composer production dependencies');