[TASK] Compatibility with v11

Author: georgringer

Classes/Hooks/DataHandlerHook.php

@@ -6,7 +6,6 @@
 use GeorgRinger\Uri2Link\Service\UrlParser;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\StringUtility;
 
 class DataHandlerHook
 {
@@ -54,8 +53,8 @@ protected function fieldShouldBeProcessed(string $tableName, string $fieldName,
             return false;
         }
 
-        if ($GLOBALS['TCA'][$tableName]['columns'][$fieldName]['config']['renderType'] === 'inputLink'
-            && (StringUtility::beginsWith($fieldValue, 'http') || StringUtility::beginsWith($fieldValue, '/'))
+        if (($GLOBALS['TCA'][$tableName]['columns'][$fieldName]['config']['renderType'] ?? '') === 'inputLink'
+            && (str_starts_with($fieldValue, 'http') || str_starts_with($fieldValue, '/'))
         ) {
             return true;
         }

Classes/Service/UrlParser.php

@@ -4,44 +4,33 @@
 namespace GeorgRinger\Uri2Link\Service;
 
 use TYPO3\CMS\Core\Context\Context;
+use TYPO3\CMS\Core\Domain\Repository\PageRepository;
 use TYPO3\CMS\Core\Error\Http\ServiceUnavailableException;
-use TYPO3\CMS\Core\Http\ImmediateResponseException;
 use TYPO3\CMS\Core\Http\ServerRequest;
+use TYPO3\CMS\Core\Http\ServerRequestFactory;
 use TYPO3\CMS\Core\LinkHandling\PageLinkHandler;
 use TYPO3\CMS\Core\Routing\PageArguments;
-use TYPO3\CMS\Core\Routing\RouteNotFoundException;
 use TYPO3\CMS\Core\Routing\SiteMatcher;
 use TYPO3\CMS\Core\Routing\SiteRouteResult;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Site\Entity\Site;
-use TYPO3\CMS\Core\Site\Entity\SiteInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 use TYPO3\CMS\Frontend\Service\TypoLinkCodecService;
 use TYPO3\CMS\Frontend\Typolink\PageLinkBuilder;
-use TYPO3\CMS\Frontend\Typolink\UnableToLinkException;
 
 class UrlParser implements SingletonInterface
 {
-    /** @var PageLinkHandler */
-    protected $pageLinkHandler;
-
-    /** @var TypoLinkCodecService */
-    protected $typoLinkCodecService;
+    protected PageLinkHandler $pageLinkHandler;
+    protected TypoLinkCodecService $typoLinkCodecService;
 
     public function __construct()
     {
         $this->pageLinkHandler = GeneralUtility::makeInstance(PageLinkHandler::class);
         $this->typoLinkCodecService = GeneralUtility::makeInstance(TypoLinkCodecService::class);
     }
 
-    /**
-     * @param string $uri
-     * @return string
-     * @throws UnableToLinkException
-     * @throws RouteNotFoundException
-     */
     public function parse(string $uri): string
     {
         $uriParts = $this->typoLinkCodecService->decode($uri);
@@ -59,11 +48,8 @@ public function parse(string $uri): string
         $parameters = $this->buildLinkParameters($routeResult, $pageArguments);
 
         if ($this->validateUrl($uri, $parameters, $site)) {
-            $uriParts['url'] = $this->pageLinkHandler->asString($parameters);;
+            $uriParts['url'] = $this->pageLinkHandler->asString($parameters);
             return $this->typoLinkCodecService->encode($uriParts);
-        } else {
-//                print_r($parameters);
-//                die;
         }
 
         return $uri;
@@ -90,26 +76,16 @@ protected function buildLinkParameters(SiteRouteResult $routeResult, PageArgumen
         return $parameters;
     }
 
-    /**
-     * @param string $uri
-     * @param array $parameters
-     * @param Site $site
-     * @return bool
-     * @throws UnableToLinkException
-     */
     protected function validateUrl(string $uri, array $parameters, Site $site): bool
     {
-
         $queryParams = [];
 
         $controller = $this->bootFrontendController($site, $queryParams);
         $pageLinkBuilder = GeneralUtility::makeInstance(PageLinkBuilder::class, $controller->cObj, $controller);
         $newUrlResult = $pageLinkBuilder->build($parameters, 'fake', '', []);
-        if ($newUrlResult[0] === $uri) {
-            return true;
-        }
+        $newUrlResultAbsolute = $pageLinkBuilder->build($parameters, 'fake', '', ['forceAbsoluteUrl' => true]);
 
-        return false;
+        return $newUrlResult->getUrl() === $uri || $newUrlResultAbsolute->getUrl() === $uri;
     }
 
     /**
@@ -129,24 +105,28 @@ protected function validateUrl(string $uri, array $parameters, Site $site): bool
      * @param array $queryParams
      * @return TypoScriptFrontendController
      * @throws ServiceUnavailableException
-     * @throws ImmediateResponseException
      */
     protected function bootFrontendController(Site $site, array $queryParams): TypoScriptFrontendController
     {
-        $pageId = $site ? $site->getRootPageId() : 0;
+        $originalRequest = $GLOBALS['TYPO3_REQUEST'] ?? ServerRequestFactory::fromGlobals();
         $controller = GeneralUtility::makeInstance(
             TypoScriptFrontendController::class,
             GeneralUtility::makeInstance(Context::class),
             $site,
             $site->getDefaultLanguage(),
-            new PageArguments((int)$pageId, '0', [])
+            new PageArguments($site->getRootPageId(), '0', []),
+           GeneralUtility::makeInstance(FrontendUserAuthentication::class)
         );
-        $controller->fe_user = GeneralUtility::makeInstance(FrontendUserAuthentication::class);;
-        $controller->fetch_the_id();
+        $controller->determineId($originalRequest);
         $controller->calculateLinkVars($queryParams);
         $controller->getConfigArray();
-        $controller->settingLanguage();
-        $controller->newCObj();
+        $controller->newCObj($originalRequest);
+        if (!isset($GLOBALS['TSFE']) || !$GLOBALS['TSFE'] instanceof TypoScriptFrontendController) {
+            $GLOBALS['TSFE'] = $controller;
+        }
+        if (!$GLOBALS['TSFE']->sys_page instanceof PageRepository) {
+            $GLOBALS['TSFE']->sys_page = GeneralUtility::makeInstance(PageRepository::class);
+        }
         return $controller;
     }
 }

Resources/Public/Icons/Extensions.svg Resources/Public/Icons/Extension.svgResources/Public/Icons/Extensions.svg renamed to Resources/Public/Icons/Extension.svg

@@ -21,8 +21,8 @@
 		"GPL-2.0-or-later"
 	],
 	"require": {
-		"typo3/cms-core": "^9.5.9|| ^10.0",
-		"typo3/cms-frontend": "^9.5.9|| ^10.0"
+		"typo3/cms-core": "^11.5.34 || ^12.4.10",
+		"typo3/cms-frontend": "^11.5.34 || ^12.4.10"
 	},
 	"autoload": {
 		"psr-4": {
@@ -34,9 +34,6 @@
 			"GeorgRinger\\Uri2Link\\Tests\\": "Tests"
 		}
 	},
-	"replace": {
-		"typo3-ter/uri2link": "self.version"
-	},
 	"extra": {
 		"typo3/cms": {
 			"extension-key": "uri2link"

composer.json

@@ -8,10 +8,10 @@
     'author_email' => '',
     'state' => 'beta',
     'clearCacheOnLoad' => true,
-    'version' => '0.1.0',
+    'version' => '0.2.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '9.5.0-10.2.99',
+            'typo3' => '11.5.33-12.4.99',
         ],
         'conflicts' => [],
         'suggests' => [],