[FEATURE] Add support for TYPO3 13.0

.github/workflows/tests.yaml

@@ -16,8 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ["8.1", "8.2", "8.3"]
-        typo3-version: ["11.5", "12.4"]
+        typo3-version: ["11.5", "12.4", "13.0"]
         dependencies: ["highest", "lowest"]
+        exclude:
+          - php-version: "8.1"
+            typo3-version: "13.0"
     env:
       typo3DatabaseName: typo3
       typo3DatabaseHost: '127.0.0.1'

Classes/Cache/SitemapsCache.php

@@ -55,7 +55,7 @@ public function get(
 
         return array_values(
             array_map(
-                static fn(string $sitemapUrl) => new Domain\Model\Sitemap(
+                static fn (string $sitemapUrl) => new Domain\Model\Sitemap(
                     new Core\Http\Uri($sitemapUrl),
                     $site,
                     $siteLanguage ?? $site->getDefaultLanguage(),
@@ -96,7 +96,7 @@ public function set(array $sitemaps): void
                 $this->writeCache(
                     $cacheIdentifier,
                     array_map(
-                        static fn(Domain\Model\Sitemap $sitemap) => (string)$sitemap->getUri(),
+                        static fn (Domain\Model\Sitemap $sitemap) => (string)$sitemap->getUri(),
                         $sitemapsOfCurrentSite,
                     ),
                 );

Classes/Command/LocateSitemapsCommand.php

@@ -120,7 +120,7 @@ protected function interact(Console\Input\InputInterface $input, Console\Output\
                 $site->getDefaultLanguage()->getLanguageId(),
             );
             $question->setValidator(
-                fn(string|int $siteLanguage) => $this->validateSiteLanguage($siteLanguage, $site, $availableSiteLanguages),
+                fn (string|int $siteLanguage) => $this->validateSiteLanguage($siteLanguage, $site, $availableSiteLanguages),
             );
 
             $input->setOption(

Classes/Form/Element/XmlSitemapLocationElement.php

@@ -46,12 +46,23 @@ final class XmlSitemapLocationElement extends Backend\Form\Element\AbstractFormE
         ],
     ];
 
+    /**
+     * @todo Make private readonly Core\Imaging\IconFactory once support for TYPO3 v12 is dropped
+     */
+    protected $iconFactory;
     private readonly Core\Site\SiteFinder $siteFinder;
     private readonly Sitemap\SitemapLocator $sitemapLocator;
 
+    /**
+     * @todo Use DI once support for TYPO3 v12 is dropped
+     */
     public function __construct(Backend\Form\NodeFactory $nodeFactory = null, array $data = [])
     {
-        parent::__construct($nodeFactory, $data);
+        if ((new Core\Information\Typo3Version())->getMajorVersion() < 13) {
+            parent::__construct($nodeFactory, $data);
+        } else {
+            $this->iconFactory = Core\Utility\GeneralUtility::makeInstance(Core\Imaging\IconFactory::class);
+        }
 
         $this->siteFinder = Core\Utility\GeneralUtility::makeInstance(Core\Site\SiteFinder::class);
         $this->sitemapLocator = Core\Utility\GeneralUtility::makeInstance(Sitemap\SitemapLocator::class);
@@ -211,7 +222,13 @@ private function renderCallout(string $state, string $icon, string $body, bool $
 
     private function renderIcon(string $identifier): string
     {
-        return $this->iconFactory->getIcon($identifier, Core\Imaging\Icon::SIZE_SMALL)->render();
+        if (enum_exists(Core\Imaging\IconSize::class)) {
+            $iconSize = Core\Imaging\IconSize::SMALL;
+        } else {
+            $iconSize = Core\Imaging\Icon::SIZE_SMALL;
+        }
+
+        return $this->iconFactory->getIcon($identifier, $iconSize)->render();
     }
 
     private function translate(string $key): string

Classes/Sitemap/Provider/RobotsTxtProvider.php

@@ -62,7 +62,7 @@ public function get(
 
         return array_values(
             array_map(
-                static fn(string $url) => new Domain\Model\Sitemap(
+                static fn (string $url) => new Domain\Model\Sitemap(
                     new Core\Http\Uri($url),
                     $site,
                     $siteLanguage ?? $site->getDefaultLanguage(),

Configuration/Services.php

@@ -24,7 +24,7 @@
 use EliasHaeussler\Typo3SitemapLocator\Sitemap;
 use Symfony\Component\DependencyInjection;
 
-return static function (DependencyInjection\ContainerBuilder $container): void {
+return static function(DependencyInjection\ContainerBuilder $container): void {
     $container->registerForAutoconfiguration(Sitemap\Provider\Provider::class)
         ->addTag('sitemap_locator.sitemap_provider');
 };

Documentation/Installation/Index.rst

@@ -12,7 +12,7 @@ Requirements
 ============
 
 -   PHP 8.1 - 8.3
--   TYPO3 11.5 LTS - 12.4 LTS
+-   TYPO3 11.5 LTS - 13.0
 
 ..  _steps:
 
@@ -33,8 +33,10 @@ Or download it from the
 Version matrix
 ==============
 
-+--------------------+-------------------------+---------------+
-| Extension versions | TYPO3 versions          | PHP versions  |
-+====================+=========================+===============+
-| **since 0.1.0**    | **11.5 LTS - 12.4 LTS** | **8.1 - 8.3** |
-+--------------------+-------------------------+---------------+
++--------------------+---------------------+---------------+
+| Extension versions | TYPO3 versions      | PHP versions  |
++====================+=====================+===============+
+| **since 0.1.3**    | **11.5 LTS - 13.0** | **8.1 - 8.3** |
++--------------------+---------------------+---------------+
+| 0.1.0 - 0.1.2      | 11.5 LTS - 12.4 LTS | 8.1 - 8.3     |
++--------------------+---------------------+---------------+

Tests/Functional/Command/LocateSitemapsCommandTest.php

@@ -68,8 +68,8 @@ protected function setUp(): void
         $this->importCSVDataSet(\dirname(__DIR__) . '/Fixtures/Database/be_users.csv');
         $this->importCSVDataSet(\dirname(__DIR__) . '/Fixtures/Database/pages.csv');
 
-        $this->setUpBackendUser(1);
-        Core\Core\Bootstrap::initializeLanguageObject();
+        $backendUser = $this->setUpBackendUser(1);
+        $GLOBALS['LANG'] = $this->get(Core\Localization\LanguageServiceFactory::class)->createFromUserPreferences($backendUser);
 
         $this->cache->flush();
     }

Tests/Functional/SiteTrait.php

@@ -38,15 +38,23 @@ trait SiteTrait
     private function createSite(string $baseUrl = 'https://typo3-testing.local/'): Core\Site\Entity\Site
     {
         $configPath = $this->instancePath . '/typo3conf/sites';
+        $typo3Version = new Core\Information\Typo3Version();
 
-        // @todo Remove once support for TYPO3 v11 is dropped
-        if ((new Core\Information\Typo3Version())->getMajorVersion() < 12) {
-            $siteConfiguration = new Core\Configuration\SiteConfiguration($configPath);
-        } else {
+        if ($typo3Version->getMajorVersion() >= 13) {
+            $siteConfiguration = new Core\Configuration\SiteConfiguration(
+                $configPath,
+                new Core\EventDispatcher\NoopEventDispatcher(),
+                new Core\Cache\Frontend\NullFrontend('core'),
+            );
+        } elseif (($typo3Version)->getMajorVersion() >= 12) {
+            // @todo Remove once support for TYPO3 v12 is dropped
             $siteConfiguration = new Core\Configuration\SiteConfiguration(
                 $configPath,
                 new Core\EventDispatcher\NoopEventDispatcher(),
             );
+        } else {
+            // @todo Remove once support for TYPO3 v11 is dropped
+            $siteConfiguration = new Core\Configuration\SiteConfiguration($configPath);
         }
 
         $siteConfiguration->createNewBasicSite(static::$testSiteIdentifier, 1, $baseUrl);

Tests/Functional/Sitemap/SitemapLocatorTest.php

@@ -194,7 +194,7 @@ public function locateBySiteDispatchesEventWithLocatedSitemap(): void
 
         $this->eventDispatcher->addListener(
             Src\Event\SitemapsLocatedEvent::class,
-            static function (Src\Event\SitemapsLocatedEvent $event) use ($site, $expected): void {
+            static function(Src\Event\SitemapsLocatedEvent $event) use ($site, $expected): void {
                 self::assertSame($site, $event->getSite());
                 self::assertNull($event->getSiteLanguage());
                 self::assertEquals($expected, $event->getSitemaps());
@@ -289,7 +289,7 @@ public function isValidSitemapDispatchesEventWithValidityResult(): void
 
         $this->eventDispatcher->addListener(
             Src\Event\SitemapValidatedEvent::class,
-            static function (Src\Event\SitemapValidatedEvent $event) use ($sitemap): void {
+            static function(Src\Event\SitemapValidatedEvent $event) use ($sitemap): void {
                 self::assertSame($sitemap, $event->getSitemap());
                 self::assertTrue($event->isValid());
 

Tests/Functional/Utility/BackendUtilityTest.php

@@ -25,7 +25,7 @@
 
 use EliasHaeussler\Typo3SitemapLocator as Src;
 use PHPUnit\Framework;
-use TYPO3\CMS\Core\Core\Bootstrap;
+use TYPO3\CMS\Core;
 use TYPO3\TestingFramework;
 
 /**
@@ -44,9 +44,8 @@ protected function setUp(): void
         $this->importCSVDataSet(\dirname(__DIR__) . '/Fixtures/Database/be_users.csv');
         $this->importCSVDataSet(\dirname(__DIR__) . '/Fixtures/Database/pages.csv');
 
-        $this->setUpBackendUser(1);
-
-        Bootstrap::initializeLanguageObject();
+        $backendUser = $this->setUpBackendUser(1);
+        $GLOBALS['LANG'] = $this->get(Core\Localization\LanguageServiceFactory::class)->createFromUserPreferences($backendUser);
     }
 
     #[Framework\Attributes\Test]

composer.json

@@ -16,14 +16,14 @@
 		"guzzlehttp/guzzle": "^7.0",
 		"psr/event-dispatcher": "^1.0",
 		"psr/http-message": "^1.0 || ^2.0",
-		"symfony/console": "^5.4 || ^6.0",
-		"symfony/dependency-injection": "^5.4 || ^6.0",
-		"typo3/cms-backend": "~11.5.4 || ~12.4.0",
-		"typo3/cms-core": "~11.5.4 || ~12.4.0"
+		"symfony/console": "^5.4 || ^6.0 || ^7.0",
+		"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+		"typo3/cms-backend": "~11.5.4 || ~12.4.0 || ~13.0.0",
+		"typo3/cms-core": "~11.5.4 || ~12.4.0 || ~13.0.0"
 	},
 	"require-dev": {
 		"armin/editorconfig-cli": "^1.6 || ^2.0",
-		"eliashaeussler/php-cs-fixer-config": "^1.2 || ^2.0",
+		"eliashaeussler/php-cs-fixer-config": "^2.0",
 		"eliashaeussler/phpstan-config": "^2.2",
 		"eliashaeussler/rector-config": "^3.0",
 		"ergebnis/composer-normalize": "^2.39",
@@ -34,10 +34,10 @@
 		"phpunit/phpunit": "^10.1 || ^11.0",
 		"saschaegerer/phpstan-typo3": "^1.9",
 		"ssch/typo3-rector": "^2.0",
-		"symfony/event-dispatcher": "^5.4 || ^6.0",
-		"typo3/cms-seo": "~11.5.4 || ~12.4.0",
-		"typo3/coding-standards": "^0.7.1",
-		"typo3/testing-framework": "^7.0.2 || ^8.0.1"
+		"symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+		"typo3/cms-seo": "~11.5.4 || ~12.4.0 || ~13.0.0",
+		"typo3/coding-standards": "^0.8.0@dev",
+		"typo3/testing-framework": "^7.0.2 || ^8.0.9"
 	},
 	"autoload": {
 		"psr-4": {

dependency-checker.json

@@ -3,5 +3,8 @@
 		"ext_*.php",
 		"Configuration/SiteConfiguration/Overrides/*.php",
 		"Configuration/*.php"
+	],
+	"symbol-whitelist": [
+		"TYPO3\\CMS\\Core\\Imaging\\IconSize"
 	]
 }

ext_emconf.php

@@ -30,7 +30,7 @@
     'author_email' => '[email protected]',
     'constraints' => [
         'depends' => [
-            'typo3' => '11.5.4-12.4.99',
+            'typo3' => '11.5.4-13.0.99',
             'php' => '8.1.0-8.3.99',
         ],
     ],

phpstan-baseline.neon

@@ -2,12 +2,17 @@ parameters:
 	ignoreErrors:
 		-
 			message: """
-				#^Access to deprecated property \\$iconFactory of class TYPO3\\\\CMS\\\\Backend\\\\Form\\\\Element\\\\AbstractFormElement\\:
+				#^Access to deprecated property \\$iconFactory of class EliasHaeussler\\\\Typo3SitemapLocator\\\\Form\\\\Element\\\\XmlSitemapLocationElement\\:
 				since TYPO3 v12\\.4\\. will be removed in TYPO3 v13\\.0\\.$#
 			"""
 			count: 1
 			path: Classes/Form/Element/XmlSitemapLocationElement.php
 
+		-
+			message: "#^Class TYPO3\\\\CMS\\\\Core\\\\Imaging\\\\IconSize not found\\.$#"
+			count: 1
+			path: Classes/Form/Element/XmlSitemapLocationElement.php
+
 		-
 			message: "#^Method EliasHaeussler\\\\Typo3SitemapLocator\\\\Form\\\\Element\\\\XmlSitemapLocationElement\\:\\:__construct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1

rector.php

@@ -28,7 +28,7 @@
 use Rector\Symfony\Symfony53\Rector\Class_\CommandDescriptionToPropertyRector;
 use Rector\ValueObject\PhpVersion;
 
-return static function (RectorConfig $rectorConfig): void {
+return static function(RectorConfig $rectorConfig): void {
     Config::create($rectorConfig, PhpVersion::PHP_81)
         ->in(
             __DIR__ . '/Classes',