Skip to content

Commit 8c6de56

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: Fixed the wrong source name and the ja translation [SecurityBundle] disable the init:acl command if ACL is not used [DI] remove useless condition around unset
2 parents 7a201bf + ee130d7 commit 8c6de56

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Container.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
305305
$service = $this->$method();
306306
} catch (\Exception $e) {
307307
unset($this->loading[$id]);
308-
309-
if (array_key_exists($id, $this->services)) {
310-
unset($this->services[$id]);
311-
}
308+
unset($this->services[$id]);
312309

313310
if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
314311
return;

Definition.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,7 @@ public function hasTag($name)
495495
*/
496496
public function clearTag($name)
497497
{
498-
if (isset($this->tags[$name])) {
499-
unset($this->tags[$name]);
500-
}
498+
unset($this->tags[$name]);
501499

502500
return $this;
503501
}

0 commit comments

Comments
 (0)