comparison vendor/symfony/dependency-injection/Compiler/ResolveChildDefinitionsPass.php @ 16:c2387f117808

Routine composer update
author Chris Cannam
date Tue, 10 Jul 2018 15:07:59 +0100
parents 1fec387a4317
children 129ea1e6d783
comparison
equal deleted inserted replaced
15:e200cb7efeb3 16:c2387f117808
101 $def->setPublic($parentDef->isPublic()); 101 $def->setPublic($parentDef->isPublic());
102 $def->setLazy($parentDef->isLazy()); 102 $def->setLazy($parentDef->isLazy());
103 $def->setAutowired($parentDef->isAutowired()); 103 $def->setAutowired($parentDef->isAutowired());
104 $def->setChanges($parentDef->getChanges()); 104 $def->setChanges($parentDef->getChanges());
105 105
106 $def->setBindings($parentDef->getBindings()); 106 $def->setBindings($definition->getBindings() + $parentDef->getBindings());
107 107
108 // overwrite with values specified in the decorator 108 // overwrite with values specified in the decorator
109 $changes = $definition->getChanges(); 109 $changes = $definition->getChanges();
110 if (isset($changes['class'])) { 110 if (isset($changes['class'])) {
111 $def->setClass($definition->getClass()); 111 $def->setClass($definition->getClass());