diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/link_typolink_viewhelper.html b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/link_typolink_viewhelper.html
index 116546d7d0162f23e950a662653c8c6d93364343..142c2702d34be2bc4d6c82bf3b60424f8f89db18 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/link_typolink_viewhelper.html
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/link_typolink_viewhelper.html
@@ -1,5 +1,5 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:link.typolink parameter="{uid}" addQueryString="{addQueryString}" addQueryStringMethod="{addQueryStringMethod}"
+<f:link.typolink parameter="{parameter}" addQueryString="{addQueryString}" addQueryStringMethod="{addQueryStringMethod}"
addQueryStringExclude="{addQueryStringExclude}">This is a testlink</f:link.typolink>
-<f:link.typolink parameter="{uid}">This is a testlink</f:link.typolink>
\ No newline at end of file
+<f:link.typolink parameter="{parameter}">This is a testlink</f:link.typolink>
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/uri_typolink_viewhelper.html b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/uri_typolink_viewhelper.html
index 7d4bdbda97b22e884a768f935db55e80674eb47f..f3ef1d930c934ce1c8fc373c076cffa0939aace0 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/uri_typolink_viewhelper.html
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/uri_typolink_viewhelper.html
@@ -1,5 +1,5 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:uri.typolink parameter="{uid}" addQueryString="{addQueryString}" addQueryStringMethod="{addQueryStringMethod}"
+<f:uri.typolink parameter="{parameter}" addQueryString="{addQueryString}" addQueryStringMethod="{addQueryStringMethod}"
addQueryStringExclude="{addQueryStringExclude}" />
-<f:uri.typolink parameter="{uid}" />
\ No newline at end of file
+<f:uri.typolink parameter="{parameter}" />
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TypolinkViewHelperTest.php
index a21956d270fc5e7d1e03937d4c52a8358e784e61..1243cb0e4784d705f70cc0d8e115180c998f9a35 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TypolinkViewHelperTest.php
@@ -72,6 +72,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
}
/**
+ * @param mixed $parameter
* @param bool $addQueryString
* @param string $addQueryStringMethod
* @param string $addQueryStringExclude
@@ -82,6 +83,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
* @dataProvider renderCreatesCorrectLinkProvider
*/
public function renderCreatesCorrectLink(
+ $parameter,
bool $addQueryString,
string $addQueryStringMethod,
string $addQueryStringExclude,
@@ -91,6 +93,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
$view = new StandaloneView();
$view->setTemplatePathAndFilename('typo3/sysext/fluid/Tests/Functional/ViewHelpers/Fixtures/' . $template . '.html');
$view->assignMultiple([
+ 'parameter' => $parameter,
'uid' => 1,
'addQueryString' => $addQueryString,
'addQueryStringMethod' => $addQueryStringMethod,
@@ -106,6 +109,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
{
return [
'link: default' => [
+ 'parameter' => 1,
'addQueryString' => false,
'addQueryStringMethod' => 'GET',
'addQueryStringExclude' => '',
@@ -113,6 +117,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
'template' => 'link_typolink_viewhelper',
],
'link: with add query string' => [
+ 'parameter' => 1,
'addQueryString' => true,
'addQueryStringMethod' => 'GET',
'addQueryStringExclude' => '',
@@ -120,6 +125,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
'template' => 'link_typolink_viewhelper',
],
'link: with add query string and exclude' => [
+ 'parameter' => 1,
'addQueryString' => true,
'addQueryStringMethod' => 'GET',
'addQueryStringExclude' => 'temp',
@@ -127,6 +133,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
'template' => 'link_typolink_viewhelper',
],
'uri: default' => [
+ 'parameter' => 1,
'addQueryString' => false,
'addQueryStringMethod' => 'GET',
'addQueryStringExclude' => '',
@@ -134,6 +141,7 @@ class TypolinkViewHelperTest extends FunctionalTestCase
'template' => 'uri_typolink_viewhelper',
],
'uri: with add query string' => [
+ 'parameter' => 1,
'addQueryString' => true,
'addQueryStringMethod' => 'GET',
'addQueryStringExclude' => '',
@@ -141,12 +149,157 @@ class TypolinkViewHelperTest extends FunctionalTestCase
'template' => 'uri_typolink_viewhelper',
],
'uri: with add query string and exclude' => [
+ 'parameter' => 1,
'addQueryString' => true,
'addQueryStringMethod' => 'GET',
'addQueryStringExclude' => 'temp',
'expected' => '/en/?foo=bar&cHash=afa4b37588ab917af3cfe2cd4464029d /en/',
'template' => 'uri_typolink_viewhelper',
],
+ 't3://url link: default' => [
+ 'parameter' => 't3://url?url=https://example.org?param=1&other=dude',
+ 'addQueryString' => false,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => '<a href="https://example.org?param=1">This is a testlink</a> <a href="https://example.org?param=1">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 't3://url link: with add query string' => [
+ 'parameter' => 't3://url?url=https://example.org?param=1&other=dude',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => '<a href="https://example.org?param=1">This is a testlink</a> <a href="https://example.org?param=1">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 't3://url link: with add query string and exclude' => [
+ 'parameter' => 't3://url?url=https://example.org?param=1&other=dude',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => 'temp',
+ 'expected' => '<a href="https://example.org?param=1">This is a testlink</a> <a href="https://example.org?param=1">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 't3://url uri: default' => [
+ 'parameter' => 't3://url?url=https://example.org?param=1&other=dude',
+ 'addQueryString' => false,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => 'https://example.org?param=1 https://example.org?param=1',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 't3://url uri: with add query string' => [
+ 'parameter' => 't3://url?url=https://example.org?param=1&other=dude',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => 'https://example.org?param=1 https://example.org?param=1',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 't3://url uri: with add query string and exclude' => [
+ 'parameter' => 't3://url?url=https://example.org?param=1&other=dude',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => 'temp',
+ 'expected' => 'https://example.org?param=1 https://example.org?param=1',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 'mailto: link: default' => [
+ 'parameter' => 'mailto:foo@typo3.org',
+ 'addQueryString' => false,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => '<a href="mailto:foo@typo3.org">This is a testlink</a> <a href="mailto:foo@typo3.org">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 'mailto: link: with add query string' => [
+ 'parameter' => 'mailto:foo@typo3.org',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => '<a href="mailto:foo@typo3.org">This is a testlink</a> <a href="mailto:foo@typo3.org">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 'mailto: link: with add query string and exclude' => [
+ 'parameter' => 'mailto:foo@typo3.org',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => 'temp',
+ 'expected' => '<a href="mailto:foo@typo3.org">This is a testlink</a> <a href="mailto:foo@typo3.org">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 'mailto: uri: default' => [
+ 'parameter' => 'mailto:foo@typo3.org',
+ 'addQueryString' => false,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => 'mailto:foo@typo3.org mailto:foo@typo3.org',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 'mailto: uri: with add query string' => [
+ 'parameter' => 'mailto:foo@typo3.org',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => 'mailto:foo@typo3.org mailto:foo@typo3.org',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 'mailto: uri: with add query string and exclude' => [
+ 'parameter' => 'mailto:foo@typo3.org',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => 'temp',
+ 'expected' => 'mailto:foo@typo3.org mailto:foo@typo3.org',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 'http://: link: default' => [
+ 'parameter' => 'http://typo3.org/foo/?foo=bar',
+ 'addQueryString' => false,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => '<a href="http://typo3.org/foo/?foo=bar">This is a testlink</a> <a href="http://typo3.org/foo/?foo=bar">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 'http://: link: with add query string' => [
+ 'parameter' => 'http://typo3.org/foo/?foo=bar',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => '<a href="http://typo3.org/foo/?foo=bar">This is a testlink</a> <a href="http://typo3.org/foo/?foo=bar">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 'http://: link: with add query string and exclude' => [
+ 'parameter' => 'http://typo3.org/foo/?foo=bar',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => 'temp',
+ 'expected' => '<a href="http://typo3.org/foo/?foo=bar">This is a testlink</a> <a href="http://typo3.org/foo/?foo=bar">This is a testlink</a>',
+ 'template' => 'link_typolink_viewhelper',
+ ],
+ 'http://: uri: default' => [
+ 'parameter' => 'http://typo3.org/foo/?foo=bar',
+ 'addQueryString' => false,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => 'http://typo3.org/foo/?foo=bar http://typo3.org/foo/?foo=bar',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 'http://: uri: with add query string' => [
+ 'parameter' => 'http://typo3.org/foo/?foo=bar',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => '',
+ 'expected' => 'http://typo3.org/foo/?foo=bar http://typo3.org/foo/?foo=bar',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
+ 'http://: uri: with add query string and exclude' => [
+ 'parameter' => 'http://typo3.org/foo/?foo=bar',
+ 'addQueryString' => true,
+ 'addQueryStringMethod' => 'GET',
+ 'addQueryStringExclude' => 'temp',
+ 'expected' => 'http://typo3.org/foo/?foo=bar http://typo3.org/foo/?foo=bar',
+ 'template' => 'uri_typolink_viewhelper',
+ ],
];
}
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
index 15ea22817402b4dfd11af3ede062417e106da69b..64e450f311c22a138f3a12154cf07f16aabde75e 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
@@ -193,6 +193,62 @@ class TypolinkViewHelperTest extends ViewHelperBaseTestcase
'&a=b',
'42 - - - &a=b',
],
+ 't3:// with extended class' => [
+ 't3://url?url=https://example.org?param=1&other=dude - css-class',
+ '',
+ 'fluid_class',
+ '',
+ '',
+ 't3://url?url=https://example.org?param=1&other=dude - "css-class fluid_class"',
+ ],
+ 't3:// classes are unique' => [
+ 't3://url?url=https://example.org?param=1&other=dude - css-class',
+ '',
+ 'css-class',
+ '',
+ '',
+ 't3://url?url=https://example.org?param=1&other=dude - css-class',
+ ],
+ 't3:// with overridden title' => [
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title"',
+ '',
+ '',
+ 'another link title',
+ '',
+ 't3://url?url=https://example.org?param=1&other=dude - - "another link title"',
+ ],
+ 't3:// with title and extended parameters' => [
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title" &x=y',
+ '',
+ '',
+ '',
+ '&a=b',
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title" &x=y&a=b',
+ ],
+ 't3:// with complex title and extended parameters' => [
+ 't3://url?url=https://example.org?param=1&other=dude - - "a \\"link\\" title with \\\\" &x=y',
+ '',
+ '',
+ '',
+ '&a=b',
+ 't3://url?url=https://example.org?param=1&other=dude - - "a \\"link\\" title with \\\\" &x=y&a=b',
+ ],
+ 't3:// parameter usage' => [
+ 't3://url?url=https://example.org?param=1&other=dude _blank css-class "testtitle with whitespace" &X=y',
+ '-',
+ 'fluid_class',
+ 'a new title',
+ '&a=b',
+ 't3://url?url=https://example.org?param=1&other=dude - "css-class fluid_class" "a new title" &X=y&a=b',
+ ],
+ 'only t3:// and overwrite' => [
+ 't3://url?url=https://example.org?param=1&other=dude',
+ '',
+ '',
+ '',
+ '&a=b',
+ 't3://url?url=https://example.org?param=1&other=dude - - - &a=b',
+ ],
];
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
index 28a211e257ffad1653d70cde07939a2928b6249c..e0704cc2340f1b2cd709cf52ca1c764bf73686c2 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
@@ -68,6 +68,31 @@ class TypolinkViewHelperTest extends ViewHelperBaseTestcase
'&a=b',
'42 - - - &a=b',
],
+ 't3:// with class' => [
+ 't3://url?url=https://example.org?param=1&other=dude - css-class',
+ '',
+ 't3://url?url=https://example.org?param=1&other=dude - css-class',
+ ],
+ 't3:// with title' => [
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title"',
+ '',
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title"',
+ ],
+ 't3:// with title and parameters' => [
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title" &x=y',
+ '',
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title" &x=y',
+ ],
+ 't3:// with title and extended parameters' => [
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title" &x=y',
+ '&a=b',
+ 't3://url?url=https://example.org?param=1&other=dude - - "a link title" &x=y&a=b',
+ ],
+ 't3:// and overwrite' => [
+ 't3://url?url=https://example.org?param=1&other=dude',
+ '&a=b',
+ 't3://url?url=https://example.org?param=1&other=dude - - - &a=b',
+ ],
];
}