10000 fix merge · symfony/symfony@f34fcb6 · GitHub
[go: up one dir, main page]

Skip to content

Commit f34fcb6

Browse files
fix merge
1 parent a9c90ca commit f34fcb6

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class ProjectServiceContainer extends Container
1919
private $parameters;
2020
private $targetDirs = array();
2121

22-
/**
23-
* @internal but protected for BC on cache:clear
24-
*/
25-
protected $privates = array();
26-
2722
public function __construct()
2823
{
2924
$this->services = $this->privates = array();
@@ -35,12 +30,6 @@ public function __construct()
3530
);
3631
}
3732

38-
public function reset()
39-
{
40-
$this->privates = array();
41-
parent::reset();
42-
}
43-
4433
public function compile()
4534
{
4635
throw new LogicException('You cannot compile a dumped container that was already compiled.');

0 commit comments

Comments
 (0)
0