Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 7a28d2d6271d · 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/ServiceSubscriberTrait.php b/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
`@@ -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`	`{`