[BUGFIX] Use correct paths in Composer and Rsync Task (#405)

TYPO3 · May 31, 2020 · 58e16fd · 58e16fd
1 parent 71ac7d2
commit 58e16fd
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 7 deletions.
diff --git a/src/Domain/Model/Deployment.php b/src/Domain/Model/Deployment.php
@@ -207,11 +207,23 @@ public function simulate()
      *
      * @return string
      */
-    public function getApplicationReleasePath(Application $application)
+    public function getApplicationReleaseBasePath(Application $application)
     {
         return Files::concatenatePaths([
             $application->getReleasesPath(),
-            $this->getReleaseIdentifier(),
+            $this->getReleaseIdentifier()
+        ]);
+    }
+
+    /**
+     * @param Application $application
+     *
+     * @return string
+     */
+    public function getApplicationReleasePath(Application $application)
+    {
+        return Files::concatenatePaths([
+            $this->getApplicationReleaseBasePath($application),
             $this->relativeProjectRootPath
         ]);
     }
@@ -529,7 +541,11 @@ public function setTemporaryPath($temporaryPath)
      */
     public function getDeploymentConfigurationPath()
     {
-        return $this->getDeploymentBasePath() . '/' . $this->getName() . '/Configuration';
+        return Files::concatenatePaths([
+            $this->getDeploymentBasePath(),
+            $this->getName(),
+            'Configuration'
+        ]);
     }
 
     /**
@@ -541,7 +557,26 @@ public function getDeploymentConfigurationPath()
      */
     public function getWorkspacePath(Application $application)
     {
-        return $this->workspacesBasePath . '/' . $this->getName() . '/' . $application->getName();
+        return Files::concatenatePaths([
+            $this->workspacesBasePath,
+            $this->getName(),
+            $application->getName()
+        ]);
+    }
+
+    /**
+     * Get a local workspace directory for the application
+     *
+     * @param Application $application
+     *
+     * @return string
+     */
+    public function getWorkspaceWithProjectRootPath(Application $application)
+    {
+        return Files::concatenatePaths([
+            $this->getWorkspacePath($application),
+            $this->relativeProjectRootPath
+        ]);
     }
 
     /**
@@ -594,7 +629,9 @@ public function getDeploymentLockIdentifier()
     private function setDeploymentLockIdentifier($deploymentLockIdentifier = null)
     {
         if (! is_string($deploymentLockIdentifier) || $deploymentLockIdentifier === '') {
-            $deploymentLockIdentifier = getenv('SURF_DEPLOYMENT_LOCK_IDENTIFIER') !== false ? (string)getenv('SURF_DEPLOYMENT_LOCK_IDENTIFIER') : $this->releaseIdentifier;
+            $deploymentLockIdentifier = getenv('SURF_DEPLOYMENT_LOCK_IDENTIFIER') !== false
+                ? (string)getenv('SURF_DEPLOYMENT_LOCK_IDENTIFIER')
+                : $this->releaseIdentifier;
         }
         $this->deploymentLockIdentifier = $deploymentLockIdentifier;
     }

diff --git a/src/Task/Composer/AbstractComposerTask.php b/src/Task/Composer/AbstractComposerTask.php
@@ -53,7 +53,7 @@ public function execute(Node $node, Application $application, Deployment $deploy
         $options = $this->configureOptions($options);
 
         if ($options['useApplicationWorkspace']) {
-            $composerRootPath = $deployment->getWorkspacePath($application);
+            $composerRootPath = $deployment->getWorkspaceWithProjectRootPath($application);
         } else {
             $composerRootPath = $deployment->getApplicationReleasePath($application);
         }

diff --git a/src/Task/Transfer/RsyncTask.php b/src/Task/Transfer/RsyncTask.php
@@ -38,7 +38,7 @@ public function execute(Node $node, Application $application, Deployment $deploy
         $options = $this->configureOptions($options);
 
         $localPackagePath = $deployment->getWorkspacePath($application);
-        $releasePath = $deployment->getApplicationReleasePath($application);
+        $releasePath = $deployment->getApplicationReleaseBasePath($application);
 
         if ($options['webDirectory'] !== null) {
             $this->replacePaths['{webDirectory}'] = $options['webDirectory'];