From 46013b36c99390d20f22c6a6577d04a4ccac7e01 Mon Sep 17 00:00:00 2001 From: Chemaclass Date: Sat, 11 Sep 2021 12:30:26 +0200 Subject: [PATCH] Using arg unpacking in config dirs setters --- phel-config.php | 2 +- src/php/Config/ExportConfiguration.php | 15 +++++++-------- src/php/Config/TestConfiguration.php | 17 +++++++---------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/phel-config.php b/phel-config.php index cfaded5f..a44bf32f 100644 --- a/phel-config.php +++ b/phel-config.php @@ -10,6 +10,6 @@ ->setTestConfiguration((new TestConfiguration()) ->setDirectories('tests/phel/')) ->setExportConfiguration((new ExportConfiguration()) - ->setDirectories(['src/phel']) + ->setDirectories('src/phel') ->setNamespacePrefix('PhelGenerated') ->setTargetDirectory('src/PhelGenerated')); diff --git a/src/php/Config/ExportConfiguration.php b/src/php/Config/ExportConfiguration.php index 23fe3bb5..cac5d3d7 100644 --- a/src/php/Config/ExportConfiguration.php +++ b/src/php/Config/ExportConfiguration.php @@ -6,8 +6,11 @@ final class ExportConfiguration { + /** @var list */ private array $directories = []; + private string $namespacePrefix = ''; + private string $targetDirectory = ''; public static function empty(): self @@ -15,20 +18,16 @@ public static function empty(): self return new self(); } + /** + * @return list + */ public function getDirectories(): array { return $this->directories; } - /** - * @param string|array $directories - */ - public function setDirectories($directories): self + public function setDirectories(string ...$directories): self { - if (is_string($directories)) { - $directories = [$directories]; - } - $this->directories = $directories; return $this; diff --git a/src/php/Config/TestConfiguration.php b/src/php/Config/TestConfiguration.php index 2ee15f74..5379f645 100644 --- a/src/php/Config/TestConfiguration.php +++ b/src/php/Config/TestConfiguration.php @@ -6,6 +6,7 @@ final class TestConfiguration { + /** @var list */ private array $directories = []; public static function empty(): self @@ -14,21 +15,17 @@ public static function empty(): self } /** - * @param string|array $directories + * @return list */ - public function setDirectories($directories): self + public function getDirectories(): array { - if (is_string($directories)) { - $directories = [$directories]; - } + return $this->directories; + } + public function setDirectories(string ...$directories): self + { $this->directories = $directories; return $this; } - - public function getDirectories(): array - { - return $this->directories; - } }