Edit the helpers

hackphp · Aug 21, 2021 · 01ee403 · 01ee403
1 parent 43778b9
commit 01ee403
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
             "Hackphp\\Config\\": "src/"
         },
         "files": [
-            "tests/helpers.php"
+            "src/helpers.php"
         ]
     },
     "autoload-dev": {

diff --git a/src/helpers.php b/src/helpers.php
@@ -8,12 +8,12 @@
      */
     function configPath($path = null)
     {
-        $dir = __DIR__ . "/config";
+        $dir = __DIR__ . "/../config";
 
         if ($path) {
             $dir .= "/" . $path;
         }
-        
+
         return $dir;
     }
 }

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -3,11 +3,18 @@
 namespace Hackphp\Config\Tests;
 
 use Hackphp\Config\Config;
-use Hackphp\Config\Parsers\ArrayParser;
 use PHPUnit\Framework\TestCase;
+use Hackphp\Config\Parsers\ArrayParser;
 
 class ConfigTest extends TestCase
 {
+    protected string $configPath;
+
+    protected function setUp(): void
+    {
+        $this->configPath = __DIR__ . "/config";
+    }
+
     /** @test */
     public function it_can_create_instance_with_default_configs()
     {
@@ -24,7 +31,7 @@ public function it_can_create_instance_with_default_configs()
     /** @test */
     public function it_loads_and_parse_all_directory_files_successfully()
     {
-        $parser = new ArrayParser(configPath());
+        $parser = new ArrayParser($this->configPath);
 
         $config = new Config();
         $config->addParser($parser);
@@ -37,7 +44,7 @@ public function it_loads_and_parse_all_directory_files_successfully()
     /** @test */
     public function it_loads_the_default_value_if_the_key_not_found()
     {
-        $parser = new ArrayParser(configPath());
+        $parser = new ArrayParser($this->configPath);
 
         $config = new Config();
         $config->addParser($parser);

diff --git a/tests/Parsers/ArrayParserTest.php b/tests/Parsers/ArrayParserTest.php
@@ -2,24 +2,31 @@
 
 namespace Hackphp\Config\Tests\Parsers;
 
+use PHPUnit\Framework\TestCase;
 use Hackphp\Config\Contracts\Parser;
 use Hackphp\Config\Parsers\ArrayParser;
-use PHPUnit\Framework\TestCase;
 
 class ArrayParserTest extends TestCase
 {
+    protected string $configPath;
+
+    protected function setUp(): void
+    {
+        $this->configPath = __DIR__ . "/../config";
+    }
+
     /** @test */
     public function it_must_be_instance_of_parser_interface()
     {
-        $parser = new ArrayParser(configPath());
+        $parser = new ArrayParser($this->configPath);
 
         $this->assertInstanceOf(Parser::class, $parser);
     }
 
     /** @test */
     public function it_parses_files_from_the_given_directory()
     {
-        $parser = new ArrayParser(configPath("server"));
+        $parser = new ArrayParser($this->configPath . "/server");
         $parsed = $parser->parse();
 
         $expected = [
@@ -35,7 +42,7 @@ public function it_parses_files_from_the_given_directory()
     /** @test */
     public function it_can_parse_nested_files()
     {
-        $parser = new ArrayParser(configPath());
+        $parser = new ArrayParser($this->configPath);
         $parsed = $parser->parse();
 
         $expected = [