Merge branch '2.0'

PackageFactory · Jun 19, 2017 · 94bbcd4 · 94bbcd4
2 parents 7a6064f + 11586a5
commit 94bbcd4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/Classes/Service/AfxService.php b/Classes/Service/AfxService.php
@@ -165,7 +165,7 @@ protected static function astNodeToFusion($payload, $indentation = '')
                 $childrenPropertyName = 'content';
             }
             $childFusion = self::astNodeListToFusion($payload['children'], $indentation . self::INDENTATION);
-            if ($childFusion !== null) {
+            if ($childFusion) {
                 $fusion .= $indentation . self::INDENTATION . $childrenPropertyName . ' = ' . $childFusion . PHP_EOL;
             }
         }
@@ -202,7 +202,7 @@ protected static function astNodeListToFusion($payload, $indentation = '')
         });
 
         if (count($payload) == 0) {
-            return '';
+            return '\'\'';
         } elseif (count($payload) == 1) {
             return self::astToFusion(array_shift($payload), $indentation);
         } else {

diff --git a/Tests/Functional/AfxServiceTest.php b/Tests/Functional/AfxServiceTest.php
@@ -14,6 +14,7 @@ public function emptyCodeConvertedToEmptyFusion()
     {
         $afxCode = '';
         $expectedFusion = <<<'EOF'
+''
 EOF;
         $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
     }
@@ -25,6 +26,7 @@ public function whitepaceCodeIsConvertedToEmptyFusion()
     {
         $afxCode = '   ';
         $expectedFusion = <<<'EOF'
+''
 EOF;
         $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
     }
@@ -43,6 +45,38 @@ public function htmlTagsAreConvertedToFusionTags()
         $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
     }
 
+    /**
+     * @test
+     */
+    public function htmlTagsWithSpaceContentAreConvertedToFusionTags()
+    {
+        $afxCode = '<h1>   </h1>';
+        $expectedFusion = <<<'EOF'
+Neos.Fusion:Tag {
+    tagName = 'h1'
+    content = '   '
+}
+EOF;
+        $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
+    }
+
+    /**
+     * @test
+     */
+    public function htmlTagsWithIgnoredContentAreConvertedToFusionTags()
+    {
+        $afxCode = '<h1>
+   
+</h1>';
+        $expectedFusion = <<<'EOF'
+Neos.Fusion:Tag {
+    tagName = 'h1'
+    content = ''
+}
+EOF;
+        $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
+    }
+
     /**
      * @test
      */