Merge pull request #10 from mficzel/task/protectMetaPropertiesOnHtmlT…

…agsFromPrefixing BUGFIX: Protect meta-attributes of html-tags from prefixing
PackageFactory · May 5, 2017 · 9af27c5 · 9af27c5
2 parents f5c3106 + c187108
commit 9af27c5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/Classes/Service/AfxService.php b/Classes/Service/AfxService.php
@@ -164,7 +164,9 @@ protected static function astNodeToFusion($payload, $indentation = '')
                 if ($propName == '@key' || $propName == '@children') {
                     continue;
                 } else {
-                    if ($attributePrefix && !in_array($propName, $attributePrefixExceptions)) {
+                    if ($propName{0} === '@') {
+                        $fusionName = $propName;
+                    } elseif ($attributePrefix && !in_array($propName, $attributePrefixExceptions)) {
                         $fusionName = $attributePrefix . $propName;
                     } else {
                         $fusionName = $propName;

diff --git a/Tests/Functional/AfxServiceTest.php b/Tests/Functional/AfxServiceTest.php
@@ -117,7 +117,7 @@ public function attributesInFusionTagsAreConvertedToFusionPropertiesOrEelExpress
     /**
      * @test
      */
-    public function metaAttributesAreConvertedToFusionProperties()
+    public function metaAttributesOfFusionObjectTagsAreConvertedToFusionProperties()
     {
         $afxCode = '<Vendor.Site:Prototype @position="start" @if.hasTitle={title} />';
         $expectedFusion = <<<'EOF'
@@ -129,6 +129,22 @@ public function metaAttributesAreConvertedToFusionProperties()
         $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
     }
 
+    /**
+     * @test
+     */
+    public function metaAttributesOfHtmlTagsAreConvertedToFusionProperties()
+    {
+        $afxCode = '<div @position="start" @if.hasTitle={title} ></div>';
+        $expectedFusion = <<<'EOF'
+Neos.Fusion:Tag {
+    tagName = 'div'
+    @position = 'start'
+    @if.hasTitle = ${title}
+}
+EOF;
+        $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
+    }
+
     /**
      * @test
      */