Compile starts/ends with using PHP8 functions str_starts/ends_with

twigphp · Oct 21, 2023 · 30b5a56 · 30b5a56
1 parent 51cfad8
commit 30b5a56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Node/Expression/Binary/EndsWithBinary.php b/src/Node/Expression/Binary/EndsWithBinary.php
@@ -24,7 +24,7 @@ public function compile(Compiler $compiler): void
             ->subcompile($this->getNode('left'))
             ->raw(sprintf(') && is_string($%s = ', $right))
             ->subcompile($this->getNode('right'))
-            ->raw(sprintf(') && (\'\' === $%2$s || $%2$s === substr($%1$s, -strlen($%2$s))))', $left, $right))
+            ->raw(sprintf(') && str_ends_with($%1$s, $%2$s))', $left, $right))
         ;
     }
 

diff --git a/src/Node/Expression/Binary/StartsWithBinary.php b/src/Node/Expression/Binary/StartsWithBinary.php
@@ -24,7 +24,7 @@ public function compile(Compiler $compiler): void
             ->subcompile($this->getNode('left'))
             ->raw(sprintf(') && is_string($%s = ', $right))
             ->subcompile($this->getNode('right'))
-            ->raw(sprintf(') && (\'\' === $%2$s || 0 === strpos($%1$s, $%2$s)))', $left, $right))
+            ->raw(sprintf(') && str_starts_with($%1$s, $%2$s))', $left, $right))
         ;
     }