Merge pull request #131 from joostdebruijn/joost/feat-follow-rfc6868

feat: use rfc 6868 escaping
spatie · May 16, 2024 · 00097f6 · 00097f6
2 parents cbc9862 + 8d5fc2b
commit 00097f6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/Properties/Parameter.php b/src/Properties/Parameter.php
@@ -40,11 +40,14 @@ public function getValue(): string
         }
 
         $replacements = [
-            '\\' => '\\\\',
-            '"' => '\\"',
+            // RFC 5545
+            '\\' => '\\\\', 
             ',' => '\\,',
             ';' => '\\;',
-            "\n" => '\\n',
+            // RFC 6868
+            '^' => '^^',
+            '"' => '^\'', 
+            PHP_EOL => '^n',
         ];
 
         return str_replace(array_keys($replacements), $replacements, $value);

diff --git a/tests/Properties/ParameterTest.php b/tests/Properties/ParameterTest.php
@@ -13,7 +13,7 @@
     );
 
     assertEquals(
-        'a quote \\" ',
+        'a quote ^\' ',
         (new Parameter('', 'a quote " '))->getValue()
     );
 
@@ -28,8 +28,13 @@
     );
 
     assertEquals(
-        'a return \\\n ',
-        (new Parameter('', 'a return \n '))->getValue()
+        'a return ^n ',
+        (new Parameter('', 'a return '.PHP_EOL.' '))->getValue()
+    );
+
+    assertEquals(
+        'a circumflex accent ^^ ',
+        (new Parameter('', 'a circumflex accent ^ '))->getValue()
     );
 });
 
@@ -58,6 +63,11 @@
         'a return \n ',
         (new Parameter('', 'a return \n ', true))->getValue()
     );
+
+    assertEquals(
+        'a return ^ ',
+        (new Parameter('', 'a return ^ ', true))->getValue()
+    );
 });
 
 test('it can format a boolean', function () {