Merge branch '6.4' into 7.1

* 6.4:
  initialize RedisAdapter cursor to 0
  do not skip tests from data providers
  ensure compatibility with Twig 3.15
  [Mime] fix encoding issue with UTF-8 addresses containing doubles spaces
  fix translation file syntax
  [Notifier] Improve Telegrams markdown escaping
  [Validator] [Choice] Fix callback option if not array returned
  [DependencyInjection] Fix linting factories implemented via __callStatic
  [DependencyInjection] Fix replacing abstract arguments with bindings
  Minor fixes around parse_url() checks
  Ensure compatibility with mongodb v2
  Add missing translations for Turkish (tr)

Author: nicolas-grekas

Compiler/AbstractRecursivePass.php

@@ -213,6 +213,10 @@ protected function getReflectionMethod(Definition $definition, string $method):
                 return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');
             }
 
+            if ($r->hasMethod('__callStatic') && ($r = $r->getMethod('__callStatic')) && $r->isPublic()) {
+                return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');
+            }
+
             throw new RuntimeException(sprintf('Invalid service "%s": method "%s()" does not exist.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
         }
 

Compiler/ResolveBindingsPass.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
@@ -179,10 +180,10 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             foreach ($reflectionMethod->getParameters() as $key => $parameter) {
                 $names[$key] = $parameter->name;
 
-                if (\array_key_exists($key, $arguments) && '' !== $arguments[$key]) {
+                if (\array_key_exists($key, $arguments) && '' !== $arguments[$key] && !$arguments[$key] instanceof AbstractArgument) {
                     continue;
                 }
-                if (\array_key_exists($parameter->name, $arguments) && '' !== $arguments[$parameter->name]) {
+                if (\array_key_exists($parameter->name, $arguments) && '' !== $arguments[$parameter->name] && !$arguments[$parameter->name] instanceof AbstractArgument) {
                     continue;
                 }
                 if (
@@ -227,7 +228,9 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
             foreach ($names as $key => $name) {
                 if (\array_key_exists($name, $arguments) && (0 === $key || \array_key_exists($key - 1, $arguments))) {
-                    $arguments[$key] = $arguments[$name];
+                    if (!array_key_exists($key, $arguments)) {
+                        $arguments[$key] = $arguments[$name];
+                    }
                     unset($arguments[$name]);
                 }
             }

EnvVarProcessor.php

@@ -308,7 +308,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                 throw new RuntimeException(sprintf('Invalid URL in env var "%s".', $name));
             }
             if (!isset($params['scheme'], $params['host'])) {
-                throw new RuntimeException(sprintf('Invalid URL env var "%s": schema and host expected, "%s" given.', $name, $env));
+                throw new RuntimeException(sprintf('Invalid URL in env var "%s": scheme and host expected.', $name));
             }
             $params += [
                 'port' => null,

Tests/Compiler/CheckTypeDeclarationsPassTest.php

@@ -982,6 +982,17 @@ public function testCallableClass()
         $this->addToAssertionCount(1);
     }
 
+    public function testStaticCallableClass()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', StaticCallableClass::class)
+            ->setFactory([StaticCallableClass::class, 'staticMethodCall']);
+
+        (new CheckTypeDeclarationsPass())->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
     public function testIgnoreDefinitionFactoryArgument()
     {
         $container = new ContainerBuilder();
@@ -1017,3 +1028,10 @@ public function __call($name, $arguments)
     {
     }
 }
+
+class StaticCallableClass
+{
+    public static function __callStatic($name, $arguments)
+    {
+    }
+}

Tests/Compiler/ResolveBindingsPassTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
@@ -256,11 +257,23 @@ public function testBindWithNamedArgs()
         $definition->setArguments(['c' => 'C', 'hostName' => 'H']);
         $definition->setBindings($bindings);
 
-        $container->register('foo', CaseSensitiveClass::class);
-
         $pass = new ResolveBindingsPass();
         $pass->process($container);
 
         $this->assertEquals(['C', 'K', 'H'], $definition->getArguments());
     }
+
+    public function testAbstractArg()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setArguments([new AbstractArgument(), 'apiKey' => new AbstractArgument()]);
+        $definition->setBindings(['$c' => new BoundArgument('C'), '$apiKey' => new BoundArgument('K')]);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+
+        $this->assertEquals(['C', 'K'], $definition->getArguments());
+    }
 }