mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-25 19:48:49 +02:00
N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)
* Update Symfony lib to version ~6.4.0 * Update code missing return type * Add an iTop general configuration entry to store application secret (Symfony mandatory parameter) * Use dependency injection in ExceptionListener & UserProvider classes
This commit is contained in:
@@ -26,7 +26,7 @@ class DefaultsConfigurator extends AbstractServiceConfigurator
|
||||
|
||||
public const FACTORY = 'defaults';
|
||||
|
||||
private $path;
|
||||
private ?string $path;
|
||||
|
||||
public function __construct(ServicesConfigurator $parent, Definition $definition, string $path = null)
|
||||
{
|
||||
@@ -42,17 +42,13 @@ class DefaultsConfigurator extends AbstractServiceConfigurator
|
||||
*
|
||||
* @throws InvalidArgumentException when an invalid tag name or attribute is provided
|
||||
*/
|
||||
final public function tag(string $name, array $attributes = []): self
|
||||
final public function tag(string $name, array $attributes = []): static
|
||||
{
|
||||
if ('' === $name) {
|
||||
throw new InvalidArgumentException('The tag name in "_defaults" must be a non-empty string.');
|
||||
}
|
||||
|
||||
foreach ($attributes as $attribute => $value) {
|
||||
if (null !== $value && !\is_scalar($value)) {
|
||||
throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type.', $name, $attribute));
|
||||
}
|
||||
}
|
||||
$this->validateAttributes($name, $attributes);
|
||||
|
||||
$this->definition->addTag($name, $attributes);
|
||||
|
||||
@@ -66,4 +62,16 @@ class DefaultsConfigurator extends AbstractServiceConfigurator
|
||||
{
|
||||
return $this->parent->instanceof($fqcn);
|
||||
}
|
||||
|
||||
private function validateAttributes(string $tag, array $attributes, array $path = []): void
|
||||
{
|
||||
foreach ($attributes as $name => $value) {
|
||||
if (\is_array($value)) {
|
||||
$this->validateAttributes($tag, $value, [...$path, $name]);
|
||||
} elseif (!\is_scalar($value ?? '')) {
|
||||
$name = implode('.', [...$path, $name]);
|
||||
throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type or an array of scalar-type.', $tag, $name));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user