fix merge

This commit is contained in:
Nicolas Grekas 2018-10-02 15:06:13 +02:00
parent a9c90ca77a
commit f34fcb66ea

View File

@ -19,11 +19,6 @@ class ProjectServiceContainer extends Container
private $parameters; private $parameters;
private $targetDirs = array(); private $targetDirs = array();
/**
* @internal but protected for BC on cache:clear
*/
protected $privates = array();
public function __construct() public function __construct()
{ {
$this->services = $this->privates = array(); $this->services = $this->privates = array();
@ -35,12 +30,6 @@ class ProjectServiceContainer extends Container
); );
} }
public function reset()
{
$this->privates = array();
parent::reset();
}
public function compile() public function compile()
{ {
throw new LogicException('You cannot compile a dumped container that was already compiled.'); throw new LogicException('You cannot compile a dumped container that was already compiled.');