Skip to content

Commit

Permalink
Merge branch '3.4'
Browse files Browse the repository at this point in the history
* 3.4:
  [DI] Check privates before resolving alias in Container::initialized
  [FrameworkBundle] Fix tests
  • Loading branch information
nicolas-grekas committed Jul 13, 2017
2 parents d0ad95f + f90487d commit ae302d7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Container.php
Expand Up @@ -294,14 +294,14 @@ public function initialized($id)
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]);
}

Expand Down

0 comments on commit ae302d7

Please sign in to comment.