Merge branch '3.4' into 4.0

* 3.4:
  [DI] Dont tell about autoregistration in strict autowiring mode
  [PHPunit] suite variable should be used

Author: nicolas-grekas

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();
         }