SDK-5471: Fix composer issue behaviour (#255)

spryker-sdk · Nov 13, 2023 · 266660d · 266660d
1 parent ee67f49
commit 266660d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/Upgrade/Application/Strategy/ReleaseApp/Processor/SequentialReleaseGroupProcessor.php b/src/Upgrade/Application/Strategy/ReleaseApp/Processor/SequentialReleaseGroupProcessor.php
@@ -159,7 +159,6 @@ public function process(ReleaseGroupDtoCollection $requireRequestCollection, Ste
             }
 
             if (!$response->isSuccessful()) {
-                $stepsExecutionDto->setIsSuccessful(false);
                 $composerViolation = $this->composerViolationDtoFactory->createFromPackageManagerResponse($response);
 
                 $stepsExecutionDto->setError(

diff --git a/src/Upgrade/Infrastructure/VersionControlSystem/Git/Git.php b/src/Upgrade/Infrastructure/VersionControlSystem/Git/Git.php
@@ -209,7 +209,7 @@ public function createPullRequest(StepsResponseDto $stepsExecutionDto): StepsRes
             return $stepsExecutionDto;
         }
 
-        if ($composerDiffDto === null) {
+        if (!$this->hasCurrentBranchCommits()) {
             $this->createEmptyCommit($stepsExecutionDto, 'pr empty commit');
             $this->push($stepsExecutionDto);
         }
@@ -379,4 +379,16 @@ protected function prepareStepsExecutionDto(StepsResponseDto $stepsExecutionDto,
 
         return $stepsExecutionDto;
     }
+
+    /**
+     * @return bool
+     */
+    protected function hasCurrentBranchCommits(): bool
+    {
+        $command = ['git', 'log', '--oneline', $this->getBaseBranch() . '..'];
+
+        $process = $this->processRunner->run($command);
+
+        return trim($process->getOutput()) !== '';
+    }
 }
diff --git a/src/Upgrader/Console/UpgraderConsole.php b/src/Upgrader/Console/UpgraderConsole.php
@@ -63,7 +63,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
 
         $output->writeln((string)$stepsExecutionDto->getOutputMessage());
 
-        if (!$stepsExecutionDto->getIsSuccessful()) {
+        if (!$stepsExecutionDto->getIsSuccessful() || $stepsExecutionDto->hasBlockers()) {
             return Command::FAILURE;
         }
 

diff --git a/tests/UpgradeTest/Application/Strategy/ReleaseApp/Step/ReleaseGroupUpdateStepTest.php b/tests/UpgradeTest/Application/Strategy/ReleaseApp/Step/ReleaseGroupUpdateStepTest.php
@@ -167,7 +167,7 @@ public function testRunWithSequentialReleaseGroupProcessorPackageManagerError():
         $stepsResponseDto = $step->run($stepsResponseDto);
 
         // Assert
-        $this->assertFalse($stepsResponseDto->isSuccessful());
+        $this->assertTrue($stepsResponseDto->isSuccessful());
         $this->assertSame(
             <<<OUT
             Amount of available release groups for the project: 2