Merge pull request #343 from phel-lang/refactor/phel-config-using-arg…

…ument-unpacking Using arg unpacking in config dirs setters
phel-lang · Sep 12, 2021 · 58cfddb · 58cfddb
2 parents 7bc6a12 + 46013b3
commit 58cfddb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git 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
@@ -6,29 +6,28 @@
 
 final class ExportConfiguration
 {
+    /** @var list<string> */
     private array $directories = [];
+
     private string $namespacePrefix = '';
+
     private string $targetDirectory = '';
 
     public static function empty(): self
     {
         return new self();
     }
 
+    /**
+     * @return list<string>
+     */
     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
@@ -6,6 +6,7 @@
 
 final class TestConfiguration
 {
+    /** @var list<string> */
     private array $directories = [];
 
     public static function empty(): self
@@ -14,21 +15,17 @@ public static function empty(): self
     }
 
     /**
-     * @param string|array $directories
+     * @return list<string>
      */
-    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;
-    }
 }