Merge branch 'main' into CLI-1171

acquia · Oct 23, 2023 · 1bd01cb · 1bd01cb
2 parents b5f0213 + 5fdac94
commit 1bd01cb
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
         "symfony/yaml": "^6.0",
         "thecodingmachine/safe": "^2.4",
         "typhonius/acquia-logstream": "^0.0.13",
-        "typhonius/acquia-php-sdk-v2": "^3.1.0",
+        "typhonius/acquia-php-sdk-v2": "^3.1.1",
         "vlucas/phpdotenv": "^5.5",
         "zumba/amplitude-php": "^1.0.4"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/Push/PushArtifactCommand.php b/src/Command/Push/PushArtifactCommand.php
@@ -192,13 +192,13 @@ private function buildArtifact(Closure $outputCallback, string $artifactDir): vo
     // @see https://git.drupalcode.org/project/drupal/-/blob/9.1.x/sites/default/default.settings.php#L295
     $outputCallback('out', "Mirroring source files from $this->dir to $artifactDir");
     $originFinder = $this->localMachineHelper->getFinder();
-    $originFinder->files()->in($this->dir)
+    $originFinder->in($this->dir)
       // Include dot files like .htaccess.
       ->ignoreDotFiles(FALSE)
       // Ignore VCS ignored files (e.g. vendor) to speed up the mirror (Composer will restore them later).
       ->ignoreVCSIgnored(TRUE);
     $targetFinder = $this->localMachineHelper->getFinder();
-    $targetFinder->files()->in($artifactDir)->ignoreDotFiles(FALSE);
+    $targetFinder->in($artifactDir)->ignoreDotFiles(FALSE);
     $this->localMachineHelper->getFilesystem()->mirror($this->dir, $artifactDir, $originFinder, ['override' => TRUE, 'delete' => TRUE], $targetFinder);
 
     $this->localMachineHelper->checkRequiredBinariesExist(['composer']);