From aa05b9b73520e0c16af455aeb6b54cf8c7b0e885 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Sun, 1 Dec 2013 01:04:55 -0500 Subject: [PATCH 1/4] forgot to add definition of dumped container member variable parameters --- src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 14ec9adb9db17..ad22c6574721d 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -788,6 +788,8 @@ private function addFrozenConstructor() { $code = << Date: Sun, 1 Dec 2013 01:18:41 -0500 Subject: [PATCH 2/4] plug template missing parameter entry for comparison on tests --- .../DependencyInjection/Tests/Fixtures/php/services10.php | 2 ++ .../DependencyInjection/Tests/Fixtures/php/services11.php | 2 ++ .../DependencyInjection/Tests/Fixtures/php/services9.php | 2 ++ .../Tests/Fixtures/php/services9_compiled.php | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php index d1f9c0d1664cb..0e3661fd4a0f2 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php @@ -16,6 +16,8 @@ */ class ProjectServiceContainer extends Container { + protected $parameters; + /** * Constructor. */ diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php index 58697423f6961..8c50b55138543 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php @@ -16,6 +16,8 @@ */ class ProjectServiceContainer extends Container { + protected $parameters; + /** * Constructor. */ diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index 522df356fa5f5..443e4a6610b6f 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -16,6 +16,8 @@ */ class ProjectServiceContainer extends Container { + protected $parameters; + /** * Constructor. */ diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index 4505e51d0ac3c..0e911f7b67c60 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -16,6 +16,8 @@ */ class ProjectServiceContainer extends Container { + protected $parameters; + /** * Constructor. */ From e876ce03f5f08f38d140a5bfa2abfc659cb16a28 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Sun, 1 Dec 2013 01:31:39 -0500 Subject: [PATCH 3/4] quick fix --- .../DependencyInjection/Tests/Fixtures/php/services9.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index 443e4a6610b6f..522df356fa5f5 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -16,8 +16,6 @@ */ class ProjectServiceContainer extends Container { - protected $parameters; - /** * Constructor. */ From f58a6e42d952d6e270725c085123a0303be4127e Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 18 Dec 2013 04:55:46 -0500 Subject: [PATCH 4/4] switch scope of member parameters to private --- src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php | 2 +- .../DependencyInjection/Tests/Fixtures/php/services10.php | 2 +- .../DependencyInjection/Tests/Fixtures/php/services11.php | 2 +- .../Tests/Fixtures/php/services9_compiled.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index ad22c6574721d..ee291b12bb06a 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -788,7 +788,7 @@ private function addFrozenConstructor() { $code = <<