Skip to content

Commit f476f7e

Browse files
committed
Merge pull request laminas#43 from GeeH/geeh/laminas#3-hotfix-from-old-repo
1 parent 103e560 commit f476f7e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/ServiceManager.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
use ProxyManager\GeneratorStrategy\FileWriterGeneratorStrategy;
2525

2626
use function array_intersect;
27-
use function array_merge_recursive;
2827
use function class_exists;
2928
use function get_class;
3029
use function gettype;
@@ -754,13 +753,13 @@ private function createLazyServiceDelegatorFactory()
754753
private function mergeDelegators(array $config)
755754
{
756755
foreach ($config as $key => $delegators) {
757-
if (!isset($this->delegators[$key])) {
756+
if (! array_key_exists($key, $this->delegators)) {
758757
$this->delegators[$key] = $delegators;
759758
continue;
760759
}
761760

762761
foreach ($delegators as $delegator) {
763-
if (!in_array($delegator, $this->delegators[$key], true)) {
762+
if (! in_array($delegator, $this->delegators[$key], true)) {
764763
$this->delegators[$key][] = $delegator;
765764
}
766765
}

0 commit comments

Comments
 (0)