Merge branch '5.2' into 5.3

* 5.2:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Command/DebugCommand.php

@@ -168,7 +168,7 @@ private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, strin
                 $classes[] = $fqcn;
             } elseif (class_exists($fqcn = $namespace.'\\'.ucfirst($shortClassName).'Type')) {
                 $classes[] = $fqcn;
-            } elseif ('type' === substr($shortClassName, -4) && class_exists($fqcn = $namespace.'\\'.ucfirst(substr($shortClassName, 0, -4).'Type'))) {
+            } elseif (str_ends_with($shortClassName, 'type') && class_exists($fqcn = $namespace.'\\'.ucfirst(substr($shortClassName, 0, -4).'Type'))) {
                 $classes[] = $fqcn;
             }
         }
@@ -231,7 +231,7 @@ private function findAlternatives(string $name, array $collection): array
         $alternatives = [];
         foreach ($collection as $item) {
             $lev = levenshtein($name, $item);
-            if ($lev <= \strlen($name) / 3 || false !== strpos($item, $name)) {
+            if ($lev <= \strlen($name) / 3 || str_contains($item, $name)) {
                 $alternatives[$item] = isset($alternatives[$item]) ? $alternatives[$item] - $lev : $lev;
             }
         }

Extension/Core/DataMapper/PropertyPathMapper.php

@@ -102,7 +102,7 @@ private function getPropertyValue($data, $propertyPath)
         } catch (AccessException $e) {
             if (!$e instanceof UninitializedPropertyException
                 // For versions without UninitializedPropertyException check the exception message
-                && (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(), 'You should initialize it'))
+                && (class_exists(UninitializedPropertyException::class) || !str_contains($e->getMessage(), 'You should initialize it'))
             ) {
                 throw $e;
             }

Extension/Core/DataTransformer/DateTimeToStringTransformer.php

@@ -62,7 +62,7 @@ public function __construct(string $inputTimezone = null, string $outputTimezone
         // where the time corresponds to the current server time.
         // With "|" and "Y-m-d", "2010-02-03" becomes "2010-02-03 00:00:00",
         // which is at least deterministic and thus used here.
-        if (false === strpos($this->parseFormat, '|')) {
+        if (!str_contains($this->parseFormat, '|')) {
             $this->parseFormat .= '|';
         }
     }

Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php

@@ -40,7 +40,7 @@ public function reverseTransform($value)
     {
         $decimalSeparator = $this->getNumberFormatter()->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
 
-        if (\is_string($value) && false !== strpos($value, $decimalSeparator)) {
+        if (\is_string($value) && str_contains($value, $decimalSeparator)) {
             throw new TransformationFailedException(sprintf('The value "%s" is not a valid integer.', $value));
         }
 

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

@@ -143,7 +143,7 @@ public function reverseTransform($value)
             $value = str_replace(',', $decSep, $value);
         }
 
-        if (false !== strpos($value, $decSep)) {
+        if (str_contains($value, $decSep)) {
             $type = \NumberFormatter::TYPE_DOUBLE;
         } else {
             $type = \PHP_INT_SIZE === 8

Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php

@@ -133,7 +133,7 @@ public function reverseTransform($value)
             $value = str_replace(',', $decSep, $value);
         }
 
-        if (false !== strpos($value, $decSep)) {
+        if (str_contains($value, $decSep)) {
             $type = \NumberFormatter::TYPE_DOUBLE;
         } else {
             $type = \PHP_INT_SIZE === 8 ? \NumberFormatter::TYPE_INT64 : \NumberFormatter::TYPE_INT32;

Extension/Core/Type/DateType.php

@@ -58,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         if ('single_text' === $options['widget']) {
-            if ('' !== $pattern && false === strpos($pattern, 'y') && false === strpos($pattern, 'M') && false === strpos($pattern, 'd')) {
+            if ('' !== $pattern && !str_contains($pattern, 'y') && !str_contains($pattern, 'M') && !str_contains($pattern, 'd')) {
                 throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" or "d". Its current value is "%s".', $pattern));
             }
 
@@ -71,7 +71,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $pattern
             ));
         } else {
-            if ('' !== $pattern && (false === strpos($pattern, 'y') || false === strpos($pattern, 'M') || false === strpos($pattern, 'd'))) {
+            if ('' !== $pattern && (!str_contains($pattern, 'y') || !str_contains($pattern, 'M') || !str_contains($pattern, 'd'))) {
                 throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" and "d". Its current value is "%s".', $pattern));
             }
 

Extension/Core/Type/FileType.php

@@ -188,9 +188,9 @@ private static function getMaxFilesize()
         }
 
         $max = ltrim($iniMax, '+');
-        if (0 === strpos($max, '0x')) {
+        if (str_starts_with($max, '0x')) {
             $max = \intval($max, 16);
-        } elseif (0 === strpos($max, '0')) {
+        } elseif (str_starts_with($max, '0')) {
             $max = \intval($max, 8);
         } else {
             $max = (int) $max;

Extension/Validator/ViolationMapper/ViolationMapper.php

@@ -267,7 +267,7 @@ private function matchChild(FormInterface $form, PropertyPathIteratorInterface $
                 if ($childPath === $chunk) {
                     $target = $child;
                     $foundAtIndex = $it->key();
-                } elseif (0 === strpos($childPath, $chunk)) {
+                } elseif (str_starts_with($childPath, $chunk)) {
                     continue;
                 }
 

Util/ServerParams.php

@@ -52,9 +52,9 @@ public function getPostMaxSize()
         }
 
         $max = ltrim($iniMax, '+');
-        if (0 === strpos($max, '0x')) {
+        if (str_starts_with($max, '0x')) {
             $max = \intval($max, 16);
-        } elseif (0 === strpos($max, '0')) {
+        } elseif (str_starts_with($max, '0')) {
             $max = \intval($max, 8);
         } else {
             $max = (int) $max;