Merge branch '5.3' into 5.4

* 5.3:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Lexer.php

@@ -48,13 +48,13 @@ public function tokenize(string $expression)
                 }
                 $tokens[] = new Token(Token::NUMBER_TYPE, $number, $cursor + 1);
                 $cursor += \strlen($match[0]);
-            } elseif (false !== strpos('([{', $expression[$cursor])) {
+            } elseif (str_contains('([{', $expression[$cursor])) {
                 // opening bracket
                 $brackets[] = [$expression[$cursor], $cursor];
 
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
                 ++$cursor;
-            } elseif (false !== strpos(')]}', $expression[$cursor])) {
+            } elseif (str_contains(')]}', $expression[$cursor])) {
                 // closing bracket
                 if (empty($brackets)) {
                     throw new SyntaxError(sprintf('Unexpected "%s".', $expression[$cursor]), $cursor, $expression);
@@ -75,7 +75,7 @@ public function tokenize(string $expression)
                 // operators
                 $tokens[] = new Token(Token::OPERATOR_TYPE, $match[0], $cursor + 1);
                 $cursor += \strlen($match[0]);
-            } elseif (false !== strpos('.,?:', $expression[$cursor])) {
+            } elseif (str_contains('.,?:', $expression[$cursor])) {
                 // punctuation
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
                 ++$cursor;

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=7.2.5",
         "symfony/cache": "^4.4|^5.0|^6.0",
-        "symfony/polyfill-php80": "^1.15",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.1|^2"
     },
     "autoload": {