Merge branch 'netz98:develop' into develop

c-walter · Feb 12, 2024 · 15f1074 · 15f1074
2 parents 5f737ff + 03bd3ac
commit 15f1074
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -144,7 +144,7 @@ jobs:
     steps:
       - name: Checkout HEAD
         uses: actions/[email protected]
-      - uses: webfactory/ssh-agent@v0.8.0
+      - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.DIST_REPO_DEPLOY_KEY }}
       - name: Download artifacts

diff --git a/src/N98/Magento/Command/MagentoCoreProxyCommand.php b/src/N98/Magento/Command/MagentoCoreProxyCommand.php
@@ -72,8 +72,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
         }
 
+        $shellCommand = escapeshellarg(OperatingSystem::getPhpBinary())
+                      . ' '
+                      . escapeshellarg($this->magentoRootDir . '/bin/magento')
+                      . ' '
+                      . $magentoCoreCommandInput->__toString();
         $process = Process::fromShellCommandline(
-            OperatingSystem::getPhpBinary() . ' ' . $this->magentoRootDir . '/bin/magento ' . $magentoCoreCommandInput->__toString(),
+            $shellCommand,
             $this->magentoRootDir,
             $envVariablesForBinMagento
         );