Refactor link generation. Replace getTypoLink_URL with linkFactory.

Author: kszymukowicz

Classes/Serializer/Handler/FileReferenceHandler.php

@@ -111,7 +111,14 @@ public function serialize(
                 $fileRenderer->render($originalFile, 1, 1),
                 $match
             )) {
-                $out['urlEmbed'] = UrlService::forceAbsoluteUrl($match[1], $context->getAttribute('TYPO3_SITE_URL'));
+                if ($match[1] === '') {
+                    $out['urlEmbed'] = '';
+                } else {
+                    $out['urlEmbed'] = UrlService::forceAbsoluteUrl(
+                        $match[1],
+                        $context->getAttribute('TYPO3_SITE_URL')
+                    );
+                }
             }
         }
 

Classes/Serializer/Handler/RecordUriHandler.php

@@ -8,9 +8,11 @@
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\Visitor\SerializationVisitorInterface;
 use SourceBroker\T3api\Service\UrlService;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\LinkHandling\LinkService;
 use TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3\CMS\Frontend\Typolink\LinkFactory;
+use TYPO3\CMS\Frontend\Typolink\UnableToLinkException;
 
 /**
  * Class RecordUriHandler
@@ -24,6 +26,12 @@ class RecordUriHandler extends AbstractHandler implements SerializeHandlerInterf
      */
     protected static $supportedTypes = [self::TYPE];
 
+    public function __construct(
+        public readonly LinkFactory $linkFactory,
+        public readonly LinkService $linkService,
+        public readonly ContentObjectRenderer $contentObjectRenderer
+    ) {}
+
     /**
      * @param SerializationVisitorInterface $visitor
      * @param $value
@@ -48,27 +56,25 @@ public function serialize(
             );
         }
 
-        return UrlService::forceAbsoluteUrl(
-            $this->getContentObjectRenderer()->getTypoLink_URL(sprintf(
-                't3://record?identifier=%s&uid=%s',
-                $type['params'][0],
-                $entity->getUid()
-            )),
-            $context->getAttribute('TYPO3_SITE_URL')
-        );
-    }
-
-    /**
-     * @return ContentObjectRenderer
-     */
-    protected function getContentObjectRenderer(): ContentObjectRenderer
-    {
-        static $contentObjectRenderer;
+        try {
+            $url = $this->linkFactory->createUri(
+                sprintf('t3://record?identifier=%s&uid=%s', $type['params'][0], $entity->getUid()),
+                $this->contentObjectRenderer
+            )->getUrl();
+        } catch (UnableToLinkException $e) {
+            trigger_error(
+                $e->getMessage(),
+                E_USER_WARNING
+            );
+        }
 
-        if (!$contentObjectRenderer instanceof ContentObjectRenderer) {
-            $contentObjectRenderer = GeneralUtility::makeInstance(ContentObjectRenderer::class);
+        if (empty($url)) {
+            return '';
         }
 
-        return $contentObjectRenderer;
+        return UrlService::forceAbsoluteUrl(
+            $url,
+            $context->getAttribute('TYPO3_SITE_URL')
+        );
     }
 }

Classes/Serializer/Handler/TypolinkHandler.php

@@ -7,55 +7,48 @@
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\Visitor\SerializationVisitorInterface;
 use SourceBroker\T3api\Service\UrlService;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\LinkHandling\LinkService;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3\CMS\Frontend\Typolink\LinkFactory;
+use TYPO3\CMS\Frontend\Typolink\UnableToLinkException;
 
-/**
- * Class TypolinkHandler
- */
 class TypolinkHandler extends AbstractHandler implements SerializeHandlerInterface
 {
     public const TYPE = 'Typolink';
 
+    public function __construct(
+        public readonly LinkFactory $linkFactory,
+        public readonly LinkService $linkService,
+        public readonly ContentObjectRenderer $contentObjectRenderer
+    ) {}
+
     /**
      * @var string[]
      */
     protected static $supportedTypes = [self::TYPE];
 
-    /**
-     * @param SerializationVisitorInterface $visitor
-     * @param string|int|array $typolinkParameter
-     * @param array $type
-     * @param SerializationContext $context
-     *
-     * @return array|string
-     */
     public function serialize(
         SerializationVisitorInterface $visitor,
-        $typolinkParameter,
+        mixed $typolinkParameter,
         array $type,
         SerializationContext $context
-    ) {
-        if (empty($typolinkParameter)) {
-            return '';
+    ): string {
+        try {
+            $url = $this->linkFactory->createUri(
+                $typolinkParameter,
+                $this->contentObjectRenderer
+            )->getUrl();
+        } catch (UnableToLinkException $e) {
+            trigger_error(
+                $e->getMessage(),
+                E_USER_WARNING
+            );
         }
-        return UrlService::forceAbsoluteUrl(
-            $this->getContentObjectRenderer()->getTypoLink_URL(...(array)$typolinkParameter),
-            $context->getAttribute('TYPO3_SITE_URL')
-        );
-    }
 
-    /**
-     * @return ContentObjectRenderer
-     */
-    protected function getContentObjectRenderer(): ContentObjectRenderer
-    {
-        static $contentObjectRenderer;
-
-        if (!$contentObjectRenderer instanceof ContentObjectRenderer) {
-            $contentObjectRenderer = GeneralUtility::makeInstance(ContentObjectRenderer::class);
+        if (empty($url)) {
+            return '';
         }
 
-        return $contentObjectRenderer;
+        return UrlService::forceAbsoluteUrl($url, $context->getAttribute('TYPO3_SITE_URL'));
     }
 }

Classes/Service/UrlService.php

@@ -8,7 +8,7 @@ class UrlService
 {
     public static function forceAbsoluteUrl(string $url, string $host): string
     {
-        if (strpos($url, '//') !== 0 && parse_url($url, PHP_URL_SCHEME) === null) {
+        if (!str_starts_with($url, '//') && parse_url($url, PHP_URL_SCHEME) === null) {
             return rtrim($host, '/') . '/' . ltrim($url, '/');
         }
 

Configuration/Services.yaml

@@ -82,9 +82,17 @@ services:
     public: true
 
   SourceBroker\T3api\Serializer\Handler\RecordUriHandler:
+    arguments:
+      $linkFactory: '@TYPO3\CMS\Frontend\Typolink\LinkFactory'
+      $linkService: '@TYPO3\CMS\Core\LinkHandling\LinkService'
+      $contentObjectRenderer: '@TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer'
     public: true
 
   SourceBroker\T3api\Serializer\Handler\TypolinkHandler:
+    arguments:
+      $linkFactory: '@TYPO3\CMS\Frontend\Typolink\LinkFactory'
+      $linkService: '@TYPO3\CMS\Core\LinkHandling\LinkService'
+      $contentObjectRenderer: '@TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer'
     public: true
 
   SourceBroker\T3api\Serializer\Handler\CurrentFeUserHandler: