fix merge
This commit is contained in:
parent
aa964e1c52
commit
12c1a01ac0
@ -21,21 +21,24 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
private $parameters;
|
||||
private $targetDirs = array();
|
||||
|
||||
/**
|
||||
* @internal but protected for BC on cache:clear
|
||||
*/
|
||||
protected $privates = array();
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->services = array();
|
||||
$this->services = $this->privates = array();
|
||||
|
||||
$this->aliases = array();
|
||||
}
|
||||
|
||||
public function getRemovedIds()
|
||||
public function reset()
|
||||
{
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
$this->privates = array();
|
||||
parent::reset();
|
||||
}
|
||||
|
||||
public function compile()
|
||||
@ -48,10 +51,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
return true;
|
||||
}
|
||||
|
||||
public function isFrozen()
|
||||
public function getRemovedIds()
|
||||
{
|
||||
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
|
||||
|
||||
return true;
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -21,19 +21,22 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
private $parameters;
|
||||
private $targetDirs = array();
|
||||
|
||||
/**
|
||||
* @internal but protected for BC on cache:clear
|
||||
*/
|
||||
protected $privates = array();
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->services = array();
|
||||
$this->services = $this->privates = array();
|
||||
|
||||
$this->aliases = array();
|
||||
}
|
||||
|
||||
public function getRemovedIds()
|
||||
public function reset()
|
||||
{
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
$this->privates = array();
|
||||
parent::reset();
|
||||
}
|
||||
|
||||
public function compile()
|
||||
@ -46,10 +49,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
return true;
|
||||
}
|
||||
|
||||
public function isFrozen()
|
||||
public function getRemovedIds()
|
||||
{
|
||||
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
|
||||
|
||||
return true;
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -21,21 +21,24 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
private $parameters;
|
||||
private $targetDirs = array();
|
||||
|
||||
/**
|
||||
* @internal but protected for BC on cache:clear
|
||||
*/
|
||||
protected $privates = array();
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->services = array();
|
||||
$this->services = $this->privates = array();
|
||||
|
||||
$this->aliases = array();
|
||||
}
|
||||
|
||||
public function getRemovedIds()
|
||||
public function reset()
|
||||
{
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
$this->privates = array();
|
||||
parent::reset();
|
||||
}
|
||||
|
||||
public function compile()
|
||||
@ -48,10 +51,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
return true;
|
||||
}
|
||||
|
||||
public function isFrozen()
|
||||
public function getRemovedIds()
|
||||
{
|
||||
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
|
||||
|
||||
return true;
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -21,19 +21,22 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
private $parameters;
|
||||
private $targetDirs = array();
|
||||
|
||||
/**
|
||||
* @internal but protected for BC on cache:clear
|
||||
*/
|
||||
protected $privates = array();
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->services = array();
|
||||
$this->services = $this->privates = array();
|
||||
|
||||
$this->aliases = array();
|
||||
}
|
||||
|
||||
public function getRemovedIds()
|
||||
public function reset()
|
||||
{
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
$this->privates = array();
|
||||
parent::reset();
|
||||
}
|
||||
|
||||
public function compile()
|
||||
@ -46,10 +49,11 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
|
||||
return true;
|
||||
}
|
||||
|
||||
public function isFrozen()
|
||||
public function getRemovedIds()
|
||||
{
|
||||
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
|
||||
|
||||
return true;
|
||||
return array(
|
||||
'Psr\\Container\\ContainerInterface' => true,
|
||||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user