composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6002 - Update Symfony libs to 5.4.19

Browse Source
This commit is contained in:
Molkobain
2023-02-22 18:19:56 +01:00
parent 5ee603f2ba
commit d997e36de0
43 changed files with 337 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
View File

@@ -245,7 +245,7 @@ class JsonDescriptor extends Descriptor
if ($factory[0] instanceof Reference) {
$data['factory_service'] = (string) $factory[0];
} elseif ($factory[0] instanceof Definition) {
throw new \InvalidArgumentException('Factory is not describable.');
$data['factory_service'] = sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
} else {
$data['factory_class'] = $factory[0];
}
@@ -361,7 +361,7 @@ class JsonDescriptor extends Descriptor
}
$data['name'] = $r->name;
if ($class = $r->getClosureScopeClass()) {
if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
$data['class'] = $class->name;
if (!$r->getClosureThis()) {
$data['static'] = true;

4
lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
View File

@@ -224,7 +224,7 @@ class MarkdownDescriptor extends Descriptor
if ($factory[0] instanceof Reference) {
$output .= "\n".'- Factory Service: `'.$factory[0].'`';
} elseif ($factory[0] instanceof Definition) {
throw new \InvalidArgumentException('Factory is not describable.');
$output .= "\n".sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
} else {
$output .= "\n".'- Factory Class: `'.$factory[0].'`';
}
@@ -377,7 +377,7 @@ class MarkdownDescriptor extends Descriptor
}
$string .= "\n".sprintf('- Name: `%s`', $r->name);
if ($class = $r->getClosureScopeClass()) {
if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
$string .= "\n".sprintf('- Class: `%s`', $class->name);
if (!$r->getClosureThis()) {
$string .= "\n- Static: yes";

4
lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
View File

@@ -315,7 +315,7 @@ class TextDescriptor extends Descriptor
if ($factory[0] instanceof Reference) {
$tableRows[] = ['Factory Service', $factory[0]];
} elseif ($factory[0] instanceof Definition) {
throw new \InvalidArgumentException('Factory is not describable.');
$tableRows[] = ['Factory Service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
} else {
$tableRows[] = ['Factory Class', $factory[0]];
}
@@ -614,7 +614,7 @@ class TextDescriptor extends Descriptor
if (str_contains($r->name, '{closure}')) {
return 'Closure()';
}
if ($class = $r->getClosureScopeClass()) {
if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
return sprintf('%s::%s()', $class->name, $r->name);
}

4
lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
View File

@@ -324,7 +324,7 @@ class XmlDescriptor extends Descriptor
if ($factory[0] instanceof Reference) {
$factoryXML->setAttribute('service', (string) $factory[0]);
} elseif ($factory[0] instanceof Definition) {
throw new \InvalidArgumentException('Factory is not describable.');
$factoryXML->setAttribute('service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
} else {
$factoryXML->setAttribute('class', $factory[0]);
}
@@ -548,7 +548,7 @@ class XmlDescriptor extends Descriptor
}
$callableXML->setAttribute('name', $r->name);
if ($class = $r->getClosureScopeClass()) {
if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
$callableXML->setAttribute('class', $class->name);
if (!$r->getClosureThis()) {
$callableXML->setAttribute('static', 'true');