Merge branch '4.0'

* 4.0:
  fix merge

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

@@ -21,21 +21,24 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
     private $parameters;
     private $targetDirs = array();
 
+    /**
+     * @internal but protected for BC on cache:clear
+     */
+    protected $privates = array();
+
     public function __construct()
     {
         parent::__construct();
 
-        $this->services = array();
+        $this->services = $this->privates = array();
 
         $this->aliases = array();
     }
 
-    public function getRemovedIds()
+    public function reset()
     {
-        return array(
+        $this->privates = array();
-            'Psr\\Container\\ContainerInterface' => true,
+        parent::reset();
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
     }
 
     public function compile()
@@ -48,10 +51,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
         return true;
     }
 
-    public function isFrozen()
+    public function getRemovedIds()
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+        return array(
-
+            'Psr\\Container\\ContainerInterface' => true,
-        return true;
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }

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

@@ -21,19 +21,22 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
     private $parameters;
     private $targetDirs = array();
 
+    /**
+     * @internal but protected for BC on cache:clear
+     */
+    protected $privates = array();
+
     public function __construct()
     {
-        $this->services = array();
+        $this->services = $this->privates = array();
 
         $this->aliases = array();
     }
 
-    public function getRemovedIds()
+    public function reset()
     {
-        return array(
+        $this->privates = array();
-            'Psr\\Container\\ContainerInterface' => true,
+        parent::reset();
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
     }
 
     public function compile()
@@ -46,10 +49,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
         return true;
     }
 
-    public function isFrozen()
+    public function getRemovedIds()
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+        return array(
-
+            'Psr\\Container\\ContainerInterface' => true,
-        return true;
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }

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

@@ -21,21 +21,24 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
     private $parameters;
     private $targetDirs = array();
 
+    /**
+     * @internal but protected for BC on cache:clear
+     */
+    protected $privates = array();
+
     public function __construct()
     {
         parent::__construct();
 
-        $this->services = array();
+        $this->services = $this->privates = array();
 
         $this->aliases = array();
     }
 
-    public function getRemovedIds()
+    public function reset()
     {
-        return array(
+        $this->privates = array();
-            'Psr\\Container\\ContainerInterface' => true,
+        parent::reset();
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
     }
 
     public function compile()
@@ -48,10 +51,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
         return true;
     }
 
-    public function isFrozen()
+    public function getRemovedIds()
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+        return array(
-
+            'Psr\\Container\\ContainerInterface' => true,
-        return true;
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }

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

@@ -21,19 +21,22 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
     private $parameters;
     private $targetDirs = array();
 
+    /**
+     * @internal but protected for BC on cache:clear
+     */
+    protected $privates = array();
+
     public function __construct()
     {
-        $this->services = array();
+        $this->services = $this->privates = array();
 
         $this->aliases = array();
     }
 
-    public function getRemovedIds()
+    public function reset()
     {
-        return array(
+        $this->privates = array();
-            'Psr\\Container\\ContainerInterface' => true,
+        parent::reset();
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
     }
 
     public function compile()
@@ -46,10 +49,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
         return true;
     }
 
-    public function isFrozen()
+    public function getRemovedIds()
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+        return array(
-
+            'Psr\\Container\\ContainerInterface' => true,
-        return true;
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }