diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Fabien Potencier 2020-03-15 14:51:58 +01:00
parent 14f2d22158
commit 31fe1ef1c8
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -994,13 +994,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
$id = (string) $id;
<<<<<<< HEAD
if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) {
throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id));
=======
if ('' === $id || '\\' === substr($id, -1) || \strlen($id) !== strcspn($id, "\0\r\n'")) {
throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id));
>>>>>>> 3.4
}
unset($this->aliasDefinitions[$id], $this->removedIds[$id]);