From ee6f545a216c102af523d571f4b5d83af507503d Mon Sep 17 00:00:00 2001
From: Sebastian Michaelsen <sebastian@michaelsen.io>
Date: Tue, 9 Jun 2015 14:39:45 +0200
Subject: [PATCH] [FEATURE] Fluid Tag Builder: Allow empty attributes
When using the Fluid Tag Builder to create tags an attribute can only be
set as a key/value pair. It should be possible render attributes with
the "empty attributes syntax".
http://www.w3.org/TR/html-markup/syntax.html#syntax-attributes
Releases: master
Resolves: #67372
Change-Id: Iae76f2eb82af79ad36e6a1f1d2485fa2070090df
Reviewed-on: http://review.typo3.org/40139
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
...wEmptyAttributeSyntaxInFluidTagBuilder.rst | 27 +++++++++++++++++++
.../ViewHelper/AbstractTagBasedViewHelper.php | 2 +-
.../Classes/Core/ViewHelper/TagBuilder.php | 6 ++++-
.../AbstractTagBasedViewHelperTest.php | 14 ++++++++++
.../Unit/Core/ViewHelper/TagBuilderTest.php | 15 +++++++++++
5 files changed, 62 insertions(+), 2 deletions(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Feature-67372-AllowEmptyAttributeSyntaxInFluidTagBuilder.rst
mode change 100644 => 100755 typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
mode change 100644 => 100755 typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-67372-AllowEmptyAttributeSyntaxInFluidTagBuilder.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-67372-AllowEmptyAttributeSyntaxInFluidTagBuilder.rst
new file mode 100644
index 000000000000..9a903fe2fa6c
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-67372-AllowEmptyAttributeSyntaxInFluidTagBuilder.rst
@@ -0,0 +1,27 @@
+==================================================================
+Feature: #67372 - Allow empty attribute syntax in fluid TagBuilder
+==================================================================
+
+Description
+===========
+
+Tags built with the TagBuilder may have empty attributes as they are allowed in the `HTML specifications`_ and are broadly supported by web browsers.
+The way to create empty attributes is to use ``->addAttribute($key, $value)`` or ``->addAttributes($array)`` just like before and provide an empty string as attribute value.
+
+
+Impact
+======
+
+If someone used an empty string as attribute value before, it will now be rendered with the empty attribute syntax which is exactly the same (according to the HTML specification).
+
+
+Examples
+========
+
+Usage example:
+
+.. code-block:: php
+
+ $this->tag->addAttribute('disabled', ''); // results in a tag like: <input disabled />
+
+.. _HTML specifications: http://www.w3.org/TR/html-markup/syntax.html#syntax-attributes
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
old mode 100644
new mode 100755
index 5e80f6cae700..e55381f192ae
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
@@ -80,7 +80,7 @@ abstract class AbstractTagBasedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelp
if (isset(self::$tagAttributes[get_class($this)])) {
foreach (self::$tagAttributes[get_class($this)] as $attributeName) {
- if ($this->hasArgument($attributeName) && $this->arguments[$attributeName] !== '') {
+ if ($this->hasArgument($attributeName)) {
$this->tag->addAttribute($attributeName, $this->arguments[$attributeName]);
}
}
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
index 07f1e83855f2..dd7455af43f0 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
@@ -226,7 +226,11 @@ class TagBuilder {
}
$output = '<' . $this->tagName;
foreach ($this->attributes as $attributeName => $attributeValue) {
- $output .= ' ' . $attributeName . '="' . $attributeValue . '"';
+ if ($attributeValue === '' && $GLOBALS['TSFE']->config['config']['doctype'] === 'html5') {
+ $output .= ' ' . $attributeName;
+ } else {
+ $output .= ' ' . $attributeName . '="' . $attributeValue . '"';
+ }
}
if ($this->hasContent() || $this->forceClosingTag) {
$output .= '>' . $this->content . '</' . $this->tagName . '>';
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
old mode 100644
new mode 100755
index 4d0f03b2af61..561f9fdc4951
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
@@ -50,6 +50,20 @@ class AbstractTagBasedViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
$this->viewHelper->initialize();
}
+ /**
+ * @test
+ */
+ public function emptyTagAttributeCallsTagBuilder() {
+ $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute'), array(), '', FALSE);
+ $mockTagBuilder->expects($this->once())->method('addAttribute')->with('foo', '');
+ $this->viewHelper->_set('tag', $mockTagBuilder);
+
+ $this->viewHelper->_call('registerTagAttribute', 'foo', 'string', 'Description', FALSE);
+ $arguments = array('foo' => '');
+ $this->viewHelper->setArguments($arguments);
+ $this->viewHelper->initialize();
+ }
+
/**
* @test
*/
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php
index 2b8c7dd9a762..69fd80772e2d 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php
@@ -112,6 +112,21 @@ class TagBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
$this->assertEquals('<tag attribute1="attribute1value" attribute2="attribute2value" attribute3="attribute3value" />', $tagBuilder->render());
}
+ /**
+ * @test
+ */
+ public function emptyAttributesAreRenderedAccordingToHtmlDoctype() {
+ $GLOBALS['TSFE']->config['config']['doctype'] = 'html5';
+ $tagBuilder = new \TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder('tag');
+ $tagBuilder->addAttribute('attribute1', '');
+ $this->assertEquals('<tag attribute1 />', $tagBuilder->render(), 'Empty attribute syntax is used for HTML5 doctype');
+ $tagBuilder->reset();
+ $GLOBALS['TSFE']->config['config']['doctype'] = 'xhtml_trans';
+ $tagBuilder->setTagName('tag');
+ $tagBuilder->addAttribute('attribute1', '');
+ $this->assertEquals('<tag attribute1="" />', $tagBuilder->render(), 'Key value attribute syntax is used for XHTML doctype');
+ }
+
/**
* @test
*/
--
GitLab