Merge branch '5.4' into 6.0

* 5.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

OptionsResolver.php

@@ -1031,7 +1031,7 @@ public function offsetGet(mixed $option, bool $triggerDeprecation = true)
                 $fmtAllowedTypes = implode('" or "', $this->allowedTypes[$option]);
                 $fmtProvidedTypes = implode('|', array_keys($invalidTypes));
                 $allowedContainsArrayType = \count(array_filter($this->allowedTypes[$option], static function ($item) {
-                    return '[]' === substr($item, -2);
+                    return str_ends_with($item, '[]');
                 })) > 0;
 
                 if (\is_array($value) && $allowedContainsArrayType) {