[DI] Fix resetting private services

nicolas-grekas · nicolas-grekas · commit 320cf40b7144 · 2017-07-24T21:54:53.000+02:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -14,6 +14,7 @@
 use ProxyManager\Generator\ClassGenerator;
 use ProxyManager\GeneratorStrategy\BaseGeneratorStrategy;
 use ProxyManager\ProxyGenerator\LazyLoadingValueHolderGenerator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
 
@@ -69,7 +70,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $methodName = n
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= " \$this->services['$id'] =";
+            $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() || !method_exists(ContainerBuilder::class, 'addClassResource') ? 'services' : 'privates', $id);
         }
 
         if (null === $methodName) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -153,6 +153,7 @@ public function dump(array $options = array())
         $code =
             $this->startClass($options['class'], $options['base_class'], $options['namespace']).
             $this->addConstructor().
+            $this->addReset().
             $this->addCompile().
             $this->addIsCompiled().
             $this->addServices().
@@ -831,6 +832,27 @@ public function __construct()
         return $code;
     }
 
+    /**
+     * Adds the reset method for a compiled container.
+     *
+     * @return string
+     */
+    private function addReset()
+    {
+        return <<<EOF
+
+    /*{$this->docStar}
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        \$this->privates = array();
+        parent::reset();
+    }
+
+EOF;
+    }
+
     /**
      * Adds the compile method for a compiled container.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -34,6 +34,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -32,6 +32,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -37,6 +37,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -41,6 +41,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -35,6 +35,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -36,6 +36,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -35,6 +35,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -37,6 +37,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -35,6 +35,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -34,6 +34,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -60,6 +60,15 @@ public function __construct()
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -41,6 +41,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -42,6 +42,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
@@ -36,6 +36,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -36,6 +36,15 @@ public function __construct()
         $this->aliases = array();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->privates = array();
+        parent::reset();
+    }
+
     /**
      * {@inheritdoc}
      */
