Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 0c8ca6acdb82 · 2018-03-22T14:42:36.000+01:00
* 3.4:
  [DI] Dont tell about autoregistration in strict autowiring mode
  [PHPunit] suite variable should be used
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php
@@ -36,6 +36,6 @@ public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFo
 
     public function startTestSuite(TestSuite $suite): void
     {
-        $this->trait->startTest($test);
+        $this->trait->startTest($suite);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -28,7 +28,7 @@
 class AutowirePass extends AbstractRecursivePass
 {
     private $types;
-    private $ambiguousServiceTypes = array();
+    private $ambiguousServiceTypes;
     private $lastFailure;
     private $throwOnAutowiringException;
 
@@ -46,7 +46,7 @@ public function process(ContainerBuilder $container)
             parent::process($container);
         } finally {
             $this->types = null;
-            $this->ambiguousServiceTypes = array();
+            $this->ambiguousServiceTypes = null;
         }
     }
 
@@ -238,6 +238,7 @@ private function getAutowiredReference(TypedReference $reference)
     private function populateAvailableTypes()
     {
         $this->types = array();
+        $this->ambiguousServiceTypes = array();
 
         foreach ($this->container->getDefinitions() as $id => $definition) {
             $this->populateAvailableType($id, $definition);
@@ -333,7 +334,7 @@ private function createTypeAlternatives(TypedReference $reference)
         if ($message = $this->getAliasesSuggestionForType($type = $reference->getType())) {
             return ' '.$message;
         }
-        if (null === $this->types) {
+        if (null === $this->ambiguousServiceTypes) {
             $this->populateAvailableTypes();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFo`
`36`	`36`
`37`	`37`	`public function startTestSuite(TestSuite $suite): void`
`38`	`38`	`{`
`39`		`- $this->trait->startTest($test);`
	`39`	`+ $this->trait->startTest($suite);`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`class AutowirePass extends AbstractRecursivePass`
`29`	`29`	`{`
`30`	`30`	`private $types;`
`31`		`- private $ambiguousServiceTypes = array();`
	`31`	`+ private $ambiguousServiceTypes;`
`32`	`32`	`private $lastFailure;`
`33`	`33`	`private $throwOnAutowiringException;`
`34`	`34`
`@@ -46,7 +46,7 @@ public function process(ContainerBuilder $container)`
`46`	`46`	`parent::process($container);`
`47`	`47`	`} finally {`
`48`	`48`	`$this->types = null;`
`49`		`- $this->ambiguousServiceTypes = array();`
	`49`	`+ $this->ambiguousServiceTypes = null;`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`@@ -238,6 +238,7 @@ private function getAutowiredReference(TypedReference $reference)`
`238`	`238`	`private function populateAvailableTypes()`
`239`	`239`	`{`
`240`	`240`	`$this->types = array();`
	`241`	`+ $this->ambiguousServiceTypes = array();`
`241`	`242`
`242`	`243`	`foreach ($this->container->getDefinitions() as $id => $definition) {`
`243`	`244`	`$this->populateAvailableType($id, $definition);`
`@@ -333,7 +334,7 @@ private function createTypeAlternatives(TypedReference $reference)`
`333`	`334`	`if ($message = $this->getAliasesSuggestionForType($type = $reference->getType())) {`
`334`	`335`	`return ' '.$message;`
`335`	`336`	`}`
`336`		`- if (null === $this->types) {`
	`337`	`+ if (null === $this->ambiguousServiceTypes) {`
`337`	`338`	`$this->populateAvailableTypes();`
`338`	`339`	`}`
`339`	`340`