[TASK] improve UrlUtility

Classes/Event/Listener/HeadlessHreflangGeneratorListener.php

@@ -11,15 +11,15 @@
 
 namespace FriendsOfTYPO3\Headless\Event\Listener;
 
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use TYPO3\CMS\Frontend\Event\ModifyHrefLangTagsEvent;
 
 /**
  * @codeCoverageIgnore
  */
 class HeadlessHreflangGeneratorListener
 {
-    public function __construct(private readonly UrlUtility $urlUtility) {}
+    public function __construct(private readonly HeadlessFrontendUrlInterface $urlUtility) {}
 
     public function __invoke(ModifyHrefLangTagsEvent $event): void
     {

Classes/Form/Finisher/JsonRedirectFinisher.php

@@ -11,7 +11,7 @@
 
 namespace FriendsOfTYPO3\Headless\Form\Finisher;
 
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use JsonException;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -51,7 +51,7 @@ class JsonRedirectFinisher extends AbstractFinisher
      * via GeneralUtility::makeInstance($implementationClassName) without args, so DI cannot
      * honor constructor injection. Resolve via container on first use.
      */
-    private ?UrlUtility $urlUtility = null;
+    private ?HeadlessFrontendUrlInterface $urlUtility = null;
 
     /**
      * Executes this finisher
@@ -101,7 +101,7 @@ protected function prepareRedirect(
             $serverRequest = $this->request->getAttribute('extbase.request.originalRequest')
                 ?? $GLOBALS['TYPO3_REQUEST'];
 
-            $urlUtility = ($this->urlUtility ??= GeneralUtility::makeInstance(UrlUtility::class))->withRequest($serverRequest);
+            $urlUtility = ($this->urlUtility ??= GeneralUtility::makeInstance(HeadlessFrontendUrlInterface::class))->withRequest($serverRequest);
 
             $cObj = $serverRequest->getAttribute('currentContentObject');
             if ($cObj === null) {

Classes/Hooks/PreviewUrlHook.php

@@ -11,7 +11,7 @@
 
 namespace FriendsOfTYPO3\Headless\Hooks;
 
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 
 /**
  * PreviewUrlHook
@@ -20,7 +20,7 @@
  **/
 class PreviewUrlHook
 {
-    public function __construct(private readonly UrlUtility $urlUtility) {}
+    public function __construct(private readonly HeadlessFrontendUrlInterface $urlUtility) {}
 
     /**
      * @param string $previewUrl

Classes/Middleware/ShortcutAndMountPointRedirect.php

@@ -11,8 +11,8 @@
 
 namespace FriendsOfTYPO3\Headless\Middleware;
 
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use FriendsOfTYPO3\Headless\Utility\HeadlessModeInterface;
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -27,7 +27,7 @@ class ShortcutAndMountPointRedirect extends \TYPO3\CMS\Frontend\Middleware\Short
 {
     public function __construct(
         private readonly HeadlessModeInterface $headlessMode,
-        private readonly UrlUtility $urlUtility,
+        private readonly HeadlessFrontendUrlInterface $urlUtility,
         PageTypeLinkResolver $pageTypeLinkResolver,
     ) {
         parent::__construct($pageTypeLinkResolver);

Classes/Middleware/SiteBaseRedirectResolver.php

@@ -11,8 +11,8 @@
 
 namespace FriendsOfTYPO3\Headless\Middleware;
 
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use FriendsOfTYPO3\Headless\Utility\HeadlessModeInterface;
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -24,7 +24,7 @@ class SiteBaseRedirectResolver extends \TYPO3\CMS\Frontend\Middleware\SiteBaseRe
 {
     public function __construct(
         private readonly HeadlessModeInterface $headlessMode,
-        private readonly UrlUtility $urlUtility,
+        private readonly HeadlessFrontendUrlInterface $urlUtility,
     ) {}
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

Classes/Utility/PluginUtility.php

@@ -17,7 +17,7 @@
 
 class PluginUtility
 {
-    public function __construct(private readonly UrlUtility $urlUtility) {}
+    public function __construct(private readonly HeadlessFrontendUrlInterface $urlUtility) {}
 
     public function redirect(ServerRequestInterface $request, string $uri, int $statusCode = 307): never
     {

Classes/Utility/UrlUtility.php

@@ -26,6 +26,7 @@
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
+
 use function array_key_exists;
 use function array_merge;
 use function array_unique;
@@ -40,29 +41,16 @@ class UrlUtility implements LoggerAwareInterface, HeadlessFrontendUrlInterface
 {
     use LoggerAwareTrait;
 
-    private Features $features;
-    private Resolver $resolver;
-    private SiteFinder $siteFinder;
     private array $conf = [];
     private array $variants = [];
-    private HeadlessModeInterface $headlessMode;
     private array $frontendDomains = [];
 
     public function __construct(
-        ?Features $features = null,
-        ?Resolver $resolver = null,
-        ?SiteFinder $siteFinder = null,
-        ?ServerRequestInterface $serverRequest = null,
-        ?HeadlessModeInterface $headlessMode = null
+        private readonly Features $features,
+        private readonly Resolver $resolver,
+        private readonly SiteFinder $siteFinder,
+        private HeadlessModeInterface $headlessMode,
     ) {
-        $this->features = $features ?? GeneralUtility::makeInstance(Features::class);
-        $this->resolver = $resolver ?? GeneralUtility::makeInstance(Resolver::class, 'site', []);
-        $this->siteFinder = $siteFinder ?? GeneralUtility::makeInstance(SiteFinder::class);
-        $this->headlessMode = $headlessMode ?? GeneralUtility::makeInstance(HeadlessModeInterface::class);
-
-        if ($serverRequest instanceof ServerRequestInterface) {
-            $this->extractConfigurationFromRequest($serverRequest, $this);
-        }
     }
 
     public function withSite(Site $site): HeadlessFrontendUrlInterface

Classes/ViewHelpers/DomainViewHelper.php

@@ -11,12 +11,12 @@
 
 namespace FriendsOfTYPO3\Headless\ViewHelpers;
 
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 class DomainViewHelper extends AbstractViewHelper
 {
-    public function __construct(private readonly UrlUtility $urlUtility) {}
+    public function __construct(private readonly HeadlessFrontendUrlInterface $urlUtility) {}
 
     public function initializeArguments(): void
     {

Classes/XClass/ImageService.php

@@ -11,8 +11,8 @@
 
 namespace FriendsOfTYPO3\Headless\XClass;
 
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use FriendsOfTYPO3\Headless\Utility\HeadlessModeInterface;
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Http\ApplicationType;
 use TYPO3\CMS\Core\Resource\FileInterface;
@@ -27,7 +27,7 @@
 readonly class ImageService extends \TYPO3\CMS\Extbase\Service\ImageService
 {
     private HeadlessModeInterface $headlessMode;
-    private UrlUtility $urlUtility;
+    private HeadlessFrontendUrlInterface $urlUtility;
 
     /**
      * Eager init via container in constructor. This XClass is registered through
@@ -43,7 +43,7 @@ public function __construct(ResourceFactory $resourceFactory)
     {
         parent::__construct($resourceFactory);
         $this->headlessMode = GeneralUtility::makeInstance(HeadlessModeInterface::class);
-        $this->urlUtility = GeneralUtility::makeInstance(UrlUtility::class);
+        $this->urlUtility = GeneralUtility::makeInstance(HeadlessFrontendUrlInterface::class);
     }
 
     /**

Classes/XClass/Preview/PreviewUriBuilder.php

@@ -11,8 +11,8 @@
 
 namespace FriendsOfTYPO3\Headless\XClass\Preview;
 
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use FriendsOfTYPO3\Headless\Utility\HeadlessModeInterface;
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use InvalidArgumentException;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Routing\InvalidRouteArgumentsException;
@@ -34,7 +34,7 @@ class PreviewUriBuilder extends \TYPO3\CMS\Workspaces\Preview\PreviewUriBuilder
      */
     private ?HeadlessModeInterface $headlessMode = null;
     private ?SiteFinder $siteFinder = null;
-    private ?UrlUtility $urlUtility = null;
+    private ?HeadlessFrontendUrlInterface $urlUtility = null;
 
     private function getHeadlessMode(): HeadlessModeInterface
     {
@@ -46,9 +46,9 @@ private function getSiteFinder(): SiteFinder
         return $this->siteFinder ??= GeneralUtility::makeInstance(SiteFinder::class);
     }
 
-    private function getUrlUtility(): UrlUtility
+    private function getUrlUtility(): HeadlessFrontendUrlInterface
     {
-        return $this->urlUtility ??= GeneralUtility::makeInstance(UrlUtility::class);
+        return $this->urlUtility ??= GeneralUtility::makeInstance(HeadlessFrontendUrlInterface::class);
     }
 
     /**

Classes/XClass/ResourceLocalDriver.php

@@ -11,8 +11,8 @@
 
 namespace FriendsOfTYPO3\Headless\XClass;
 
+use FriendsOfTYPO3\Headless\Utility\HeadlessFrontendUrlInterface;
 use FriendsOfTYPO3\Headless\Utility\HeadlessModeInterface;
-use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Http\ApplicationType;
 use TYPO3\CMS\Core\Http\Uri;
@@ -33,16 +33,16 @@ class ResourceLocalDriver extends LocalDriver
      * is honored for SYS][Objects] XClasses. We resolve via container manually on first use.
      */
     private ?HeadlessModeInterface $headlessMode = null;
-    private ?UrlUtility $urlUtility = null;
+    private ?HeadlessFrontendUrlInterface $urlUtility = null;
 
     private function getHeadlessMode(): HeadlessModeInterface
     {
         return $this->headlessMode ??= GeneralUtility::makeInstance(HeadlessModeInterface::class);
     }
 
-    private function getUrlUtility(): UrlUtility
+    private function getUrlUtility(): HeadlessFrontendUrlInterface
     {
-        return $this->urlUtility ??= GeneralUtility::makeInstance(UrlUtility::class);
+        return $this->urlUtility ??= GeneralUtility::makeInstance(HeadlessFrontendUrlInterface::class);
     }
 
     protected function determineBaseUrl(): void

Configuration/Services.php

@@ -36,10 +36,13 @@
 use FriendsOfTYPO3\Headless\XClass\TemplateView;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use TYPO3\CMS\Core\Configuration\Features;
+use TYPO3\CMS\Core\ExpressionLanguage\Resolver;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Form\Controller\FormFrontendController;
 use TYPO3\CMS\FrontendLogin\Controller\LoginController;
 
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
 return static function (ContainerConfigurator $configurator): void {
     $services = $configurator->services()
         ->defaults()
@@ -80,8 +83,15 @@
     $services->set(DomainSchema::class)->public();
     $services->set(BackendEditorUrl::class)->public();
     $services->set(FileUtility::class)->public();
-    $services->set(UrlUtility::class)->autowire(false)->share(false);
-    $services->set(HeadlessFrontendUrlInterface::class, UrlUtility::class)->autowire(false)->share(false);
+    $services->set('headless.expression_language.resolver.site', Resolver::class)
+        ->args(['site', []]);
+
+    $services->set(UrlUtility::class)
+        ->share(false)
+        ->arg('$resolver', service('headless.expression_language.resolver.site'));
+    $services->set(HeadlessFrontendUrlInterface::class, UrlUtility::class)
+        ->share(false)
+        ->arg('$resolver', service('headless.expression_language.resolver.site'));
     $services->set(AfterLinkIsGeneratedListener::class)->tag(
         'event.listener',
         ['identifier' => 'headless/AfterLinkIsGenerated']

Tests/Unit/DataProcessing/RootSiteProcessing/DomainSchemaTest.php

@@ -17,6 +17,7 @@
 use FriendsOfTYPO3\Headless\Utility\HeadlessMode;
 use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use Psr\Http\Message\UriInterface;
+use TYPO3\CMS\Core\Configuration\Features;
 use TYPO3\CMS\Core\ExpressionLanguage\Resolver;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Http\Uri;
@@ -128,7 +129,7 @@ protected function getUrlUtility($site = null): UrlUtility
         $dummyRequest = (new ServerRequest())->withAttribute('site', $site);
         $dummyRequest = $dummyRequest->withAttribute('headless', new Headless());
 
-        return new UrlUtility(null, $resolver, $mock, $dummyRequest, (new HeadlessMode())->withRequest($dummyRequest));
+        return (new UrlUtility(new Features(), $resolver, $mock, (new HeadlessMode())->withRequest($dummyRequest)))->withRequest($dummyRequest);
     }
 
     protected function getSiteWithBase(UriInterface $uri, $withLanguage = null)

Tests/Unit/Event/Listener/AfterLinkIsGeneratedListenerTest.php

@@ -16,6 +16,7 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use ReflectionProperty;
 use Symfony\Component\DependencyInjection\Container;
+use TYPO3\CMS\Core\Configuration\Features;
 use TYPO3\CMS\Core\ExpressionLanguage\Resolver;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\LinkHandling\LinkService;
@@ -54,7 +55,7 @@ public function test__construct()
 
         $listener = new AfterLinkIsGeneratedListener(
             $this->createMock(Logger::class),
-            new UrlUtility(null, $resolver, $siteFinder),
+            new UrlUtility(new Features(), $resolver, $siteFinder, new HeadlessMode()),
             $this->createMock(LinkService::class),
             new TypoLinkCodecService($this->createMock(EventDispatcherInterface::class)),
             $siteFinder
@@ -71,7 +72,7 @@ public function test__invokeNotModifingAnything()
 
         $listener = new AfterLinkIsGeneratedListener(
             $this->createMock(Logger::class),
-            new UrlUtility(null, $resolver, $siteFinder),
+            new UrlUtility(new Features(), $resolver, $siteFinder, new HeadlessMode()),
             $this->createMock(LinkService::class),
             new TypoLinkCodecService($this->createMock(EventDispatcherInterface::class)),
             $siteFinder

Tests/Unit/Event/Listener/AfterPagePreviewUriGeneratedListenerTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\DependencyInjection\Container;
 use TYPO3\CMS\Backend\Routing\Event\AfterPagePreviewUriGeneratedEvent;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Configuration\Features;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\ExpressionLanguage\Resolver;
@@ -51,9 +52,10 @@ public function test__construct()
         $siteFinder = $this->createMock(SiteFinder::class);
 
         $listener = new AfterPagePreviewUriGeneratedListener(new UrlUtility(
-            null,
+            new Features(),
             $resolver,
-            $siteFinder
+            $siteFinder,
+            new HeadlessMode()
         ), $siteFinder, new HeadlessMode());
 
         self::assertInstanceOf(AfterPagePreviewUriGeneratedListener::class, $listener);
@@ -67,9 +69,10 @@ public function testLink()
         $siteFinder->method('getSiteByPageId')->willReturn($site = new Site('test', 1, ['headless' => HeadlessModeInterface::MIXED, 'frontendBase' => 'https://front.test.tld', 'base' => 'https://test.tld']));
 
         $listener = new AfterPagePreviewUriGeneratedListener(new UrlUtility(
-            null,
+            new Features(),
             $resolver,
-            $siteFinder
+            $siteFinder,
+            new HeadlessMode()
         ), $siteFinder, new HeadlessMode());
 
         $event = new AfterPagePreviewUriGeneratedEvent(
@@ -101,9 +104,10 @@ public function testSiteNotFound()
         $siteFinder->method('getSiteByPageId')->willThrowException(new SiteNotFoundException());
 
         $listener = new AfterPagePreviewUriGeneratedListener(new UrlUtility(
-            null,
+            new Features(),
             $resolver,
-            $siteFinder
+            $siteFinder,
+            new HeadlessMode()
         ), $siteFinder, new HeadlessMode());
 
         $event = new AfterPagePreviewUriGeneratedEvent(

Tests/Unit/Event/Listener/RedirectUrlAdditionalParamsListenerTest.php

@@ -21,6 +21,7 @@
 use Psr\Http\Message\UriInterface;
 use ReflectionProperty;
 use Symfony\Component\DependencyInjection\Container;
+use TYPO3\CMS\Core\Configuration\Features;
 use TYPO3\CMS\Core\ExpressionLanguage\Resolver;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Http\Uri;
@@ -245,7 +246,7 @@ protected function getUrlUtility($site = null): UrlUtility
 
         $siteFinder->method('getSiteByPageId')->willReturn($site);
 
-        return new UrlUtility(null, $resolver, $siteFinder, null, (new HeadlessMode())->withRequest((new ServerRequest())->withAttribute('headless', new Headless())));
+        return new UrlUtility(new Features(), $resolver, $siteFinder, (new HeadlessMode())->withRequest((new ServerRequest())->withAttribute('headless', new Headless())));
     }
 
     protected function tearDown(): void