Merge pull request #14 from matks/allow-multiple-loads

Handle multiple loads of same file through PHPConfigurationFileLoader
PrestaShop · Mar 4, 2021 · e68212a · e68212a
2 parents 6d88aba + d79a121
commit e68212a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/PHPConfigurationLoader/PHPConfigurationFileLoader.php b/src/PHPConfigurationLoader/PHPConfigurationFileLoader.php
@@ -35,7 +35,7 @@ public function __construct(string $filepath)
     public function load(): array
     {
         if ($this->configurationCache === null) {
-            $this->configurationCache = require_once $this->filepath;
+            $this->configurationCache = require $this->filepath;
         }
 
         return $this->configurationCache;

diff --git a/tests/PHPConfigurationLoader/PHPConfigurationFileLoaderTest.php b/tests/PHPConfigurationLoader/PHPConfigurationFileLoaderTest.php
@@ -35,4 +35,14 @@ public function testBadFilepath()
 
         $loader = new PHPConfigurationFileLoader(__DIR__ . '/../Data/a.php');
     }
+
+    public function testLoadTwiceTheSameFile()
+    {
+        $loader1 = new PHPConfigurationFileLoader(__DIR__ . '/../Data/dummyConfigurationFile.php');
+
+        $loader2 = new PHPConfigurationFileLoader(__DIR__ . '/../Data/dummyConfigurationFile.php');
+
+        $this->assertEquals(['abc'], $loader1->load());
+        $this->assertEquals(['abc'], $loader2->load());
+    }
 }