bug #32870 #32853 Check if $this->parameters is array. (ABGEO07)

nicolas-grekas · nicolas-grekas · commit 5e0a736b5b28 · 2019-08-03T20:20:39.000+02:00
This PR was submitted for the 4.3 branch but it was squashed and merged into the 3.4 branch instead (closes #32870).

Discussion
----------

| Q             | A
| ------------- | ---
| Branch?     | 4.3
| Bug fix?      | yes
| New feature?  | no
| Tests pass?   | yes
| Fixed tickets | #32853
| License       | MIT

Commits
-------

7cf9ed613b #32853 Check if $this-&gt;parameters is array.
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -969,7 +969,7 @@ private function startClass($class, $baseClass, $baseClassWithNamespace)
  */
 class $class extends $baseClass
 {
-    private \$parameters;
+    private \$parameters = [];
     private \$targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php b/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
@@ -18,7 +18,7 @@
  */
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithoutArgumentsContainer
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
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
@@ -18,7 +18,7 @@
  */
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithMandatoryArgumentsContainer
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
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
@@ -18,7 +18,7 @@
  */
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithOptionalArgumentsContainer
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/custom_container_class_without_constructor.php b/Tests/Fixtures/php/custom_container_class_without_constructor.php
@@ -18,7 +18,7 @@
  */
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\NoConstructorContainer
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services1-1.php b/Tests/Fixtures/php/services1-1.php
@@ -18,7 +18,7 @@
  */
 class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services1.php b/Tests/Fixtures/php/services1.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services10.php b/Tests/Fixtures/php/services10.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services12.php b/Tests/Fixtures/php/services12.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services13.php b/Tests/Fixtures/php/services13.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services19.php b/Tests/Fixtures/php/services19.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services24.php b/Tests/Fixtures/php/services24.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services26.php b/Tests/Fixtures/php/services26.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services33.php b/Tests/Fixtures/php/services33.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services8.php b/Tests/Fixtures/php/services8.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services9.php b/Tests/Fixtures/php/services9.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services9_as_files.txt b/Tests/Fixtures/php/services9_as_files.txt
@@ -277,7 +277,7 @@ class ProjectServiceContainer extends Container
 {
     private $buildParameters;
     private $containerDir;
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct(array $buildParameters = [], $containerDir = __DIR__)
diff --git a/Tests/Fixtures/php/services9_compiled.php b/Tests/Fixtures/php/services9_compiled.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_adawson.php b/Tests/Fixtures/php/services_adawson.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_almost_circular_private.php b/Tests/Fixtures/php/services_almost_circular_private.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_almost_circular_public.php b/Tests/Fixtures/php/services_almost_circular_public.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_array_params.php b/Tests/Fixtures/php/services_array_params.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_base64_env.php b/Tests/Fixtures/php/services_base64_env.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_dedup_lazy_proxy.php b/Tests/Fixtures/php/services_dedup_lazy_proxy.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_deep_graph.php b/Tests/Fixtures/php/services_deep_graph.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Deep_Graph extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_env_in_id.php b/Tests/Fixtures/php/services_env_in_id.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_inline_requires.php b/Tests/Fixtures/php/services_inline_requires.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_inline_self_ref.php b/Tests/Fixtures/php/services_inline_self_ref.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Inline_Self_Ref extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_legacy_privates.php b/Tests/Fixtures/php/services_legacy_privates.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Legacy_Privates extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_locator.php b/Tests/Fixtures/php/services_locator.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_non_shared_lazy.php b/Tests/Fixtures/php/services_non_shared_lazy.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_private_frozen.php b/Tests/Fixtures/php/services_private_frozen.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_private_in_expression.php b/Tests/Fixtures/php/services_private_in_expression.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_rot13_env.php b/Tests/Fixtures/php/services_rot13_env.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_subscriber.php b/Tests/Fixtures/php/services_subscriber.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_tsantos.php b/Tests/Fixtures/php/services_tsantos.php
@@ -16,7 +16,7 @@
  */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_uninitialized_ref.php b/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/services_unsupported_characters.php b/Tests/Fixtures/php/services_unsupported_characters.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Unsupported_Characters extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct()

Original file line number	Diff line number	Diff line change
`@@ -969,7 +969,7 @@ private function startClass($class, $baseClass, $baseClassWithNamespace)`
`969`	`969`	`*/`
`970`	`970`	`class $class extends $baseClass`
`971`	`971`	`{`
`972`		`- private \$parameters;`
	`972`	`+ private \$parameters = [];`
`973`	`973`	`private \$targetDirs = [];`
`974`	`974`
`975`	`975`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithoutArgumentsContainer`
`20`	`20`	`{`
`21`		`- private $parameters;`
	`21`	`+ private $parameters = [];`
`22`	`22`	`private $targetDirs = [];`
`23`	`23`
`24`	`24`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`class ProjectServiceContainer extends Container`
`18`	`18`	`{`
`19`		`- private $parameters;`
	`19`	`+ private $parameters = [];`
`20`	`20`	`private $targetDirs = [];`
`21`	`21`
`22`	`22`	`public function __construct()`