From e1284d86a96a34fb2245b542a4b74012f006c557 Mon Sep 17 00:00:00 2001 From: Giorgio Pogliani Date: Fri, 8 Apr 2022 11:51:41 +0200 Subject: [PATCH] Refactoting --- src/Extension/ComponentExtension.php | 8 ++++---- src/TokenParser/ComponentTokenParser.php | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Extension/ComponentExtension.php b/src/Extension/ComponentExtension.php index c8ac1a5..f14d7b7 100644 --- a/src/Extension/ComponentExtension.php +++ b/src/Extension/ComponentExtension.php @@ -10,17 +10,17 @@ class ComponentExtension extends AbstractExtension { - private Configuration $options; + private Configuration $configuration; - public function __construct(Configuration $options) + public function __construct(Configuration $configuration) { - $this->options = $options; + $this->configuration = $configuration; } public function getTokenParsers() { return [ - new ComponentTokenParser($this->options), + new ComponentTokenParser($this->configuration), new SlotTokenParser(), ]; } diff --git a/src/TokenParser/ComponentTokenParser.php b/src/TokenParser/ComponentTokenParser.php index 05ce63a..293dbf0 100644 --- a/src/TokenParser/ComponentTokenParser.php +++ b/src/TokenParser/ComponentTokenParser.php @@ -11,20 +11,16 @@ final class ComponentTokenParser extends IncludeTokenParser { - /** - * @var String Directory for the components files. - */ - private $path; + private Configuration $configuration; /** * ComponentTokenParser constructor. * @param string $tag * @param string $path */ - public function __construct(Configuration $options = null) + public function __construct(Configuration $configuration) { - $this->configuration = $options; - $this->path = $this->configuration->getTemplatesPath(); + $this->configuration = $configuration; } public function getComponentPath(string $name) @@ -33,7 +29,7 @@ public function getComponentPath(string $name) return $name . '.' . $this->configuration->getTemplatesExtension(); } - return rtrim($this->path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $name . '.' . $this->configuration->getTemplatesExtension(); + return rtrim($this->configuration->getTemplatesPath(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $name . '.' . $this->configuration->getTemplatesExtension(); } public function parse(Token $token): Node