Merge pull request #557 from eliashaeussler/feature/typo3-13

[FEATURE] Add support for TYPO3 13.0

Author: eliashaeussler

.github/workflows/tests.yaml

@@ -16,8 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ["8.1", "8.2", "8.3"]
-        typo3-version: ["12.4"]
+        typo3-version: ["12.4", "13.0"]
         dependencies: ["highest", "lowest"]
+        exclude:
+          - php-version: "8.1"
+            typo3-version: "13.0"
     steps:
       - uses: actions/checkout@v4
         with:

.gitignore

@@ -3,7 +3,6 @@
 /Resources/Private/Libs/Build/vendor
 /Resources/Private/Libs/vendors.phar
 /Tests/Acceptance/Support/_generated
-/Tests/Build/Configuration/system/settings.php
 /var/
 /.php-cs-fixer.cache
 /.phpunit.result.cache

Classes/Backend/ContextMenu/ItemProviders/CacheWarmupProvider.php

@@ -171,12 +171,12 @@ private function initSubMenus(): void
             if ($itemName === self::ITEM_MODE_SITE) {
                 $languages = array_filter(
                     $languages,
-                    fn(Core\Site\Entity\SiteLanguage $siteLanguage): bool => $this->canWarmupCachesOfSite($siteLanguage)
+                    fn (Core\Site\Entity\SiteLanguage $siteLanguage): bool => $this->canWarmupCachesOfSite($siteLanguage)
                 );
             } else {
                 $languages = array_filter(
                     $languages,
-                    fn(Core\Site\Entity\SiteLanguage $siteLanguage): bool => Utility\AccessUtility::canWarmupCacheOfPage(
+                    fn (Core\Site\Entity\SiteLanguage $siteLanguage): bool => Utility\AccessUtility::canWarmupCacheOfPage(
                         (int)$this->identifier,
                         $siteLanguage->getLanguageId(),
                     )

Classes/Command/WarmupCommand.php

@@ -113,7 +113,7 @@ protected function configure(): void
             '  │  It can be defined via the extension configuration <info>strategy</info> or by using the <info>--strategy</info> option.',
             '  │  The following strategies are currently available:',
             ...array_map(
-                static fn(string $strategy) => '  │  * <info>' . $strategy . '</info>',
+                static fn (string $strategy) => '  │  * <info>' . $strategy . '</info>',
                 array_keys($this->crawlingStrategyFactory->getAll()),
             ),
             '  ├─ Default: <info>' . ($this->configuration->getStrategy() ?? 'none') . '</info>',
@@ -191,7 +191,6 @@ protected function configure(): void
     }
 
     /**
-     * @throws CacheWarmup\Exception\InvalidUrlException
      * @throws Console\Exception\ExceptionInterface
      * @throws Core\Exception\SiteNotFoundException
      * @throws JsonException

Classes/Configuration/Configuration.php

@@ -50,7 +50,6 @@ public function __construct(
         private readonly Core\Configuration\ExtensionConfiguration $configuration,
         private readonly CacheWarmup\Crawler\CrawlerFactory $crawlerFactory,
         private readonly Crawler\Strategy\CrawlingStrategyFactory $crawlingStrategyFactory,
-        private readonly Extbase\Security\Cryptography\HashService $hashService,
     ) {
         $this->userAgent = $this->generateUserAgent();
     }
@@ -260,6 +259,18 @@ public function getUserAgent(): string
 
     private function generateUserAgent(): string
     {
-        return $this->hashService->appendHmac('TYPO3/tx_warming_crawler');
+        $string = 'TYPO3/tx_warming_crawler';
+
+        if (class_exists(Core\Crypto\HashService::class)) {
+            return Core\Utility\GeneralUtility::makeInstance(Core\Crypto\HashService::class)->appendHmac(
+                $string,
+                self::class,
+            );
+        }
+
+        // @todo Remove once support for TYPO3 v12 is dropped
+        return Core\Utility\GeneralUtility::makeInstance(Extbase\Security\Cryptography\HashService::class)->appendHmac(
+            $string,
+        );
     }
 }

Classes/Extension.php

@@ -70,9 +70,15 @@ public static function registerFormDataProviders(): void
      * Register custom PageTsConfig.
      *
      * FOR USE IN ext_localconf.php ONLY.
+     *
+     * @todo Remove once support for TYPO3 v12 is dropped
      */
     public static function registerPageTsConfig(): void
     {
+        if ((new Core\Information\Typo3Version())->getMajorVersion() >= 13) {
+            return;
+        }
+
         Core\Utility\ExtensionManagementUtility::addPageTSConfig('
             @import "EXT:warming/Configuration/TSconfig/Page.tsconfig";
         ');

Classes/Result/CacheWarmupResult.php

@@ -64,7 +64,7 @@ public function getCrawlingResultsBySite(
             'successful' => array_values(
                 array_filter(
                     $this->result->getSuccessful(),
-                    fn(CacheWarmup\Result\CrawlingResult $crawlingResult) => $this->filterBySite(
+                    fn (CacheWarmup\Result\CrawlingResult $crawlingResult) => $this->filterBySite(
                         $crawlingResult,
                         $site,
                         $siteLanguage,
@@ -74,7 +74,7 @@ public function getCrawlingResultsBySite(
             'failed' => array_values(
                 array_filter(
                     $this->result->getFailed(),
-                    fn(CacheWarmup\Result\CrawlingResult $crawlingResult) => $this->filterBySite(
+                    fn (CacheWarmup\Result\CrawlingResult $crawlingResult) => $this->filterBySite(
                         $crawlingResult,
                         $site,
                         $siteLanguage,

Classes/Service/CacheWarmupService.php

@@ -95,7 +95,7 @@ public function warmup(
                 $sitemaps = $this->sitemapLocator->locateBySite($siteWarmupRequest->getSite(), $siteLanguage);
                 $cacheWarmer->addSitemaps(
                     array_map(
-                        static fn(Typo3SitemapLocator\Domain\Model\Sitemap $sitemap) => Domain\Model\SiteAwareSitemap::fromLocatedSitemap($sitemap),
+                        static fn (Typo3SitemapLocator\Domain\Model\Sitemap $sitemap) => Domain\Model\SiteAwareSitemap::fromLocatedSitemap($sitemap),
                         $sitemaps,
                     ),
                 );

Configuration/Services.php

@@ -24,7 +24,7 @@
 use EliasHaeussler\CacheWarmup;
 use Symfony\Component\DependencyInjection;
 
-return static function (
+return static function(
     DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator,
     DependencyInjection\ContainerBuilder $container,
 ): void {

Configuration/page.tsconfig

@@ -0,0 +1 @@
+@import 'EXT:warming/Configuration/TSconfig/Page.tsconfig'