Added Plugin::addFile() and used in loadDotEnv to prevent dublicating

hiqdev · Dec 20, 2018 · 0c8c821 · 0c8c821
1 parent 959c971
commit 0c8c821
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -155,7 +155,7 @@ protected function loadDotEnv(Package $package)
     {
         $path = $package->preparePath('.env');
         if (file_exists($path) && class_exists('Dotenv\Dotenv')) {
-            array_push($this->files['dotenv'], $path);
+            $this->addFile($package, 'dotenv', $path);
         }
     }
 
@@ -174,22 +174,27 @@ protected function addFiles(Package $package, array $files)
                 $paths = array_reverse($paths);
             }
             foreach ($paths as $path) {
-                if (!isset($this->files[$name])) {
-                    $this->files[$name] = [];
-                }
-                $path = $package->preparePath($path);
-                if (in_array($path, $this->files[$name], true)) {
-                    continue;
-                }
-                if ('defines' === $name) {
-                    array_unshift($this->files[$name], $path);
-                } else {
-                    array_push($this->files[$name], $path);
-                }
+                $this->addFile($package, $name, $path);
             }
         }
     }
 
+    protected function addFile(Package $package, string $name, string $path)
+    {
+        $path = $package->preparePath($path);
+        if (!isset($this->files[$name])) {
+            $this->files[$name] = [];
+        }
+        if (in_array($path, $this->files[$name], true)) {
+            return;
+        }
+        if ('defines' === $name) {
+            array_unshift($this->files[$name], $path);
+        } else {
+            array_push($this->files[$name], $path);
+        }
+    }
+
     /**
      * Sets [[packages]].
      * @param Package[] $packages