More migration to DI

Author: lochmueller

Classes/Cache/IdentifierBuilder.php

@@ -16,7 +16,7 @@ class IdentifierBuilder
     public function __construct(protected ?EventDispatcherInterface $eventDispatcher = null)
     {
         if ($this->eventDispatcher === null) {
-            $this->eventDispatcher = GeneralUtility::makeInstance(EventDispatcherInterface::class);
+            $this->eventDispatcher = GeneralUtility::getContainer()->get(EventDispatcherInterface::class);
         }
     }
 

Classes/Cache/Listener/CachingAllowedListener.php

@@ -15,6 +15,7 @@ public function __construct(private readonly Typo3Version $typo3Version) {}
     public function __invoke(CacheRuleEvent $event): void
     {
         if ($this->typo3Version->getMajorVersion() >= 13) {
+            /* @phpstan-ignore-next-line */
             if (!$event->getRequest()->getAttribute('frontend.cache.instruction')->isCachingAllowed()) {
                 $event->addExplanation(__CLASS__, 'No caching via frontend.cache.instruction attribute');
             }

Classes/Cache/Listener/EnableListener.php

@@ -6,15 +6,13 @@
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
 use SFC\Staticfilecache\Service\ConfigurationService;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class EnableListener
 {
+    public function __construct(protected readonly ConfigurationService $configurationService) {}
     public function __invoke(CacheRuleEvent $event): void
     {
-        /** @var ConfigurationService $configuration */
-        $configuration = GeneralUtility::makeInstance(ConfigurationService::class);
-        if ($configuration->isBool('disableCache')) {
+        if ($this->configurationService->isBool('disableCache')) {
             $event->addExplanation(__CLASS__, 'static cache disabled by TypoScript');
         }
     }

Classes/Cache/Listener/NoUserOrGroupSetListener.php

@@ -6,17 +6,14 @@
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
 use TYPO3\CMS\Core\Context\Context;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class NoUserOrGroupSetListener
 {
-    /**
-     * Check if no user or group is set.
-     */
+    public function __construct(protected readonly Context $context) {}
+
     public function __invoke(CacheRuleEvent $event): void
     {
-        $context = GeneralUtility::makeInstance(Context::class);
-        if ($context->getAspect('frontend.user')->isUserOrGroupSet()) {
+        if ($this->context->getAspect('frontend.user')->isUserOrGroupSet()) {
             $event->addExplanation(__CLASS__, 'User or group are set');
         }
     }

Classes/Middleware/FallbackMiddleware.php

@@ -24,6 +24,7 @@ public function __construct(
         protected readonly EventDispatcherInterface $eventDispatcher,
         protected readonly ConfigurationService $configurationService,
         protected readonly IdentifierBuilder $identifierBuilder,
+        protected readonly CacheService $cacheService,
     ) {}
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
@@ -67,7 +68,7 @@ protected function handleViaFallback(ServerRequestInterface $request): ResponseI
             throw new Exception('StaticFileCache file not found', 126371823);
         }
 
-        $cacheDirectory = GeneralUtility::makeInstance(CacheService::class)->getAbsoluteBaseDirectory();
+        $cacheDirectory = $this->cacheService->getAbsoluteBaseDirectory();
         if (!str_starts_with($possibleStaticFile, $cacheDirectory)) {
             throw new Exception('The path is not in the cache directory', 348923472);
         }

Classes/Middleware/GenerateMiddleware.php

@@ -31,7 +31,8 @@ public function __construct(
         readonly protected EventDispatcherInterface $eventDispatcher,
         readonly protected CookieService            $cookieService,
         readonly protected Typo3Version             $typo3Version,
-        readonly protected CacheService             $cacheService
+        readonly protected CacheService             $cacheService,
+        readonly protected ConfigurationService             $configurationService
     ) {}
 
     /**
@@ -137,7 +138,7 @@ protected function hasValidCacheEntry($uri): bool
      */
     protected function removeSfcHeaders(ResponseInterface $response): ResponseInterface
     {
-        $debug = GeneralUtility::makeInstance(ConfigurationService::class)->isBool('debugHeaders');
+        $debug = $this->configurationService->isBool('debugHeaders');
         if (!$debug) {
             $response = $response->withoutHeader('X-SFC-Cachable');
             $response = $response->withoutHeader('X-SFC-State');

Classes/Middleware/PrepareMiddleware.php

@@ -20,8 +20,11 @@
 class PrepareMiddleware implements MiddlewareInterface
 {
     public function __construct(
-        protected EventDispatcherInterface $eventDispatcher,
-        protected HttpPushService          $httpPushService
+        protected readonly EventDispatcherInterface $eventDispatcher,
+        protected readonly HttpPushService          $httpPushService,
+        protected readonly ConfigurationService          $configurationService,
+        protected readonly TypoScriptFrontendService          $typoScriptFrontendService,
+        protected readonly InlineAssetsService $inlineAssetsService
     ) {}
 
     /**
@@ -42,9 +45,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $this->eventDispatcher->dispatch($event);
 
         if (!$event->isSkipProcessing()) {
-            $cacheTags = GeneralUtility::makeInstance(TypoScriptFrontendService::class)->getTags();
-            $configuration = GeneralUtility::makeInstance(ConfigurationService::class);
-            if (false === (bool) $configuration->get('clearCacheForAllDomains')) {
+            $cacheTags = $this->typoScriptFrontendService->getTags();
+            if (false === $this->configurationService->isBool('clearCacheForAllDomains')) {
                 $cacheTags[] = 'sfc_domain_' . str_replace('.', '_', $event->getRequest()->getUri()->getHost());
             }
 
@@ -63,7 +65,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             }
         }
 
-        $processedHtml = (string) GeneralUtility::makeInstance(InlineAssetsService::class)->replaceInlineContent((string) $response->getBody());
+        $processedHtml = (string) $this->inlineAssetsService->replaceInlineContent((string) $response->getBody());
         $responseBody = new Stream('php://temp', 'rw');
         $responseBody->write($processedHtml);
         $response = $response->withBody($responseBody);

Classes/Service/TypoScriptFrontendService.php

@@ -21,10 +21,6 @@ public function getTags(): array
         return array_unique((array) $tsfe->getPageCacheTags());
     }
 
-    /**
-     * Get the TSFE.
-     *
-     */
     protected function getTsfe(): ?TypoScriptFrontendController
     {
         return $GLOBALS['TSFE'];

Tests/Unit/Cache/IdentifierBuilderTest.php

@@ -4,8 +4,10 @@
 
 namespace SFC\Staticfilecache\Tests\Unit\Cache;
 
+use Psr\EventDispatcher\EventDispatcherInterface;
 use SFC\Staticfilecache\Cache\IdentifierBuilder;
 use SFC\Staticfilecache\Tests\Unit\AbstractTest;
+use TYPO3\CMS\Core\EventDispatcher\NoopEventDispatcher;
 
 /**
  * IdentifierBuilderTest.
@@ -27,8 +29,7 @@ public function testCheckValidPath(): void
         ];
 
         foreach ($validUris as $uri) {
-            $identBuilder = new IdentifierBuilder();
-            static::assertTrue($identBuilder->isValidEntryIdentifier($uri), 'The URI "' . $uri . '" should be valid!');
+            static::assertTrue($this->getIdentifierBuilder()->isValidEntryIdentifier($uri), 'The URI "' . $uri . '" should be valid!');
         }
     }
 
@@ -42,8 +43,11 @@ public function testCheckInValidPath(): void
         ];
 
         foreach ($invalidUris as $uri) {
-            $identBuilder = new IdentifierBuilder();
-            static::assertFalse($identBuilder->isValidEntryIdentifier($uri), 'The URI "' . $uri . '" should be invalid!');
+            static::assertFalse($this->getIdentifierBuilder()->isValidEntryIdentifier($uri), 'The URI "' . $uri . '" should be invalid!');
         }
     }
+
+    protected function getIdentifierBuilder(): IdentifierBuilder {
+        return new IdentifierBuilder(new NoopEventDispatcher());
+    }
 }