BustCacheMacro: Replace deprecated safeurl filter by checkurl

nepada · Mar 1, 2019 · 82195dd · 82195dd
1 parent 781efee
commit 82195dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/BustCache/BustCacheMacro.php b/src/BustCache/BustCacheMacro.php
@@ -77,7 +77,7 @@ public function nodeOpened(MacroNode $node): bool
         }
 
         $node->empty = true;
-        $node->modifiers = '|safeurl|escape'; // auto-escape
+        $node->modifiers = '|checkurl|escape'; // auto-escape
 
         $writer = Latte\PhpWriter::using($node);
 

diff --git a/tests/BustCache/BustCacheMacroTest.phpt b/tests/BustCache/BustCacheMacroTest.phpt
@@ -26,29 +26,29 @@ class BustCacheMacroTest extends TestCase
 
         $node = $compiler->expandMacro('bustCache', '"/test.txt"');
         Assert::true($node->empty);
-        Assert::match(
-            '<?php echo %a%escape%a%\'/test.txt?a1d0c6e83f\') ?>',
+        Assert::same(
+            '<?php echo LR\Filters::escapeHtmlText(\'/test.txt?a1d0c6e83f\') ?>',
             $node->openingCode
         );
 
         $node = $compiler->expandMacro('bustCache', "'/test.txt'");
         Assert::true($node->empty);
-        Assert::match(
-            '<?php echo %a%escape%a%\'/test.txt?a1d0c6e83f\') ?>',
+        Assert::same(
+            '<?php echo LR\Filters::escapeHtmlText(\'/test.txt?a1d0c6e83f\') ?>',
             $node->openingCode
         );
 
         $node = $compiler->expandMacro('bustCache', '/test.txt');
         Assert::true($node->empty);
-        Assert::match(
-            '<?php echo %a%escape%a%\'/test.txt?a1d0c6e83f\') ?>',
+        Assert::same(
+            '<?php echo LR\Filters::escapeHtmlText(\'/test.txt?a1d0c6e83f\') ?>',
             $node->openingCode
         );
 
         $node = $compiler->expandMacro('bustCache', '$file');
         Assert::true($node->empty);
-        Assert::match(
-            '#<\?php echo .*escape.*safeUrl.*\$file \. \'\?\' \. Nepada\\\\BustCache\\\\Helpers::hash\(\'' . preg_quote(self::FIXTURES_DIR, '#') . '\' . \$file\)\)\) \?>#i',
+        Assert::same(
+            '<?php echo LR\Filters::escapeHtmlText(LR\Filters::safeUrl($file . \'?\' . Nepada\BustCache\Helpers::hash(\'' . self::FIXTURES_DIR . '\' . $file))) ?>',
             $node->openingCode
         );
     }
@@ -60,15 +60,15 @@ class BustCacheMacroTest extends TestCase
 
         $node = $compiler->expandMacro('bustCache', '/test.txt');
         Assert::true($node->empty);
-        Assert::match(
-            '#<\?php echo .*escape.*safeUrl.*"/test\.txt" \. \'\?\' \. Nepada\\\\BustCache\\\\Helpers::timestamp\(\'' . preg_quote(self::FIXTURES_DIR, '#') . '\' . "/test\.txt"\)\)\) \?>#i',
+        Assert::same(
+            '<?php echo LR\Filters::escapeHtmlText(LR\Filters::safeUrl("/test.txt" . \'?\' . Nepada\BustCache\Helpers::timestamp(\'' . self::FIXTURES_DIR . '\' . "/test.txt"))) ?>',
             $node->openingCode
         );
 
         $node = $compiler->expandMacro('bustCache', '$file');
         Assert::true($node->empty);
-        Assert::match(
-            '#<\?php echo .*escape.*safeUrl.*\$file \. \'\?\' \. Nepada\\\\BustCache\\\\Helpers::timestamp\(\'' . preg_quote(self::FIXTURES_DIR, '#') . '\' . \$file\)\)\) \?>#i',
+        Assert::same(
+            '<?php echo LR\Filters::escapeHtmlText(LR\Filters::safeUrl($file . \'?\' . Nepada\BustCache\Helpers::timestamp(\'' . self::FIXTURES_DIR . '\' . $file))) ?>',
             $node->openingCode
         );
     }