Merge branch '3.4'

* 3.4:
  [DI] Check privates before resolving alias in Container::initialized
  [FrameworkBundle] Fix tests
This commit is contained in:
Nicolas Grekas 2017-07-13 10:49:34 +02:00
commit f52a35c9b1

View File

@ -294,14 +294,14 @@ class Container implements ResettableContainerInterface
return false;
}
if (isset($this->aliases[$id])) {
$id = $this->aliases[$id];
}
if (isset($this->privates[$id])) {
@trigger_error(sprintf('Checking for the initialization of the "%s" private service is deprecated since Symfony 3.4 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
}
if (isset($this->aliases[$id])) {
$id = $this->aliases[$id];
}
return isset($this->services[$id]);
}