Merge branch '5.4' into 6.0

* 5.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Parser/Parser.php

@@ -79,7 +79,7 @@ public static function parseSeries(array $tokens): array
                 return [2, 0];
             case 'n' === $joined:
                 return [1, 0];
-            case false === strpos($joined, 'n'):
+            case !str_contains($joined, 'n'):
                 return [0, $int($joined)];
         }
 

XPath/Translator.php

@@ -63,11 +63,11 @@ public function __construct(ParserInterface $parser = null)
 
     public static function getXpathLiteral(string $element): string
     {
-        if (false === strpos($element, "'")) {
+        if (!str_contains($element, "'")) {
             return "'".$element."'";
         }
 
-        if (false === strpos($element, '"')) {
+        if (!str_contains($element, '"')) {
             return '"'.$element.'"';
         }