From f53eefba460c6167bef11e74e4d75696a8f4768f Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Mon, 9 Sep 2024 21:55:32 +0200
Subject: [PATCH] [TASK] Move TypolinkParameter to EXT:core
Move TypolinkParameter to EXT:core and
therefore remove a dependency from EXT:core
to EXT:frontend.
Resolves: #104869
Related: #104615
Releases: main
Change-Id: I7474d31a722a4e27438461b8812e25299f0a72cb
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/85937
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Jochen Roth <rothjochen@gmail.com>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Nikita Hovratov <nikita.h@live.de>
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
Tested-by: Jochen Roth <rothjochen@gmail.com>
---
.../sysext/core/Classes/DataHandling/RecordFieldTransformer.php | 2 +-
.../Classes/LinkHandling}/TypolinkParameter.php | 2 +-
.../fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php | 2 +-
.../sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php | 2 +-
.../Functional/ViewHelpers/Link/TypolinkViewHelperTest.php | 2 +-
.../Tests/Functional/ViewHelpers/Uri/TypolinkViewHelperTest.php | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
rename typo3/sysext/{frontend/Classes/Typolink => core/Classes/LinkHandling}/TypolinkParameter.php (98%)
diff --git a/typo3/sysext/core/Classes/DataHandling/RecordFieldTransformer.php b/typo3/sysext/core/Classes/DataHandling/RecordFieldTransformer.php
index a3d4e05cce84..09cfc3afc793 100644
--- a/typo3/sysext/core/Classes/DataHandling/RecordFieldTransformer.php
+++ b/typo3/sysext/core/Classes/DataHandling/RecordFieldTransformer.php
@@ -28,6 +28,7 @@ use TYPO3\CMS\Core\Domain\RecordInterface;
use TYPO3\CMS\Core\Domain\RecordPropertyClosure;
use TYPO3\CMS\Core\LinkHandling\LinkService;
use TYPO3\CMS\Core\LinkHandling\TypoLinkCodecService;
+use TYPO3\CMS\Core\LinkHandling\TypolinkParameter;
use TYPO3\CMS\Core\Resource\Collection\LazyFileReferenceCollection;
use TYPO3\CMS\Core\Resource\Collection\LazyFolderCollection;
use TYPO3\CMS\Core\Resource\FileReference;
@@ -45,7 +46,6 @@ use TYPO3\CMS\Core\Service\FlexFormService;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Frontend\Typolink\TypolinkParameter;
/**
* This generic mapper takes a field value of a record, and maps the value
diff --git a/typo3/sysext/frontend/Classes/Typolink/TypolinkParameter.php b/typo3/sysext/core/Classes/LinkHandling/TypolinkParameter.php
similarity index 98%
rename from typo3/sysext/frontend/Classes/Typolink/TypolinkParameter.php
rename to typo3/sysext/core/Classes/LinkHandling/TypolinkParameter.php
index 4790297968fc..eb0ff3989932 100644
--- a/typo3/sysext/frontend/Classes/Typolink/TypolinkParameter.php
+++ b/typo3/sysext/core/Classes/LinkHandling/TypolinkParameter.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
* The TYPO3 project - inspiring people to share!
*/
-namespace TYPO3\CMS\Frontend\Typolink;
+namespace TYPO3\CMS\Core\LinkHandling;
/**
* This class represents an object containing the resolved parameters of a typolink
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
index 8be7a0799fef..c97f86d8c546 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
@@ -19,9 +19,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\LinkHandling\TypoLinkCodecService;
+use TYPO3\CMS\Core\LinkHandling\TypolinkParameter;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
-use TYPO3\CMS\Frontend\Typolink\TypolinkParameter;
use TYPO3Fluid\Fluid\Core\Variables\ScopedVariableProvider;
use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
index d5fbe95430f1..59ce1ef06376 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
@@ -19,9 +19,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\LinkHandling\TypoLinkCodecService;
+use TYPO3\CMS\Core\LinkHandling\TypolinkParameter;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
-use TYPO3\CMS\Frontend\Typolink\TypolinkParameter;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php
index a1324de248f1..052f35432898 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php
@@ -22,11 +22,11 @@ use PHPUnit\Framework\Attributes\Test;
use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Http\ServerRequest;
+use TYPO3\CMS\Core\LinkHandling\TypolinkParameter;
use TYPO3\CMS\Core\Routing\PageArguments;
use TYPO3\CMS\Core\Site\Entity\Site;
use TYPO3\CMS\Core\Tests\Functional\SiteHandling\SiteBasedTestTrait;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
-use TYPO3\CMS\Frontend\Typolink\TypolinkParameter;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
use TYPO3Fluid\Fluid\View\TemplateView;
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/TypolinkViewHelperTest.php
index 620edd15157d..75d923b51c4d 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/TypolinkViewHelperTest.php
@@ -22,11 +22,11 @@ use PHPUnit\Framework\Attributes\Test;
use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Http\ServerRequest;
+use TYPO3\CMS\Core\LinkHandling\TypolinkParameter;
use TYPO3\CMS\Core\Routing\PageArguments;
use TYPO3\CMS\Core\Site\Entity\Site;
use TYPO3\CMS\Core\Tests\Functional\SiteHandling\SiteBasedTestTrait;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
-use TYPO3\CMS\Frontend\Typolink\TypolinkParameter;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
use TYPO3Fluid\Fluid\View\TemplateView;
--
GitLab