[BUGFIX] Ensure that correct typo3 binary is returned in non-composer…

… installations (#1126) Resolves #1125
tomasnorre · Feb 5, 2025 · 8eff816 · 8eff816
1 parent f4b5c8a
commit 8eff816
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Changed
 
 ### Fixed
+* Ensure that correct typo3 binary is returned in non-composer installations
 
 ### Deprecated
 #### Classes

diff --git a/Classes/Command/BuildQueueCommand.php b/Classes/Command/BuildQueueCommand.php
@@ -162,7 +162,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $configurationKeys
         );
 
-
         // Consider a swith/match statement here, and extract the code in between.
         if ($mode === 'url') {
             $output->writeln('<info>' . implode(PHP_EOL, $crawlerController->downloadUrls) . PHP_EOL . '</info>');

diff --git a/Classes/Service/ProcessService.php b/Classes/Service/ProcessService.php
@@ -92,6 +92,10 @@ public function getCrawlerCliPath(): string
 
     private function getComposerBinPath(): ?string
     {
+        if (!getenv('TYPO3_PATH_COMPOSER_ROOT')) {
+            return sprintf('%s/%s/', getenv('TYPO3_PATH_APP'), 'vendor/typo3/cms-cli');
+        }
+
         // copied and modified from @see
         // https://github.com/TYPO3/typo3/blob/8a9c80b9d85ef986f5f369f1744fc26a6b607dda/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php#L402
         $composerJsonFile = getenv('TYPO3_PATH_COMPOSER_ROOT') . '/composer.json';

diff --git a/Tests/Functional/Service/ProcessServiceTest.php b/Tests/Functional/Service/ProcessServiceTest.php
@@ -20,12 +20,10 @@
  */
 
 use AOE\Crawler\Service\ProcessService;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-/**
- * @package AOE\Crawler\Tests\Unit\Domain\Model
- */
 class ProcessServiceTest extends FunctionalTestCase
 {
     protected array $testExtensionsToLoad = ['typo3conf/ext/crawler'];
@@ -42,7 +40,7 @@ protected function setUp(): void
         $this->subject = GeneralUtility::makeInstance(ProcessService::class);
     }
 
-    #[\PHPUnit\Framework\Attributes\Test]
+    #[Test]
     public function getCrawlerCliPathReturnsString(): void
     {
         // Check with phpPath set
@@ -62,4 +60,17 @@ public function getCrawlerCliPathReturnsString(): void
         ];
         self::assertStringContainsString('php', $this->subject->getCrawlerCliPath());
     }
+
+    #[Test]
+    public function getCrawlerCliPathContainsTYPO3BinaryRespectivelyWithOutComposer(): void
+    {
+        $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['crawler'] = [
+            'phpBinary' => 'php',
+
+        ];
+
+        // Unassign TYPO3_PATH_COMPOSER_ROOT
+        putenv('TYPO3_PATH_COMPOSER_ROOT');
+        self::assertStringContainsString('vendor/typo3/cms-cli/typo3', $this->subject->getCrawlerCliPath());
+    }
 }