Merge branch '4.4' into 5.2

* 4.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Alias.php

@@ -112,7 +112,7 @@ public function setDeprecated(/* string $package, string $version, string $messa
                 throw new InvalidArgumentException('Invalid characters found in deprecation template.');
             }
 
-            if (false === strpos($message, '%alias_id%')) {
+            if (!str_contains($message, '%alias_id%')) {
                 throw new InvalidArgumentException('The deprecation template must contain the "%alias_id%" placeholder.');
             }
         }

ChildDefinition.php

@@ -93,7 +93,7 @@ public function replaceArgument($index, $value)
     {
         if (\is_int($index)) {
             $this->arguments['index_'.$index] = $value;
-        } elseif (0 === strpos($index, '$')) {
+        } elseif (str_starts_with($index, '$')) {
             $this->arguments[$index] = $value;
         } else {
             throw new InvalidArgumentException('The argument must be an existing index or the name of a constructor\'s parameter.');

Compiler/AutowirePass.php

@@ -297,7 +297,7 @@ private function getAutowiredReference(TypedReference $reference): ?TypedReferen
 
             if ($this->container->has($name) && !$this->container->findDefinition($name)->isAbstract()) {
                 foreach ($this->container->getAliases() as $id => $alias) {
-                    if ($name === (string) $alias && 0 === strpos($id, $type.' $')) {
+                    if ($name === (string) $alias && str_starts_with($id, $type.' $')) {
                         return new TypedReference($name, $type, $reference->getInvalidBehavior());
                     }
                 }

Compiler/CheckDefinitionValidityPass.php

@@ -49,7 +49,7 @@ public function process(ContainerBuilder $container)
                     throw new RuntimeException(sprintf('Please add the class to service "%s" even if it is constructed by a factory since we might need to add method calls based on compile-time checks.', $id));
                 }
                 if (class_exists($id) || interface_exists($id, false)) {
-                    if (0 === strpos($id, '\\') && 1 < substr_count($id, '\\')) {
+                    if (str_starts_with($id, '\\') && 1 < substr_count($id, '\\')) {
                         throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "%s" to get rid of this error.', $id, substr($id, 1)));
                     }
 

Compiler/CheckTypeDeclarationsPass.php

@@ -231,7 +231,7 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
                 $value = $this->container->getParameter(substr($value, 1, -1));
             }
 
-            if ($envPlaceholderUniquePrefix && \is_string($value) && false !== strpos($value, 'env_')) {
+            if ($envPlaceholderUniquePrefix && \is_string($value) && str_contains($value, 'env_')) {
                 // If the value is an env placeholder that is either mixed with a string or with another env placeholder, then its resolved value will always be a string, so we don't need to resolve it.
                 // We don't need to change the value because it is already a string.
                 if ('' === preg_replace('/'.$envPlaceholderUniquePrefix.'_\w+_[a-f0-9]{32}/U', '', $value, -1, $c) && 1 === $c) {

Compiler/Compiler.php

@@ -64,7 +64,7 @@ public function addPass(CompilerPassInterface $pass, string $type = PassConfig::
      */
     public function log(CompilerPassInterface $pass, string $message)
     {
-        if (false !== strpos($message, "\n")) {
+        if (str_contains($message, "\n")) {
             $message = str_replace("\n", "\n".\get_class($pass).': ', trim($message));
         }
 

Compiler/MergeExtensionConfigurationPass.php

@@ -209,7 +209,7 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
         }
 
         foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
-            if (false === strpos($env, ':')) {
+            if (!str_contains($env, ':')) {
                 continue;
             }
             foreach ($placeholders as $placeholder) {

Compiler/RegisterServiceSubscribersPass.php

@@ -91,7 +91,7 @@ protected function processValue($value, bool $isRoot = false)
             if ($name) {
                 if (false !== $i = strpos($name, '::get')) {
                     $name = lcfirst(substr($name, 5 + $i));
-                } elseif (false !== strpos($name, '::')) {
+                } elseif (str_contains($name, '::')) {
                     $name = null;
                 }
             }

Compiler/ResolveBindingsPass.php

@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)
             foreach ($this->unusedBindings as [$key, $serviceId, $bindingType, $file]) {
                 $argumentType = $argumentName = $message = null;
 
-                if (false !== strpos($key, ' ')) {
+                if (str_contains($key, ' ')) {
                     [$argumentType, $argumentName] = explode(' ', $key, 2);
                 } elseif ('$' === $key[0]) {
                     $argumentName = $key;

Compiler/ResolveChildDefinitionsPass.php

@@ -164,7 +164,7 @@ private function doResolveDefinition(ChildDefinition $definition): Definition
         foreach ($definition->getArguments() as $k => $v) {
             if (is_numeric($k)) {
                 $def->addArgument($v);
-            } elseif (0 === strpos($k, 'index_')) {
+            } elseif (str_starts_with($k, 'index_')) {
                 $def->replaceArgument((int) substr($k, \strlen('index_')), $v);
             } else {
                 $def->setArgument($k, $v);