Rector changes

Classes/Detect/BrowserLanguageDetect.php

@@ -24,7 +24,7 @@ public function __invoke(DetectUserLanguagesEvent $event): void
             if (str_contains($languageAndQualityStr, ';')) {
                 $parts = GeneralUtility::trimExplode(';', $languageAndQualityStr, true);
                 $languageCode = $parts[0];
-                $quality = isset($parts[1]) ? $parts[1] : '';
+                $quality = $parts[1] ?? '';
             } else {
                 $languageCode = $languageAndQualityStr;
                 $quality = 'q=1.0';

Classes/Detect/MaxMindDetect.php

@@ -34,7 +34,7 @@ public function __invoke(DetectUserLanguagesEvent $event): void
 
         try {
             $result = $provider->country($event->getRequest()->getServerParams()['REMOTE_ADDR'] ?? '');
-        } catch (\Exception $exception) {
+        } catch (\Exception) {
             return;
         }
         $mode = $configuration->getMaxMindMode();

Classes/Domain/Model/Dto/LocaleValueObject.php

@@ -4,7 +4,7 @@
 
 namespace Lochmueller\LanguageDetection\Domain\Model\Dto;
 
-class LocaleValueObject
+class LocaleValueObject implements \Stringable
 {
     public function __construct(protected string $locale) {}
 
@@ -18,7 +18,7 @@ public function setLocale(string $locale): void
         $this->locale = $locale;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getLocale();
     }

Classes/Event/BuildResponseEvent.php

@@ -47,6 +47,6 @@ public function setResponse(ResponseInterface $response): void
 
     public function isPropagationStopped(): bool
     {
-        return $this->getResponse() !== null;
+        return $this->getResponse() instanceof \Psr\Http\Message\ResponseInterface;
     }
 }

Classes/Event/NegotiateSiteLanguageEvent.php

@@ -47,6 +47,6 @@ public function setSelectedLanguage(SiteLanguage $selectedLanguage): void
 
     public function isPropagationStopped(): bool
     {
-        return $this->selectedLanguage !== null;
+        return $this->selectedLanguage instanceof \TYPO3\CMS\Core\Site\Entity\SiteLanguage;
     }
 }

Classes/Handler/JsonDetectionHandler.php

@@ -38,7 +38,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $this->eventDispatcher->dispatch($negotiate);
 
         $selectedLanguage = $negotiate->getSelectedLanguage();
-        if ($selectedLanguage === null) {
+        if (!$selectedLanguage instanceof \TYPO3\CMS\Core\Site\Entity\SiteLanguage) {
             return new JsonResponse($site->getDefaultLanguage()->toArray());
         }
 

Classes/Handler/LanguageDetectionHandler.php

@@ -43,14 +43,14 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $negotiate = new NegotiateSiteLanguageEvent($site, $request, $detect->getUserLanguages());
         $this->eventDispatcher->dispatch($negotiate);
 
-        if ($negotiate->getSelectedLanguage() === null) {
+        if (!$negotiate->getSelectedLanguage() instanceof \TYPO3\CMS\Core\Site\Entity\SiteLanguage) {
             throw new NoSelectedLanguageException();
         }
 
         $response = new BuildResponseEvent($site, $request, $negotiate->getSelectedLanguage());
         $this->eventDispatcher->dispatch($response);
 
-        if ($response->getResponse() === null) {
+        if (!$response->getResponse() instanceof \Psr\Http\Message\ResponseInterface) {
             throw new NoResponseException();
         }
 

Classes/Handler/LinkLanguageHandler.php

@@ -48,7 +48,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $negotiate = new NegotiateSiteLanguageEvent($site, $request, $detect->getUserLanguages());
         $this->eventDispatcher->dispatch($negotiate);
 
-        if ($negotiate->getSelectedLanguage() === null) {
+        if (!$negotiate->getSelectedLanguage() instanceof \TYPO3\CMS\Core\Site\Entity\SiteLanguage) {
             throw new NoSelectedLanguageException();
         }
 

Classes/Middleware/JsonDetectionMiddleware.php

@@ -19,7 +19,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         try {
             return $this->jsonDetectionHandler->handle($request);
-        } catch (AbstractHandlerException $exception) {
+        } catch (AbstractHandlerException) {
             return $handler->handle($request);
         }
     }

Classes/Middleware/LanguageDetectionMiddleware.php

@@ -19,7 +19,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         try {
             return $this->languageDetectionHandler->handle($request);
-        } catch (AbstractHandlerException $exception) {
+        } catch (AbstractHandlerException) {
             return $handler->handle($request);
         }
     }

Classes/Service/IpLocation.php

@@ -28,12 +28,12 @@ public function getCountryCode(string $ip): ?string
             }
             $result = (array)unserialize((string)$response->getBody(), ['allowed_classes' => false]);
 
-            if (empty($result) || (int)$result['geoplugin_status'] === 404) {
+            if ($result === [] || (int)$result['geoplugin_status'] === 404) {
                 throw new IpLocationException('No valid data', 162378);
             }
 
             return $result['geoplugin_countryCode'] ?? null;
-        } catch (IpLocationException $exc) {
+        } catch (IpLocationException) {
             return null;
         }
     }
@@ -43,6 +43,6 @@ protected function getClient(): \Psr\Http\Client\ClientInterface
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() >= 12) {
             return GeneralUtility::makeInstance(GuzzleClientFactory::class)->getClient();
         }
-        return GuzzleClientFactory::getClient();
+        return (new GuzzleClientFactory())->getClient();
     }
 }

Classes/Service/RespectLanguageLinkDetailsTrait.php

@@ -30,7 +30,7 @@ public function addLanguageParameterByDetection(array $linkDetails, ?ServerReque
             return $linkDetails;
         }
 
-        if ($request === null) {
+        if (!$request instanceof \Psr\Http\Message\ServerRequestInterface) {
             $request = ServerRequestFactory::fromGlobals();
             $request = $request->withMethod('GET')->withUri(new Uri('/'));
         }
@@ -43,7 +43,7 @@ public function addLanguageParameterByDetection(array $linkDetails, ?ServerReque
             $linkDetails['parameters'] = 'L=' . $response->getHeaderLine(LinkLanguageHandler::HEADER_NAME);
 
             return $linkDetails;
-        } catch (AbstractHandlerException $exception) {
+        } catch (AbstractHandlerException) {
             return $linkDetails;
         }
     }

Classes/Service/TcaLanguageSelection.php

@@ -12,7 +12,7 @@ class TcaLanguageSelection
 {
     public function __construct(protected ?SiteFinder $siteFinder = null)
     {
-        if ($siteFinder === null) {
+        if (!$siteFinder instanceof \TYPO3\CMS\Core\Site\SiteFinder) {
             /** @var SiteFinder $siteFinder */
             $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
             $this->siteFinder = $siteFinder;
@@ -30,7 +30,7 @@ public function get(array &$configuration): void
 
         try {
             $site = $this->siteFinder->getSiteByIdentifier($configuration['row']['identifier']);
-        } catch (SiteNotFoundException $exception) {
+        } catch (SiteNotFoundException) {
             return;
         }
 

Tests/Unit/Detect/MaxMindDetectTest.php

@@ -67,14 +67,14 @@ public function testMemoryConsumptionAndExecutionTimeOfMaxMindDatabaseFileUpload
             'languageDetectionMaxMindDatabasePath' => $dbFile,
         ]);
 
-        self::assertExecutionTimeLessThenOrEqual(0.3, function () use ($site, $serverRequest) {
+        self::assertExecutionTimeLessThenOrEqual(0.3, function () use ($site, $serverRequest): void {
             $event = new DetectUserLanguagesEvent($site, $serverRequest);
             $event->setUserLanguages(LocaleCollection::fromArray([]));
             $maxMindDetect = new MaxMindDetect(new LanguageService(), new SiteConfigurationService(), new LocaleCollectionSortService());
             $maxMindDetect($event);
         });
 
-        self::assertExecutionMemoryLessThenOrEqual(400, function () use ($site, $serverRequest) {
+        self::assertExecutionMemoryLessThenOrEqual(400, function () use ($site, $serverRequest): void {
             $event = new DetectUserLanguagesEvent($site, $serverRequest);
             $event->setUserLanguages(LocaleCollection::fromArray([]));
             $maxMindDetect = new MaxMindDetect(new LanguageService(), new SiteConfigurationService(), new LocaleCollectionSortService());

Tests/Unit/Response/DefaultResponseTest.php

@@ -82,7 +82,7 @@ public function testConfigurationWithWrongErrorCode(): void
         $defaultResponse($event);
 
         self::assertNotNull($event->getResponse());
-        if ($event->getResponse() !== null) {
+        if ($event->getResponse() instanceof \Psr\Http\Message\ResponseInterface) {
             self::assertEquals(307, $event->getResponse()->getStatusCode());
         }
     }
@@ -117,7 +117,7 @@ public function testConfigurationWithRedirectParams(): void
         $defaultResponse($event);
 
         self::assertNotNull($event->getResponse());
-        if ($event->getResponse() !== null) {
+        if ($event->getResponse() instanceof \Psr\Http\Message\ResponseInterface) {
             self::assertEquals(307, $event->getResponse()->getStatusCode());
             self::assertEquals('/en/?test=1', $event->getResponse()->getHeaderLine('location'));
         }

Tests/Unit/Service/RespectLanguageLinkDetailsTraitTest.php

@@ -133,13 +133,13 @@ protected function createTraitMock(?LinkLanguageHandler $linkLanguageHandler = n
         $traitObject = $this->getObjectForTrait(RespectLanguageLinkDetailsTrait::class);
         $reflectionClass = new \ReflectionClass($traitObject);
 
-        if ($linkLanguageHandler !== null) {
+        if ($linkLanguageHandler instanceof \Lochmueller\LanguageDetection\Handler\LinkLanguageHandler) {
             $propertyLanguageEventDispatcher = $reflectionClass->getProperty('linkLanguageHandler');
             $propertyLanguageEventDispatcher->setAccessible(true);
             $propertyLanguageEventDispatcher->setValue($traitObject, $linkLanguageHandler);
         }
 
-        if ($languageSiteFinder !== null) {
+        if ($languageSiteFinder instanceof \TYPO3\CMS\Core\Site\SiteFinder) {
             $propertyLanguageSiteFinder = $reflectionClass->getProperty('languageSiteFinder');
             $propertyLanguageSiteFinder->setAccessible(true);
             $propertyLanguageSiteFinder->setValue($traitObject, $languageSiteFinder);

rector.php

@@ -17,37 +17,26 @@
 use Ssch\TYPO3Rector\Set\Typo3SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
+return static function (\Rector\Config\RectorConfig $config): void {
 
-    $containerConfigurator->import(Typo3LevelSetList::UP_TO_TYPO3_12);
-    $containerConfigurator->import(SetList::CODE_QUALITY);
-    $containerConfigurator->import(SetList::TYPE_DECLARATION);
-    $containerConfigurator->import(SetList::TYPE_DECLARATION_STRICT);
-    $containerConfigurator->import(LevelSetList::UP_TO_PHP_80);
+    $config->import(Typo3LevelSetList::UP_TO_TYPO3_13);
+    $config->import(SetList::CODE_QUALITY);
+    $config->import(SetList::TYPE_DECLARATION);
+    $config->import(LevelSetList::UP_TO_PHP_81);
 
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, Typo3Option::PHPSTAN_FOR_RECTOR_PATH);
-    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-    $parameters->set(Option::IMPORT_SHORT_CLASSES, false);
-    $parameters->set(Option::IMPORT_DOC_BLOCKS, false);
-
-    $parameters->set(Option::PATHS, [
+    $config->paths([
         'ext_emconf.php',
         'composer.json',
         __DIR__ . '/Classes/',
         __DIR__ . '/Configuration/',
         __DIR__ . '/Tests/',
     ]);
 
-    $parameters->set(Option::SKIP, [
+    $config->skip([
         NameImportingPostRector::class => [
             'ext_emconf.php',
             'ext_localconf.php',
             'ext_tables.php',
         ],
     ]);
-
-    $services = $containerConfigurator->services();
-    $services->set(ExtEmConfRector::class);
-    $services->set(ExtensionComposerRector::class);
 };