Merge pull request #13 from mficzel/bugfix/supportSlashesInTextsAndSt…

…rings BUGFIX: Support slashes in texts property
neos · Nov 14, 2018 · 92d5950 · 92d5950
2 parents 8007067 + ef6d3d0
commit 92d5950
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/Classes/Service/AfxService.php b/Classes/Service/AfxService.php
@@ -93,7 +93,7 @@ protected static function astStringToFusion($payload, $indentation = '')
      */
     protected static function astTextToFusion($payload, $indentation = '')
     {
-        return '\'' . str_replace('\'', '\\\'', $payload) . '\'';
+        return '\'' . addslashes($payload) . '\'';
     }
 
     /**

diff --git a/Tests/Functional/AfxServiceTest.php b/Tests/Functional/AfxServiceTest.php
@@ -600,6 +600,40 @@ public function spacesInsideALineArePreservedAlsoForStrings()
         $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
     }
 
+    /**
+     * @test
+     */
+    public function slashesInTextNodesArePreserved()
+    {
+        $afxCode = '<h1>\o/</h1>';
+
+        $expectedFusion = <<<'EOF'
+Neos.Fusion:Tag {
+    tagName = 'h1'
+    content = '\\o/'
+}
+EOF;
+        $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
+    }
+
+    /**
+     * @test
+     */
+    public function textsAreEscaped()
+    {
+        $afxCode = <<<'EOF'
+<h1>foo'bar\baz"bam</h1>
+EOF;
+
+        $expectedFusion = <<<'EOF'
+Neos.Fusion:Tag {
+    tagName = 'h1'
+    content = 'foo\'bar\\baz\"bam'
+}
+EOF;
+        $this->assertEquals($expectedFusion, AfxService::convertAfxToFusion($afxCode));
+    }
+
     /**
      * @test
      * @expectedException \PackageFactory\Afx\Exception