Core and composer updates
This commit is contained in:
parent
a82634bb98
commit
62cac30480
1118 changed files with 21770 additions and 6306 deletions
|
|
@ -847,7 +847,7 @@ EOF;
|
|||
private function startClass($class, $baseClass, $namespace)
|
||||
{
|
||||
$bagClass = $this->container->isFrozen() ? 'use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;' : 'use Symfony\Component\DependencyInjection\ParameterBag\\ParameterBag;';
|
||||
$namespaceLine = $namespace ? "namespace $namespace;\n" : '';
|
||||
$namespaceLine = $namespace ? "\nnamespace $namespace;\n" : '';
|
||||
|
||||
return <<<EOF
|
||||
<?php
|
||||
|
|
@ -1351,9 +1351,12 @@ EOF;
|
|||
if (null !== $this->definitionVariables && $this->definitionVariables->contains($value)) {
|
||||
return $this->dumpValue($this->definitionVariables->offsetGet($value), $interpolate);
|
||||
}
|
||||
if (count($value->getMethodCalls()) > 0) {
|
||||
if ($value->getMethodCalls()) {
|
||||
throw new RuntimeException('Cannot dump definitions which have method calls.');
|
||||
}
|
||||
if ($value->getProperties()) {
|
||||
throw new RuntimeException('Cannot dump definitions which have properties.');
|
||||
}
|
||||
if (null !== $value->getConfigurator()) {
|
||||
throw new RuntimeException('Cannot dump definitions which have a configurator.');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -215,6 +215,10 @@ class XmlDumper extends Dumper
|
|||
$service->appendChild($autowiringType);
|
||||
}
|
||||
|
||||
if ($definition->isAbstract()) {
|
||||
$service->setAttribute('abstract', 'true');
|
||||
}
|
||||
|
||||
if ($callable = $definition->getConfigurator()) {
|
||||
$configurator = $this->document->createElement('configurator');
|
||||
|
||||
|
|
|
|||
|
|
@ -93,11 +93,11 @@ class YamlDumper extends Dumper
|
|||
}
|
||||
|
||||
if ($definition->isSynthetic()) {
|
||||
$code .= sprintf(" synthetic: true\n");
|
||||
$code .= " synthetic: true\n";
|
||||
}
|
||||
|
||||
if ($definition->isSynchronized(false)) {
|
||||
$code .= sprintf(" synchronized: true\n");
|
||||
$code .= " synchronized: true\n";
|
||||
}
|
||||
|
||||
if ($definition->isDeprecated()) {
|
||||
|
|
@ -121,7 +121,7 @@ class YamlDumper extends Dumper
|
|||
}
|
||||
|
||||
if ($definition->isLazy()) {
|
||||
$code .= sprintf(" lazy: true\n");
|
||||
$code .= " lazy: true\n";
|
||||
}
|
||||
|
||||
if ($definition->getFactoryMethod(false)) {
|
||||
|
|
|
|||
Reference in a new issue