|
@@ 418-423 (lines=6) @@
|
| 415 |
|
$services = array($this->services, $name => $this->scopedServices[$name]); |
| 416 |
|
unset($this->scopedServices[$name]); |
| 417 |
|
|
| 418 |
|
foreach ($this->scopeChildren[$name] as $child) { |
| 419 |
|
if (isset($this->scopedServices[$child])) { |
| 420 |
|
$services[$child] = $this->scopedServices[$child]; |
| 421 |
|
unset($this->scopedServices[$child]); |
| 422 |
|
} |
| 423 |
|
} |
| 424 |
|
|
| 425 |
|
// update global map |
| 426 |
|
$this->services = call_user_func_array('array_diff_key', $services); |
|
@@ 460-465 (lines=6) @@
|
| 457 |
|
$services = array($this->services, $this->scopedServices[$name]); |
| 458 |
|
unset($this->scopedServices[$name]); |
| 459 |
|
|
| 460 |
|
foreach ($this->scopeChildren[$name] as $child) { |
| 461 |
|
if (isset($this->scopedServices[$child])) { |
| 462 |
|
$services[] = $this->scopedServices[$child]; |
| 463 |
|
unset($this->scopedServices[$child]); |
| 464 |
|
} |
| 465 |
|
} |
| 466 |
|
|
| 467 |
|
// update global map |
| 468 |
|
$this->services = call_user_func_array('array_diff_key', $services); |