style: Construct promotion and tests fixes for v12

lochmueller · Jan 17, 2024 · 1c062a1 · 1c062a1
1 parent ca09ad3
commit 1c062a1
Show file tree

Hide file tree

Showing 33 changed files with 79 additions and 184 deletions.
diff --git a/Classes/Check/BackendUserCheck.php b/Classes/Check/BackendUserCheck.php
@@ -11,12 +11,7 @@
 
 class BackendUserCheck
 {
-    protected SiteConfigurationService $siteConfigurationService;
-
-    public function __construct(SiteConfigurationService $siteConfigurationService)
-    {
-        $this->siteConfigurationService = $siteConfigurationService;
-    }
+    public function __construct(protected SiteConfigurationService $siteConfigurationService) {}
 
     public function __invoke(CheckLanguageDetectionEvent $event): void
     {

diff --git a/Classes/Check/EnableCheck.php b/Classes/Check/EnableCheck.php
@@ -9,12 +9,7 @@
 
 class EnableCheck
 {
-    protected SiteConfigurationService $siteConfigurationService;
-
-    public function __construct(SiteConfigurationService $siteConfigurationService)
-    {
-        $this->siteConfigurationService = $siteConfigurationService;
-    }
+    public function __construct(protected SiteConfigurationService $siteConfigurationService) {}
 
     public function __invoke(CheckLanguageDetectionEvent $event): void
     {

diff --git a/Classes/Check/PathCheck.php b/Classes/Check/PathCheck.php
@@ -9,12 +9,7 @@
 
 class PathCheck
 {
-    protected SiteConfigurationService $siteConfigurationService;
-
-    public function __construct(SiteConfigurationService $siteConfigurationService)
-    {
-        $this->siteConfigurationService = $siteConfigurationService;
-    }
+    public function __construct(protected SiteConfigurationService $siteConfigurationService) {}
 
     public function __invoke(CheckLanguageDetectionEvent $event): void
     {

diff --git a/Classes/Detect/GeoPluginDetect.php b/Classes/Detect/GeoPluginDetect.php
@@ -20,18 +20,12 @@
  */
 class GeoPluginDetect
 {
-    protected IpLocation $ipLocation;
-    protected LanguageService $languageService;
-    protected SiteConfigurationService $siteConfigurationService;
-    protected LocaleCollectionSortService $localeCollectionSortService;
-
-    public function __construct(IpLocation $ipLocation, LanguageService $languageService, SiteConfigurationService $siteConfigurationService, LocaleCollectionSortService $localeCollectionSortService)
-    {
-        $this->ipLocation = $ipLocation;
-        $this->languageService = $languageService;
-        $this->siteConfigurationService = $siteConfigurationService;
-        $this->localeCollectionSortService = $localeCollectionSortService;
-    }
+    public function __construct(
+        protected IpLocation $ipLocation,
+        protected LanguageService $languageService,
+        protected SiteConfigurationService $siteConfigurationService,
+        protected LocaleCollectionSortService $localeCollectionSortService
+    ) {}
 
     public function __invoke(DetectUserLanguagesEvent $event): void
     {

diff --git a/Classes/Detect/MaxMindDetect.php b/Classes/Detect/MaxMindDetect.php
@@ -17,16 +17,11 @@
 
 class MaxMindDetect
 {
-    protected LanguageService $languageService;
-    protected SiteConfigurationService $siteConfigurationService;
-    protected LocaleCollectionSortService $localeCollectionSortService;
-
-    public function __construct(LanguageService $languageService, SiteConfigurationService $siteConfigurationService, LocaleCollectionSortService $localeCollectionSortService)
-    {
-        $this->languageService = $languageService;
-        $this->siteConfigurationService = $siteConfigurationService;
-        $this->localeCollectionSortService = $localeCollectionSortService;
-    }
+    public function __construct(
+        protected LanguageService $languageService,
+        protected SiteConfigurationService $siteConfigurationService,
+        protected LocaleCollectionSortService $localeCollectionSortService
+    ) {}
 
     public function __invoke(DetectUserLanguagesEvent $event): void
     {

diff --git a/Classes/Domain/Model/Dto/LocaleValueObject.php b/Classes/Domain/Model/Dto/LocaleValueObject.php
@@ -6,12 +6,7 @@
 
 class LocaleValueObject
 {
-    protected string $locale;
-
-    public function __construct(string $locale)
-    {
-        $this->locale = $locale;
-    }
+    public function __construct(protected string $locale) {}
 
     public function getLocale(): string
     {

diff --git a/Classes/Domain/Model/Dto/SiteConfiguration.php b/Classes/Domain/Model/Dto/SiteConfiguration.php
@@ -6,53 +6,19 @@
 
 class SiteConfiguration
 {
-    protected bool $enableLanguageDetection;
-
-    protected bool $disableRedirectWithBackendSession;
-
-    protected string $addIpLocationToBrowserLanguage;
-
-    protected bool $allowAllPaths;
-
-    protected int $redirectHttpStatusCode;
-
-    protected string $forwardRedirectParameters;
-
-    protected int $fallbackDetectionLanguage;
-
-    protected string $maxMindDatabasePath;
-
-    protected int $maxMindAccountId;
-
-    protected string $maxMindLicenseKey;
-
-    protected string $maxMindMode;
-
     public function __construct(
-        bool $enableLanguageDetection,
-        bool $disableRedirectWithBackendSession,
-        string $addIpLocationToBrowserLanguage,
-        bool $allowAllPaths,
-        int $redirectHttpStatusCode,
-        string $forwardRedirectParameters,
-        int $fallbackDetectionLanguage,
-        string $maxMindDatabasePath,
-        int $maxMindAccountId,
-        string $maxMindLicenseKey,
-        string $maxMindMode
-    ) {
-        $this->enableLanguageDetection = $enableLanguageDetection;
-        $this->disableRedirectWithBackendSession = $disableRedirectWithBackendSession;
-        $this->addIpLocationToBrowserLanguage = $addIpLocationToBrowserLanguage;
-        $this->allowAllPaths = $allowAllPaths;
-        $this->redirectHttpStatusCode = $redirectHttpStatusCode;
-        $this->forwardRedirectParameters = $forwardRedirectParameters;
-        $this->fallbackDetectionLanguage = $fallbackDetectionLanguage;
-        $this->maxMindDatabasePath = $maxMindDatabasePath;
-        $this->maxMindAccountId = $maxMindAccountId;
-        $this->maxMindLicenseKey = $maxMindLicenseKey;
-        $this->maxMindMode = $maxMindMode;
-    }
+        protected bool $enableLanguageDetection,
+        protected bool $disableRedirectWithBackendSession,
+        protected string $addIpLocationToBrowserLanguage,
+        protected bool $allowAllPaths,
+        protected int $redirectHttpStatusCode,
+        protected string $forwardRedirectParameters,
+        protected int $fallbackDetectionLanguage,
+        protected string $maxMindDatabasePath,
+        protected int $maxMindAccountId,
+        protected string $maxMindLicenseKey,
+        protected string $maxMindMode
+    ) {}
 
     public function isEnableLanguageDetection(): bool
     {

diff --git a/Classes/Event/BuildResponseEvent.php b/Classes/Event/BuildResponseEvent.php
@@ -12,17 +12,13 @@
 
 final class BuildResponseEvent extends AbstractEvent implements StoppableEventInterface
 {
-    private SiteInterface $site;
-    private ServerRequestInterface $request;
-    private SiteLanguage $selectedLanguage;
     private ?ResponseInterface $response = null;
 
-    public function __construct(SiteInterface $site, ServerRequestInterface $request, SiteLanguage $selectedLanguage)
-    {
-        $this->site = $site;
-        $this->request = $request;
-        $this->selectedLanguage = $selectedLanguage;
-    }
+    public function __construct(
+        private SiteInterface $site,
+        private ServerRequestInterface $request,
+        private SiteLanguage $selectedLanguage
+    ) {}
 
     public function getSite(): SiteInterface
     {

diff --git a/Classes/Event/CheckLanguageDetectionEvent.php b/Classes/Event/CheckLanguageDetectionEvent.php
@@ -10,15 +10,12 @@
 
 final class CheckLanguageDetectionEvent extends AbstractEvent implements StoppableEventInterface
 {
-    private SiteInterface $site;
-    private ServerRequestInterface $request;
     private bool $handle = true;
 
-    public function __construct(SiteInterface $site, ServerRequestInterface $request)
-    {
-        $this->site = $site;
-        $this->request = $request;
-    }
+    public function __construct(
+        private SiteInterface $site,
+        private ServerRequestInterface $request
+    ) {}
 
     public function getSite(): SiteInterface
     {

diff --git a/Classes/Event/DetectUserLanguagesEvent.php b/Classes/Event/DetectUserLanguagesEvent.php
@@ -11,14 +11,12 @@
 
 final class DetectUserLanguagesEvent extends AbstractEvent
 {
-    private SiteInterface $site;
-    private ServerRequestInterface $request;
     private LocaleCollection $userLanguages;
 
-    public function __construct(SiteInterface $site, ServerRequestInterface $request)
-    {
-        $this->site = $site;
-        $this->request = $request;
+    public function __construct(
+        protected SiteInterface $site,
+        protected ServerRequestInterface $request
+    ) {
         $this->userLanguages = new LocaleCollection();
     }
 

diff --git a/Classes/Event/NegotiateSiteLanguageEvent.php b/Classes/Event/NegotiateSiteLanguageEvent.php
@@ -12,17 +12,13 @@
 
 final class NegotiateSiteLanguageEvent extends AbstractEvent implements StoppableEventInterface
 {
-    private SiteInterface $site;
-    private ServerRequestInterface $request;
-    private LocaleCollection $userLanguages;
     private ?SiteLanguage $selectedLanguage = null;
 
-    public function __construct(SiteInterface $site, ServerRequestInterface $request, LocaleCollection $userLanguages)
-    {
-        $this->site = $site;
-        $this->request = $request;
-        $this->userLanguages = $userLanguages;
-    }
+    public function __construct(
+        private SiteInterface $site,
+        private ServerRequestInterface $request,
+        private LocaleCollection $userLanguages
+    ) {}
 
     public function getSite(): SiteInterface
     {

diff --git a/Classes/Handler/AbstractHandler.php b/Classes/Handler/AbstractHandler.php
@@ -10,12 +10,7 @@
 
 abstract class AbstractHandler
 {
-    protected EventDispatcherInterface $eventDispatcher;
-
-    public function __construct(EventDispatcherInterface $eventDispatcher)
-    {
-        $this->eventDispatcher = $eventDispatcher;
-    }
+    public function __construct(protected EventDispatcherInterface $eventDispatcher) {}
 
     protected function getSiteFromRequest(ServerRequestInterface $request): SiteInterface
     {

diff --git a/Classes/Middleware/JsonDetectionMiddleware.php b/Classes/Middleware/JsonDetectionMiddleware.php
@@ -13,12 +13,7 @@
 
 class JsonDetectionMiddleware implements MiddlewareInterface
 {
-    protected JsonDetectionHandler $jsonDetectionHandler;
-
-    public function __construct(JsonDetectionHandler $jsonDetectionHandler)
-    {
-        $this->jsonDetectionHandler = $jsonDetectionHandler;
-    }
+    public function __construct(protected JsonDetectionHandler $jsonDetectionHandler) {}
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {

diff --git a/Classes/Middleware/LanguageDetectionMiddleware.php b/Classes/Middleware/LanguageDetectionMiddleware.php
@@ -13,12 +13,7 @@
 
 class LanguageDetectionMiddleware implements MiddlewareInterface
 {
-    protected LanguageDetectionHandler $languageDetectionHandler;
-
-    public function __construct(LanguageDetectionHandler $languageDetectionHandler)
-    {
-        $this->languageDetectionHandler = $languageDetectionHandler;
-    }
+    public function __construct(protected LanguageDetectionHandler $languageDetectionHandler) {}
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {

diff --git a/Classes/Negotiation/DefaultNegotiation.php b/Classes/Negotiation/DefaultNegotiation.php
@@ -9,12 +9,7 @@
 
 class DefaultNegotiation
 {
-    protected Normalizer $normalizer;
-
-    public function __construct(Normalizer $normalizer)
-    {
-        $this->normalizer = $normalizer;
-    }
+    public function __construct(protected Normalizer $normalizer) {}
 
     public function __invoke(NegotiateSiteLanguageEvent $event): void
     {

diff --git a/Classes/Negotiation/FallbackNegotiation.php b/Classes/Negotiation/FallbackNegotiation.php
@@ -10,12 +10,7 @@
 
 class FallbackNegotiation
 {
-    protected SiteConfigurationService $siteConfigurationService;
-
-    public function __construct(SiteConfigurationService $siteConfigurationService)
-    {
-        $this->siteConfigurationService = $siteConfigurationService;
-    }
+    public function __construct(protected SiteConfigurationService $siteConfigurationService) {}
 
     public function __invoke(NegotiateSiteLanguageEvent $event): void
     {

diff --git a/Classes/Response/DefaultResponse.php b/Classes/Response/DefaultResponse.php
@@ -15,12 +15,7 @@
 
 class DefaultResponse
 {
-    protected SiteConfigurationService $siteConfigurationService;
-
-    public function __construct(SiteConfigurationService $siteConfigurationService)
-    {
-        $this->siteConfigurationService = $siteConfigurationService;
-    }
+    public function __construct(protected SiteConfigurationService $siteConfigurationService) {}
 
     public function __invoke(BuildResponseEvent $event): void
     {

diff --git a/Classes/Service/IpLocation.php b/Classes/Service/IpLocation.php
@@ -6,15 +6,12 @@
 
 use Psr\Http\Message\RequestFactoryInterface;
 use TYPO3\CMS\Core\Http\Client\GuzzleClientFactory;
+use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class IpLocation
 {
-    private RequestFactoryInterface $requestFactory;
-
-    public function __construct(RequestFactoryInterface $requestFactory)
-    {
-        $this->requestFactory = $requestFactory;
-    }
+    public function __construct(private RequestFactoryInterface $requestFactory) {}
 
     public function getCountryCode(string $ip): ?string
     {
@@ -24,7 +21,7 @@ public function getCountryCode(string $ip): ?string
         $urlService = 'http://www.geoplugin.net/php.gp?ip=' . $ip;
         try {
             $request = $this->requestFactory->createRequest('GET', $urlService);
-            $response = GuzzleClientFactory::getClient()->send($request);
+            $response = $this->getClient()->send($request);
 
             if ($response->getStatusCode() !== 200) {
                 throw new IpLocationException('Missing information in response', 123781);
@@ -40,4 +37,12 @@ public function getCountryCode(string $ip): ?string
             return null;
         }
     }
+
+    protected function getClient(): \Psr\Http\Client\ClientInterface
+    {
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() >= 12) {
+            return GeneralUtility::makeInstance(GuzzleClientFactory::class)->getClient();
+        }
+        return GuzzleClientFactory::getClient();
+    }
 }
diff --git a/Classes/Service/TcaLanguageSelection.php b/Classes/Service/TcaLanguageSelection.php
@@ -10,15 +10,13 @@
 
 class TcaLanguageSelection
 {
-    protected SiteFinder $siteFinder;
-
-    public function __construct(?SiteFinder $siteFinder = null)
+    public function __construct(protected ?SiteFinder $siteFinder = null)
     {
         if ($siteFinder === null) {
             /** @var SiteFinder $siteFinder */
             $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
+            $this->siteFinder = $siteFinder;
         }
-        $this->siteFinder = $siteFinder;
     }
 
     /**