chore: preparations for typo3 v12

.code-quality/phpstan-baseline.neon

@@ -8,10 +8,6 @@ parameters:
 			message: "#^Comparison operation \"\\<\" between int\\<1, max\\> and 1 is always false\\.$#"
 			count: 1
 			path: ../Classes/System/Configuration/TypoScriptConfiguration.php
-		-
-			message: "#^Result of \\|\\| is always false\\.$#"
-			count: 1
-			path: ../Classes/System/Configuration/TypoScriptConfiguration.php
 		-
 			message: "#^Call to an undefined static method TYPO3\\\\CMS\\\\Core\\\\Utility\\\\GeneralUtility\\:\\:sysLog\\(\\)\\.$#"
 			count: 1
@@ -32,22 +28,14 @@ parameters:
 			message: "#^Anonymous variable in a `\\$GLOBALS\\['TYPO3_REQUEST'\\]\\-\\>\\.\\.\\.\\(\\)` method call can lead to false dead methods\\. Make sure the variable type is known$#"
 			count: 1
 			path: ../Classes/System/Configuration/TypoScriptConfiguration.php
-
-		-
-			message: "#^Anonymous variable in a `\\$site\\-\\>getBase\\(\\)\\-\\>\\.\\.\\.\\(\\)` method call can lead to false dead methods\\. Make sure the variable type is known$#"
-			count: 1
-			path: ../Classes/System/Configuration/TypoScriptConfiguration.php
-
 		-
 			message: "#^Anonymous variables in a \"\\$GLOBALS\\['TSFE'\\]\\-\\>\\.\\.\\.\" property fetch can lead to false dead property\\. Make sure the variable type is known$#"
 			count: 1
 			path: ../Classes/System/Configuration/TypoScriptConfiguration.php
-
 		-
 			message: "#^Anonymous variables in a \"\\$GLOBALS\\['TSFE'\\]\\-\\>tmpl\\-\\>\\.\\.\\.\" property fetch can lead to false dead property\\. Make sure the variable type is known$#"
 			count: 1
 			path: ../Classes/System/Configuration/TypoScriptConfiguration.php
-
 		-
 			message: "#^Anonymous variable in a `\\$GLOBALS\\['TSFE'\\]\\-\\>\\.\\.\\.\\(\\)` method call can lead to false dead methods\\. Make sure the variable type is known$#"
 			count: 2
@@ -59,4 +47,8 @@ parameters:
 		-
 			message: "#^On passing a constant, the method should have an enum type\\. See https\\://phpstan\\.org/writing\\-php\\-code/phpdoc\\-types\\#literals\\-and\\-constants$#"
 			count: 1
-			path: ../Classes/Api/Url.php
+			path: ../Classes/Api/Url.php
+		-
+			message: "#^Unable to resolve the template type T in call to method static method TYPO3\\\\CMS\\\\Core\\\\Utility\\\\GeneralUtility\\:\\:makeInstance\\(\\)$#"
+			count: 1
+			path: ../Classes/System/Factory/AbstractDeclarationBasedFactory.php

.code-quality/rector.php

@@ -12,27 +12,21 @@
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector;
 use Rector\CodingStyle\Rector\FuncCall\ConsistentPregDelimiterRector;
-use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector;
 use Rector\CodingStyle\Rector\Property\AddFalseDefaultToBoolPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Core\Configuration\Option;
 use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
 use Rector\Defluent\Rector\Return_\ReturnFluentChainMethodCallToNormalMethodCallRector;
-use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\Return_\ReturnBinaryAndToEarlyReturnRector;
-use Rector\Naming\Rector\ClassMethod\RenameVariableToMatchNewTypeRector;
-use Rector\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchMethodCallReturnTypeRector;
 use Rector\Naming\Rector\Property\MakeBoolPropertyRespectIsHasWasMethodNamingRector;
 use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
-use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
 use Rector\Php74\Rector\Property\TypedPropertyRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector;
-use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
 use Rector\Privatization\Rector\Class_\RepeatedLiteralToClassConstantRector;
 use Rector\Privatization\Rector\Property\ChangeReadOnlyPropertyWithDefaultValueToConstantRector;
 use Rector\Privatization\Rector\Property\PrivatizeLocalPropertyToPrivatePropertyRector;
@@ -58,7 +52,6 @@
         SetList::EARLY_RETURN,
         SetList::PRIVATIZATION,
         SetList::TYPE_DECLARATION,
-        SetList::PHP_74,
         SetList::PHP_80,
         SetList::PHP_81,
         SetList::PHP_82,
@@ -70,14 +63,8 @@
     ])
     ->withSkip([
         RecastingRemovalRector::class,
-        PostIncDecToPreIncDecRector::class,
-        FinalizeClassesWithoutChildrenRector::class,
-        ChangeAndIfToEarlyReturnRector::class,
         IssetOnPropertyObjectToPropertyExistsRector::class,
         FlipTypeControlToUseExclusiveTypeRector::class,
-        RenameVariableToMatchNewTypeRector::class,
-        AddLiteralSeparatorToNumberRector::class,
-        RenameForeachValueVariableToMatchMethodCallReturnTypeRector::class,
         ClassPropertyAssignToConstructorPromotionRector::class,
         ArgumentAdderRector::class,
         RemoveExtraParametersRector::class,
@@ -87,4 +74,4 @@
     ])
     ->withAutoloadPaths([__DIR__ . '/../Classes'])
     ->withCache('.cache/rector/default')
-    ->withImportNames(false);
+    ->withImportNames(false);

Classes/Content/Scraper/Html/Image.php

@@ -16,9 +16,6 @@ public function scrape(string $content): ?Collection
         return $this->getAssets('img', 'src', $content)
             ->merge($this->getAssets('image', 'href', $content))
             ->merge($this->getAssets('link', 'href', $content, [
-                'type' => 'image/webp',
-                'type' => 'image/png',
-                'type' => 'image/jpeg',
                 'type' => 'image/gif',
             ]));
     }

Classes/Domain/Model/Page.php

@@ -82,7 +82,7 @@ public function replaceAssets(): void
         $distributionAlgorithmKey = '';
         try {
             $distributionAlgorithmKey = $this->configurationProvider->getDistributionAlgorithmKey();
-        } catch (Exception $exception) {
+        } catch (Exception) {
         }
 
         $distributionAlgorithm = $this->distributionAlgorithmFactory->buildDistributionAlgorithmFromKey($distributionAlgorithmKey);

Classes/Domain/Model/Server.php

@@ -114,21 +114,12 @@ private function getProtocolPrefix(): string
             $protocol = $this->getRequestProtocol();
         }
 
-        switch ($protocol) {
-            case self::PROTOCOL_MARKER:
-                $protocolPrefix = $this->protocolMarker;
-                break;
-            case self::PROTOCOL_WILDCARD:
-                $protocolPrefix = '//';
-                break;
-            case self::PROTOCOL_HTTP:
-                $protocolPrefix = 'http://';
-                break;
-            case self::PROTOCOL_HTTPS:
-                $protocolPrefix = 'https://';
-                break;
-        }
-
-        return $protocolPrefix;
+        return match ($protocol) {
+            self::PROTOCOL_MARKER => $this->protocolMarker,
+            self::PROTOCOL_WILDCARD => '//',
+            self::PROTOCOL_HTTP => 'http://',
+            self::PROTOCOL_HTTPS => 'https://',
+            default => $protocolPrefix,
+        };
     }
 }

Classes/Domain/Model/Server/Factory.php

@@ -19,18 +19,12 @@ public function injectConfigurationProvider(Provider $configurationProvider): vo
     {
         try {
             $this->protocolMarker = $configurationProvider->getServerProtocolMarker();
-        } catch (Exception $exception) {
+        } catch (Exception) {
             $this->protocolMarker = '';
         }
     }
 
-    /**
-     * @param string $identifier
-     * @param string $domain
-     * @param string $protocol
-     * @return \Aoe\Asdis\Domain\Model\Server
-     */
-    public function createServer($identifier, $domain, $protocol)
+    public function createServer(string $identifier, string $domain, string $protocol): Server
     {
         $server = GeneralUtility::makeInstance(Server::class);
         $server->setIdentifier($identifier);

Classes/System/Configuration/TypoScriptConfiguration.php

@@ -34,7 +34,7 @@ public function getSetting($key, $validateType = '', $hasSubkeys = false)
         }
 
         $parts = explode('.', $key);
-        if (!is_array($parts) || count($parts) < 1) {
+        if (count($parts) < 1) {
             throw new TypoScriptSettingNotExists($key, 1_372_050_700_894);
         }
 

Classes/System/Uri/Filter/ChainFactory.php

@@ -33,7 +33,7 @@ private function initialize(): void
     }
 
     /**
-     * @return \Aoe\Asdis\System\Uri\Filter\FilterInterface
+     * @return FilterInterface
      */
     private function buildFilter(string $filterKey)
     {

Classes/System/Uri/Normalizer.php

@@ -14,7 +14,7 @@ public function normalizePath(string $path): string
     {
         // Fix for wildcard protocol URLs, as parse_url (until PHP 5.4.7) requires the protocol to be set
         // @see http://www.php.net/manual/en/function.parse-url.php
-        if (substr($path, 0, 2) === '//') {
+        if (str_starts_with($path, '//')) {
             $path = 'http:' . $path;
         }
 

Tests/Content/Replacement/MapTest.php

@@ -11,6 +11,8 @@ class MapTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->map = new Map();
     }
 

Tests/Content/Replacement/ProcessorTest.php

@@ -12,6 +12,8 @@ class ProcessorTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->processor = new Processor();
     }
 

Tests/Content/Scraper/Css/UrlTest.php

@@ -12,6 +12,8 @@ class UrlTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->url = new Url();
     }
 

Tests/Content/Scraper/Extractor/XmlTagAttributeTest.php

@@ -11,6 +11,8 @@ class XmlTagAttributeTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->extractor = new XmlTagAttribute();
     }
 

Tests/Content/Scraper/Html/Css3ImageTest.php

@@ -14,6 +14,8 @@ class Css3ImageTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $xmlTagAttributeExtractor = new XmlTagAttribute();
         $factory = new Factory();
 

Tests/Content/Scraper/Html/CssAttributeTest.php

@@ -12,6 +12,8 @@ class CssAttributeTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->cssAttribute = new CssAttribute();
     }
 

Tests/Content/Scraper/Html/CssInlineTest.php

@@ -12,6 +12,8 @@ class CssInlineTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->scraper = new CssInline();
     }
 

Tests/Content/Scraper/Html/SrcsetTest.php

@@ -14,6 +14,8 @@ class SrcsetTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $xmlTagAttributeExtractor = new XmlTagAttribute();
         $factory = new Factory();
 

Tests/Domain/Model/AssetTest.php

@@ -12,6 +12,8 @@ class AssetTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->asset = new Asset();
     }
 

Tests/Domain/Model/DistributionAlgorithm/HashBasedGroupsTest.php

@@ -15,6 +15,8 @@ class HashBasedGroupsTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->algorithm = new HashBasedGroups();
     }
 
@@ -42,8 +44,8 @@ public function testDistribute(): void
 
         $this->algorithm->distribute($assets, $servers);
 
-        $this->assertSame(Server::class, $asset1->getServer() !== null ? get_class($asset1->getServer()) : self::class);
-        $this->assertSame(Server::class, $asset2->getServer() !== null ? get_class($asset2->getServer()) : self::class);
-        $this->assertSame(Server::class, $asset3->getServer() !== null ? get_class($asset3->getServer()) : self::class);
+        $this->assertSame(Server::class, $asset1->getServer() !== null ? $asset1->getServer()::class : self::class);
+        $this->assertSame(Server::class, $asset2->getServer() !== null ? $asset2->getServer()::class : self::class);
+        $this->assertSame(Server::class, $asset3->getServer() !== null ? $asset3->getServer()::class : self::class);
     }
 }

Tests/Domain/Model/DistributionAlgorithm/RoundRobinTest.php

@@ -15,6 +15,8 @@ class RoundRobinTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->algorithm = new RoundRobin();
     }
 

Tests/Domain/Model/ServerTest.php

@@ -13,6 +13,8 @@ class ServerTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->server = new Server();
     }
 

Tests/Domain/Repository/ServerRepositoryTest.php

@@ -15,6 +15,8 @@ class ServerRepositoryTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->serverRepository = new ServerRepository();
     }
 

Tests/System/Configuration/TypoScriptConfigurationTest.php

@@ -5,20 +5,23 @@
 use Aoe\Asdis\System\Configuration\Exception\InvalidTypoScriptSetting;
 use Aoe\Asdis\System\Configuration\Exception\TypoScriptSettingNotExists;
 use Aoe\Asdis\System\Configuration\TypoScriptConfiguration;
+use PHPUnit\Framework\MockObject\MockObject;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 class TypoScriptConfigurationTest extends UnitTestCase
 {
     /**
-     * @var (\PHPUnit\Framework\MockObject\MockObject & \TypoScriptConfiguration)
+     * @var @var MockObject&\TypoScriptConfiguration
      */
-    private \PHPUnit\Framework\MockObject\MockObject $typoScriptConfiguration;
+    private MockObject $typoScriptConfiguration;
 
     /**
      * (non-PHPdoc)
      */
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->typoScriptConfiguration = $this->getMockBuilder(TypoScriptConfiguration::class)
             ->onlyMethods(['getTypoScriptConfigurationArray'])
             ->getMock();

Tests/System/Uri/Filter/BubblingPathTest.php

@@ -11,6 +11,8 @@ class BubblingPathTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->filter = new BubblingPath();
     }
 

Tests/System/Uri/Filter/ChainTest.php

@@ -13,6 +13,8 @@ class ChainTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->chain = new Chain();
     }
 

Tests/System/Uri/Filter/ContainsInlineDataTest.php

@@ -11,6 +11,8 @@ class ContainsInlineDataTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->filter = new ContainsInlineData();
     }
 

Tests/System/Uri/Filter/ContainsProtocolTest.php

@@ -11,6 +11,8 @@ class ContainsProtocolTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->filter = new ContainsProtocol();
     }
 

Tests/System/Uri/Filter/TooShortTest.php

@@ -11,6 +11,8 @@ class TooShortTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->filter = new TooShort();
     }