Merge pull request #328 from spryker-sdk/bugfix/frw-9570/fixed-invali…

…d-base-branched

FRW-9570 Set Base branch from `BUDDY_RUN_BRANCH` var.

src/Upgrade/Infrastructure/Configuration/ConfigurationProvider.php

@@ -310,6 +310,17 @@ public function getCiExecutionId(): string
         return (string)getenv('CI_EXECUTION_ID');
     }
 
+    /**
+     * Specification:
+     * - Defines Buddy run branch.
+     *
+     * @return string
+     */
+    public function getBuddyRunBranch(): string
+    {
+        return (string)getenv('BUDDY_RUN_BRANCH');
+    }
+
     /**
      * Specification:
      * - Defines ci workspace name.

src/Upgrade/Infrastructure/Report/Sender/RemoteEndpointJsonReportSender.php

@@ -77,6 +77,10 @@ public function __construct(
      */
     public function send(ReportDto $reportDto): void
     {
+        if (!$this->configurationProvider->isReportingEnabled()) {
+            return;
+        }
+
         $this->httpClient->request(
             'POST',
             $this->endpointUrl,

src/Upgrade/Infrastructure/VersionControlSystem/Git/Git.php

@@ -340,14 +340,23 @@ protected function getHeadBranch(): string
     protected function getBaseBranch(): string
     {
         if ($this->baseBranch === '') {
-            $command = ['git', 'rev-parse', '--abbrev-ref', 'HEAD'];
-            $process = $this->processRunner->run($command);
-            $this->baseBranch = trim($process->getOutput());
+            $this->baseBranch = $this->configurationProvider->getBuddyRunBranch() ?: $this->getCurrentBranch();
         }
 
         return $this->baseBranch;
     }
 
+    /**
+     * @return string
+     */
+    protected function getCurrentBranch(): string
+    {
+        $command = ['git', 'rev-parse', '--abbrev-ref', 'HEAD'];
+        $process = $this->processRunner->run($command);
+
+        return trim($process->getOutput());
+    }
+
     /**
      * @param \Upgrade\Application\Dto\StepsResponseDto $stepsExecutionDto
      * @param array<string> $command

tests/UpgradeTest/Infrastructure/Report/Sender/RemoteEndpointJsonReportSenderTest.php

@@ -69,6 +69,10 @@ public function testSendReport(): void
             ->method('getReportSendAuthToken')
             ->willReturn('your_auth_token');
 
+        $configurationProvider->expects($this->once())
+            ->method('isReportingEnabled')
+            ->willReturn(true);
+
         // Configure the http client mock
         $httpClient->expects($this->once())
             ->method('request')