Merge branch '3.4' into 4.1

* 3.4:
  [DI] fix dumping lazy services

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -155,7 +155,7 @@ public function dump(array $options = array())
             }
         }
 
-        (new AnalyzeServiceReferencesPass(false, !$this->getProxyDumper() instanceof NullDumper))->process($this->container);
+        (new AnalyzeServiceReferencesPass(false))->process($this->container);
         $this->circularReferences = array();
         $checkedNodes = array();
         foreach ($this->container->getCompiler()->getServiceReferenceGraph()->getNodes() as $id => $node) {

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php

@@ -138,17 +138,11 @@ protected function getBar5Service()
      */
     protected function getConnectionService()
     {
-        $a = ($this->services['dispatcher'] ?? $this->getDispatcherService());
-
-        if (isset($this->services['connection'])) {
-            return $this->services['connection'];
-        }
-
-        $b = new \stdClass();
+        $a = new \stdClass();
 
-        $this->services['connection'] = $instance = new \stdClass($a, $b);
+        $this->services['connection'] = $instance = new \stdClass(($this->services['dispatcher'] ?? $this->getDispatcherService()), $a);
 
-        $b->logger = ($this->services['logger'] ?? $this->getLoggerService());
+        $a->logger = ($this->services['logger'] ?? $this->getLoggerService());
 
         return $instance;
     }
@@ -160,21 +154,15 @@ protected function getConnectionService()
      */
     protected function getConnection2Service()
     {
-        $a = ($this->services['dispatcher2'] ?? $this->getDispatcher2Service());
-
-        if (isset($this->services['connection2'])) {
-            return $this->services['connection2'];
-        }
-
-        $b = new \stdClass();
+        $a = new \stdClass();
 
-        $this->services['connection2'] = $instance = new \stdClass($a, $b);
+        $this->services['connection2'] = $instance = new \stdClass(($this->services['dispatcher2'] ?? $this->getDispatcher2Service()), $a);
 
-        $c = new \stdClass($instance);
+        $b = new \stdClass($instance);
 
-        $c->handler2 = new \stdClass(($this->services['manager2'] ?? $this->getManager2Service()));
+        $b->handler2 = new \stdClass(($this->services['manager2'] ?? $this->getManager2Service()));
 
-        $b->logger2 = $c;
+        $a->logger2 = $b;
 
         return $instance;
     }
@@ -384,12 +372,6 @@ protected function getManager2Service()
      */
     protected function getSubscriberService()
     {
-        $a = ($this->services['manager'] ?? $this->getManagerService());
-
-        if (isset($this->services['subscriber'])) {
-            return $this->services['subscriber'];
-        }
-
-        return $this->services['subscriber'] = new \stdClass($a);
+        return $this->services['subscriber'] = new \stdClass(($this->services['manager'] ?? $this->getManagerService()));
     }
 }