From a668ed2b849eb743726085b68f74febbac4349e5 Mon Sep 17 00:00:00 2001 From: Brabli <67018167+Brabli@users.noreply.github.com> Date: Sun, 14 Aug 2022 17:52:03 +0100 Subject: [PATCH] Changes --- config/services.yaml | 3 --- src/DependencyInjection/PcmIconExtension.php | 5 ++--- src/Twig/Functions/IconExtension.php | 9 +++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/config/services.yaml b/config/services.yaml index fd90929..d95e089 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -6,9 +6,6 @@ services: pcm_icon.icon_extension: public: true class: Pcm\IconBundle\Twig\Functions\IconExtension - arguments: - $directories: [] - $palletes: [] Pcm\IconBundle\Twig\Functions\IconExtension: public: false diff --git a/src/DependencyInjection/PcmIconExtension.php b/src/DependencyInjection/PcmIconExtension.php index 43d645b..64a8e3e 100644 --- a/src/DependencyInjection/PcmIconExtension.php +++ b/src/DependencyInjection/PcmIconExtension.php @@ -25,8 +25,7 @@ class PcmIconExtension extends Extension $definition = $container->getDefinition('pcm_icon.icon_extension'); - $definition->replaceArgument('$directories', $config['directories']); - $definition->replaceArgument('$palletes', $config['palletes']); - dump($configs); + $definition->addArgument($config['directories']); + $definition->addArgument($config['palletes']); } } diff --git a/src/Twig/Functions/IconExtension.php b/src/Twig/Functions/IconExtension.php index 85a4367..e32826d 100644 --- a/src/Twig/Functions/IconExtension.php +++ b/src/Twig/Functions/IconExtension.php @@ -17,9 +17,7 @@ final class IconExtension extends AbstractExtension 'size' => self::DEFAULT_SIZE ]; - public function __construct(private array $directories, private array $palletes) { - dump($this->directories); - } + public function __construct(private array $directories, private array $palletes) {} /** * @inheritDoc @@ -71,9 +69,9 @@ final class IconExtension extends AbstractExtension { foreach ($this->directories as $directory) { $potentialFilepath = sprintf('%s/%s.svg', $directory, $iconName); - if (file_exists($potentialFilepath)) { + + if (file_exists($potentialFilepath)) return $potentialFilepath; - } } throw new IconNotFound(sprintf('File "%s.svg" not found in %s', $iconName, implode(', ', $this->directories))); @@ -94,7 +92,6 @@ final class IconExtension extends AbstractExtension if (!is_string($title) && null !== $title) throw new \TypeError('Title must be a string!'); - if ('' === $title) throw new \InvalidArgumentException('Title string must not be empty!');