Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 789448b65ced · 2019-09-11T10:38:59.000+02:00
* 4.3:
  Re-enable push support for HttpClient
  [DependencyInjection] Accept existing interfaces as valid named args
  Fixed incompatibility between ServiceSubscriberTrait and classes with protected $container property
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
@@ -53,7 +53,7 @@ protected function processValue($value, $isRoot = false)
                     $parameters = $r->getParameters();
                 }
 
-                if (isset($key[0]) && '$' !== $key[0] && !class_exists($key)) {
+                if (isset($key[0]) && '$' !== $key[0] && !class_exists($key) && !interface_exists($key, false)) {
                     throw new InvalidArgumentException(sprintf('Invalid service "%s": did you forget to add the "$" prefix to argument "%s"?', $this->currentId, $key));
                 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Compiler\ResolveNamedArgumentsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -152,6 +153,19 @@ public function testTypedArgumentWithMissingDollar()
         $pass->process($container);
     }
 
+    public function testInterfaceTypedArgument()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setArgument(ContainerInterface::class, $expected = new Reference('foo'));
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+
+        $this->assertSame($expected, $definition->getArgument(3));
+    }
+
     public function testResolvesMultipleArgumentsOfTheSameType()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedArgumentsDummy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedArgumentsDummy.php
@@ -2,12 +2,14 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
 
+use Psr\Container\ContainerInterface;
+
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 class NamedArgumentsDummy
 {
-    public function __construct(CaseSensitiveClass $c, $apiKey, $hostName)
+    public function __construct(CaseSensitiveClass $c, $apiKey, $hostName, ContainerInterface $interface)
     {
     }
 
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -58,7 +58,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface
      *
      * @see HttpClientInterface::OPTIONS_DEFAULTS for available options
      */
-    public function __construct(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 0)
+    public function __construct(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50)
     {
         if (!\extension_loaded('curl')) {
             throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\CurlHttpClient" as the "curl" extension is not installed.');
diff --git a/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php b/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
@@ -22,7 +22,7 @@
 trait ServiceSubscriberTrait
 {
     /** @var ContainerInterface */
-    private $container;
+    protected $container;
 
     public static function getSubscribedServices(): array
     {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function processValue($value, $isRoot = false)`
`53`	`53`	`$parameters = $r->getParameters();`
`54`	`54`	`}`
`55`	`55`
`56`		`- if (isset($key[0]) && '$' !== $key[0] && !class_exists($key)) {`
	`56`	`+ if (isset($key[0]) && '$' !== $key[0] && !class_exists($key) && !interface_exists($key, false)) {`
`57`	`57`	`throw new InvalidArgumentException(sprintf('Invalid service "%s": did you forget to add the "$" prefix to argument "%s"?', $this->currentId, $key));`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\DependencyInjection\Tests\Fixtures;`
`4`	`4`
	`5`	`+use Psr\Container\ContainerInterface;`
	`6`	`+`
`5`	`7`	`/**`
`6`	`8`	`* @author Kévin Dunglas <[email protected]>`
`7`	`9`	`*/`
`8`	`10`	`class NamedArgumentsDummy`
`9`	`11`	`{`
`10`		`- public function __construct(CaseSensitiveClass $c, $apiKey, $hostName)`
	`12`	`+ public function __construct(CaseSensitiveClass $c, $apiKey, $hostName, ContainerInterface $interface)`
`11`	`13`	`{`
`12`	`14`	`}`
`13`	`15`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface`
`58`	`58`	`*`
`59`	`59`	`* @see HttpClientInterface::OPTIONS_DEFAULTS for available options`
`60`	`60`	`*/`
`61`		`- public function __construct(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 0)`
	`61`	`+ public function __construct(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50)`
`62`	`62`	`{`
`63`	`63`	`if (!\extension_loaded('curl')) {`
`64`	`64`	`throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\CurlHttpClient" as the "curl" extension is not installed.');`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`trait ServiceSubscriberTrait`
`23`	`23`	`{`
`24`	`24`	`/** @var ContainerInterface */`
`25`		`- private $container;`
	`25`	`+ protected $container;`
`26`	`26`
`27`	`27`	`public static function getSubscribedServices(): array`
`28`	`28`	`{`