Merge pull request #91 from rodrigopedra/master

[Laravel 7] fix dotenv 4 checks
beyondcode · May 29, 2020 · fc663d5 · fc663d5
2 parents 14cb57c + 2c8379d
commit fc663d5
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/src/Checks/ExampleEnvironmentVariablesAreSet.php b/src/Checks/ExampleEnvironmentVariablesAreSet.php
@@ -29,6 +29,10 @@ public function name(array $config): string
      */
     public function check(array $config): bool
     {
+        if (method_exists(Dotenv::class, 'createImmutable')) {
+            return $this->checkForDotEnvV4();
+        }
+
         if (interface_exists(\Dotenv\Environment\FactoryInterface::class)) {
             $examples = Dotenv::create(base_path(), '.env.example');
             $actual = Dotenv::create(base_path(), '.env');
@@ -46,6 +50,23 @@ public function check(array $config): bool
         return $this->envVariables->isEmpty();
     }
 
+    /**
+     * Perform the verification of this check for DotEnv v4.
+     *
+     * @return bool
+     */
+    private function checkForDotEnvV4(): bool
+    {
+        $examples = Dotenv::createImmutable(base_path(), '.env.example');
+        $actual = Dotenv::createImmutable(base_path(), '.env');
+
+        $this->envVariables = Collection::make($examples->safeLoad())
+            ->diffKeys($actual->safeLoad())
+            ->keys();
+
+        return $this->envVariables->isEmpty();
+    }
+
     /**
      * The error message to display in case the check does not pass.
      *

diff --git a/src/Checks/ExampleEnvironmentVariablesAreUpToDate.php b/src/Checks/ExampleEnvironmentVariablesAreUpToDate.php
@@ -29,6 +29,10 @@ public function name(array $config): string
      */
     public function check(array $config): bool
     {
+        if (method_exists(Dotenv::class, 'createImmutable')) {
+            return $this->checkForDotEnvV4();
+        }
+
         if (interface_exists(\Dotenv\Environment\FactoryInterface::class)) {
             $examples = Dotenv::create(base_path(), '.env.example');
             $actual = Dotenv::create(base_path(), '.env');
@@ -46,6 +50,23 @@ public function check(array $config): bool
         return $this->envVariables->isEmpty();
     }
 
+    /**
+     * Perform the verification of this check for DotEnv v4.
+     *
+     * @return bool
+     */
+    private function checkForDotEnvV4(): bool
+    {
+        $examples = Dotenv::createImmutable(base_path(), '.env.example');
+        $actual = Dotenv::createImmutable(base_path(), '.env');
+
+        $this->envVariables = Collection::make($actual->safeLoad())
+            ->diffKeys($examples->safeLoad())
+            ->keys();
+
+        return $this->envVariables->isEmpty();
+    }
+
     /**
      * The error message to display in case the check does not pass.
      *