Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[DI] turn $private to protected in dumped container, to make cache:clear BC #25268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2017
Merged

[DI] turn $private to protected in dumped container, to make cache:clear BC #25268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions 8 src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,11 @@ class $class extends $baseClass
{
private \$parameters;
private \$targetDirs = array();
private \$privates = array();

/*{$this->docStar}
* @internal but protected for BC on cache:clear
*/
protected \$privates = array();

public function __construct()
{
Expand Down Expand Up @@ -1058,7 +1062,7 @@ private function addAliases(): string
return $code." );\n";
}

private function addInlineRequires() :string
private function addInlineRequires(): string
{
if (!$this->hotPathTag || !$this->inlineRequires) {
return '';
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractCont
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 ...ony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 ...fony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 ...mfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class ProjectServiceContainer extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
6 changes: 5 additions & 1 deletion 6 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
{
private $parameters;
private $targetDirs = array();
private $privates = array();

/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();

public function __construct()
{
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.