Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 2e7d6a5221cd · 2019-08-03T20:28:12.000+02:00
* 3.4:
  #32853 Check if $this-&gt;parameters is array.
  [Validator] Improve Fa translations
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -1001,7 +1001,7 @@ private function startClass(string $class, string $baseClass, string $baseClassW
  */
 class $class extends $baseClass
 {
-    private \$parameters;
+    private \$parameters = [];
     private \$targetDirs = [];
 
     public function __construct()
diff --git a/Tests/Fixtures/php/container_alias_deprecation.php b/Tests/Fixtures/php/container_alias_deprecation.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_Aliases_Deprecation extends Container
 {
-    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_as_files.txt b/Tests/Fixtures/php/services9_as_files.txt
@@ -373,7 +373,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_csv_env.php b/Tests/Fixtures/php/services_csv_env.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_CsvParameters 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_default_env.php b/Tests/Fixtures/php/services_default_env.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_DefaultParameters 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_errored_definition.php b/Tests/Fixtures/php/services_errored_definition.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Errored_Definition 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_json_env.php b/Tests/Fixtures/php/services_json_env.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_JsonParameters 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_non_shared_lazy_as_files.txt b/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -45,7 +45,7 @@ class ProjectServiceContainer extends Container
 {
     private $buildParameters;
     private $containerDir;
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
 
     public function __construct(array $buildParameters = [], $containerDir = __DIR__)
@@ -107,4 +107,4 @@ return new \Container%s\ProjectServiceContainer([
     'container.build_time' => %d,
 ], __DIR__.\DIRECTORY_SEPARATOR.'Container%s');
 
-)
+)
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_query_string_env.php b/Tests/Fixtures/php/services_query_string_env.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Test_QueryStringParameters 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 = [];
     private $getService;
 
diff --git a/Tests/Fixtures/php/services_service_locator_argument.php b/Tests/Fixtures/php/services_service_locator_argument.php
@@ -16,7 +16,7 @@
  */
 class Symfony_DI_PhpDumper_Service_Locator_Argument extends Container
 {
-    private $parameters;
+    private $parameters = [];
     private $targetDirs = [];
     private $getService;
 
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 = [];
     private $getService;
 
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
diff --git a/Tests/Fixtures/php/services_url_env.php b/Tests/Fixtures/php/services_url_env.php
diff --git a/Tests/Fixtures/php/services_wither.php b/Tests/Fixtures/php/services_wither.php

Original file line number	Diff line number	Diff line change
`@@ -1001,7 +1001,7 @@ private function startClass(string $class, string $baseClass, string $baseClassW`
`1001`	`1001`	`*/`
`1002`	`1002`	`class $class extends $baseClass`
`1003`	`1003`	`{`
`1004`		`- private \$parameters;`
	`1004`	`+ private \$parameters = [];`
`1005`	`1005`	`private \$targetDirs = [];`
`1006`	`1006`
`1007`	`1007`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`class Symfony_DI_PhpDumper_Test_Aliases_Deprecation extends Container`
`18`	`18`	`{`
`19`		`- private $parameters;`
	`19`	`+ private $parameters = [];`
`20`	`20`	`private $targetDirs = [];`
`21`	`21`
`22`	`22`	`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()`