Skip to content

Commit feb46c6

Browse files
HeahDudeHeahDude
committed
fixup debug for one parameter
1 parent d81b94e commit feb46c6

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,19 @@ public function describe(OutputInterface $output, mixed $object, array $options
4646
(new AnalyzeServiceReferencesPass(false, false))->process($object);
4747
}
4848

49+
$deprecatedParameters = [];
50+
if ($object instanceof ContainerBuilder && isset($options['parameter']) && ($parameterBag = $object->getParameterBag()) instanceof ParameterBag) {
51+
$deprecatedParameters = $parameterBag->allDeprecated();
52+
}
53+
4954
match (true) {
5055
$object instanceof RouteCollection => $this->describeRouteCollection($object, $options),
5156
$object instanceof Route => $this->describeRoute($object, $options),
5257
$object instanceof ParameterBag => $this->describeContainerParameters($object, $options),
5358
$object instanceof ContainerBuilder && !empty($options['env-vars']) => $this->describeContainerEnvVars($this->getContainerEnvVars($object), $options),
5459
$object instanceof ContainerBuilder && isset($options['group_by']) && 'tags' === $options['group_by'] => $this->describeContainerTags($object, $options),
5560
$object instanceof ContainerBuilder && isset($options['id']) => $this->describeContainerService($this->resolveServiceDefinition($object, $options['id']), $options, $object),
56-
$object instanceof ContainerBuilder && isset($options['parameter']) => $this->describeContainerParameter($object->resolveEnvPlaceholders($object->getParameter($options['parameter'])), $object, $options),
61+
$object instanceof ContainerBuilder && isset($options['parameter']) => $this->describeContainerParameter($object->resolveEnvPlaceholders($object->getParameter($options['parameter'])), $deprecatedParameters[$options['parameter']] ?? null, $options),
5762
$object instanceof ContainerBuilder && isset($options['deprecations']) => $this->describeContainerDeprecations($object, $options),
5863
$object instanceof ContainerBuilder => $this->describeContainerServices($object, $options),
5964
$object instanceof Definition => $this->describeContainerDefinition($object, $options),
@@ -110,7 +115,7 @@ abstract protected function describeContainerDefinition(Definition $definition,
110115

111116
abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void;
112117

113-
abstract protected function describeContainerParameter(mixed $parameter, ContainerBuilder $containerBuilder, array $options = []): void;
118+
abstract protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void;
114119

115120
abstract protected function describeContainerEnvVars(array $envs, array $options = []): void;
116121

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,11 @@ protected function describeCallable(mixed $callable, array $options = []): void
147147
$this->writeData($this->getCallableData($callable), $options);
148148
}
149149

150-
protected function describeContainerParameter(mixed $parameter, ContainerBuilder $containerBuilder, array $options = []): void
150+
protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void
151151
{
152152
$key = $options['parameter'] ?? '';
153-
$parameterBag = $containerBuilder->getParameterBag();
154153

155-
if ($deprecation = $parameterBag instanceof ParameterBag ? ($parameterBag->allDeprecated()[$key] ?? false) : false) {
154+
if ($deprecation) {
156155
$parameter = [
157156
'value' => $parameter,
158157
'deprecated' => sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))),

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,9 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
294294
$this->describeContainerDefinition($container->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]), $container);
295295
}
296296

297-
protected function describeContainerParameter(mixed $parameter, ContainerBuilder $containerBuilder, array $options = []): void
297+
protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void
298298
{
299-
$parameterBag = $containerBuilder->getParameterBag();
300-
301299
if (isset($options['parameter'])) {
302-
$deprecation = $parameterBag instanceof ParameterBag ? ($parameterBag->allDeprecated()[$options['parameter']] ?? null) : null;
303300
$this->write(sprintf("%s\n%s\n\n%s%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter), $deprecation ? sprintf("\n\n*(Since %s %s: %s)*", $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))) : ''));
304301
} else {
305302
$this->write($parameter);

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,11 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
415415
$this->describeContainerDefinition($container->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]), $container);
416416
}
417417

418-
protected function describeContainerParameter(mixed $parameter, ContainerBuilder $containerBuilder, array $options = []): void
418+
protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void
419419
{
420420
$parameterName = $options['parameter'];
421-
$parameterBag = $containerBuilder->getParameterBag();
422421

423-
if ($deprecation = $parameterBag instanceof ParameterBag ? ($parameterBag->allDeprecated()[$parameterName] ?? false) : false) {
422+
if ($deprecation) {
424423
$parameterName .= "\n".sprintf('<comment>(Since %s %s: %s)</comment>', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2)));
425424
}
426425

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ protected function describeCallable(mixed $callable, array $options = []): void
9898
$this->writeDocument($this->getCallableDocument($callable));
9999
}
100100

101-
protected function describeContainerParameter(mixed $parameter, ContainerBuilder $containerBuilder, array $options = []): void
101+
protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void
102102
{
103-
$this->writeDocument($this->getContainerParameterDocument($parameter, $containerBuilder, $options));
103+
$this->writeDocument($this->getContainerParameterDocument($parameter, $deprecation, $options));
104104
}
105105

106106
protected function describeContainerEnvVars(array $envs, array $options = []): void
@@ -473,17 +473,15 @@ private function getContainerAliasDocument(Alias $alias, string $id = null): \DO
473473
return $dom;
474474
}
475475

476-
private function getContainerParameterDocument(mixed $parameter, ContainerBuilder $containerBuilder, array $options = []): \DOMDocument
476+
private function getContainerParameterDocument(mixed $parameter, ?array $deprecation, array $options = []): \DOMDocument
477477
{
478478
$dom = new \DOMDocument('1.0', 'UTF-8');
479479
$dom->appendChild($parameterXML = $dom->createElement('parameter'));
480480

481481
if (isset($options['parameter'])) {
482482
$parameterXML->setAttribute('key', $options['parameter']);
483483

484-
$parameterBag = $containerBuilder->getParameterBag();
485-
486-
if ($deprecation = $parameterBag instanceof ParameterBag ? ($parameterBag->allDeprecated()[$options['parameter']] ?? false) : false) {
484+
if ($deprecation) {
487485
$parameterXML->setAttribute('deprecated', sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))));
488486
}
489487
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy