fix merge

nicolas-grekas · nicolas-grekas · commit fe86a4ca5fd9 · 2018-02-04T15:28:36.000+01:00
diff --git a/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php b/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(
-            'Psr\\Container\\ContainerInterface' => true,
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
+        $this->privates = array();
+        parent::reset();
     }
 
     public function compile()
@@ -48,10 +51,11 @@ public function isCompiled()
         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 true;
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }
diff --git a/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php b/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(
-            'Psr\\Container\\ContainerInterface' => true,
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
+        $this->privates = array();
+        parent::reset();
     }
 
     public function compile()
@@ -46,10 +49,11 @@ public function isCompiled()
         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 true;
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }
diff --git a/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php b/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(
-            'Psr\\Container\\ContainerInterface' => true,
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
+        $this->privates = array();
+        parent::reset();
     }
 
     public function compile()
@@ -48,10 +51,11 @@ public function isCompiled()
         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 true;
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }
diff --git a/Tests/Fixtures/php/custom_container_class_without_constructor.php b/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(
-            'Psr\\Container\\ContainerInterface' => true,
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        );
+        $this->privates = array();
+        parent::reset();
     }
 
     public function compile()
@@ -46,10 +49,11 @@ public function isCompiled()
         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 true;
+        return array(
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,24 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes`
`21`	`21`	`private $parameters;`
`22`	`22`	`private $targetDirs = array();`
`23`	`23`
	`24`	`+ /**`
	`25`	`+ * @internal but protected for BC on cache:clear`
	`26`	`+ */`
	`27`	`+ protected $privates = array();`
	`28`	`+`
`24`	`29`	`public function __construct()`
`25`	`30`	`{`
`26`	`31`	`parent::__construct();`
`27`	`32`
`28`		`- $this->services = array();`
	`33`	`+ $this->services = $this->privates = array();`
`29`	`34`
`30`	`35`	`$this->aliases = array();`
`31`	`36`	`}`
`32`	`37`
`33`		`- public function getRemovedIds()`
	`38`	`+ public function reset()`
`34`	`39`	`{`
`35`		`- return array(`
`36`		`- 'Psr\\Container\\ContainerInterface' => true,`
`37`		`- 'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,`
`38`		`- );`
	`40`	`+ $this->privates = array();`
	`41`	`+ parent::reset();`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`public function compile()`
`@@ -48,10 +51,11 @@ public function isCompiled()`
`48`	`51`	`return true;`
`49`	`52`	`}`
`50`	`53`
`51`		`- public function isFrozen()`
	`54`	`+ public function getRemovedIds()`
`52`	`55`	`{`
`53`		`- @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);`
`54`		`-`
`55`		`- return true;`
	`56`	`+ return array(`
	`57`	`+ 'Psr\\Container\\ContainerInterface' => true,`
	`58`	`+ 'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,`
	`59`	`+ );`
`56`	`60`	`}`
`57`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,19 +21,22 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes`
`21`	`21`	`private $parameters;`
`22`	`22`	`private $targetDirs = array();`
`23`	`23`
	`24`	`+ /**`
	`25`	`+ * @internal but protected for BC on cache:clear`
	`26`	`+ */`
	`27`	`+ protected $privates = array();`
	`28`	`+`
`24`	`29`	`public function __construct()`
`25`	`30`	`{`
`26`		`- $this->services = array();`
	`31`	`+ $this->services = $this->privates = array();`
`27`	`32`
`28`	`33`	`$this->aliases = array();`
`29`	`34`	`}`
`30`	`35`
`31`		`- public function getRemovedIds()`
	`36`	`+ public function reset()`
`32`	`37`	`{`
`33`		`- return array(`
`34`		`- 'Psr\\Container\\ContainerInterface' => true,`
`35`		`- 'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,`
`36`		`- );`
	`38`	`+ $this->privates = array();`
	`39`	`+ parent::reset();`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`public function compile()`
`@@ -46,10 +49,11 @@ public function isCompiled()`
`46`	`49`	`return true;`
`47`	`50`	`}`
`48`	`51`
`49`		`- public function isFrozen()`
	`52`	`+ public function getRemovedIds()`
`50`	`53`	`{`
`51`		`- @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);`
`52`		`-`
`53`		`- return true;`
	`54`	`+ return array(`
	`55`	`+ 'Psr\\Container\\ContainerInterface' => true,`
	`56`	`+ 'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,`
	`57`	`+ );`
`54`	`58`	`}`
`55`	`59`	`}`