Fix merge

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -1268,7 +1268,7 @@ private function hasReference($id, array $arguments, $deep = false, array &$visi
                     return true;
                 }
 
-                if ($deep && !isset($visited[$argumentId]) && 'service_container' !== (string) $argument) {
+                if ($deep && !isset($visited[$argumentId]) && 'service_container' !== $argumentId) {
                     $visited[$argumentId] = true;
 
                     $service = $this->container->getDefinition($argumentId);

Tests/Fixtures/php/services13.php

@@ -36,6 +36,14 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped frozen container.');
+    }
+
     /**
      * Gets the 'bar' service.
      *