Merge pull request #106 from thomascombe/fix/dotv5-cache

Author: mpociot

composer.json

@@ -26,7 +26,7 @@
         "larapack/dd": "^1.0",
         "mockery/mockery": "^1.0",
         "orchestra/testbench": "~3.5|~3.8",
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^7.0|^8.0",
         "predis/predis": "^1.1",
         "scrutinizer/ocular": "^1.5"
     },

src/Checks/ExampleEnvironmentVariablesAreSet.php

@@ -29,6 +29,9 @@ public function name(array $config): string
      */
     public function check(array $config): bool
     {
+        if (method_exists(Dotenv::class, 'createUnsafeImmutable')) {
+            return $this->checkForDotEnvV5();
+        }
         if (method_exists(Dotenv::class, 'createImmutable')) {
             return $this->checkForDotEnvV4();
         }
@@ -67,6 +70,23 @@ private function checkForDotEnvV4(): bool
         return $this->envVariables->isEmpty();
     }
 
+    /**
+     * Perform the verification of this check for DotEnv v5.
+     *
+     * @return bool
+     */
+    private function checkForDotEnvV5(): bool
+    {
+        $examples = Dotenv::createMutable(base_path(), '.env.example');
+        $actual = Dotenv::createMutable(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.
      *

tests/CorrectPhpVersionIsInstalledTest.php

@@ -60,7 +60,7 @@ public function it_accepts_version_with_asterix()
 
         $data = file_get_contents(__DIR__ . '/fixtures/composer.json');
 
-        $data = str_replace('"php": "^7.1.3",', '"php": "7.*",', $data);
+        $data = str_replace('"php": "^7.1.3",', '"php": "7.*|8.*",', $data);
 
         $fileSystemMock->shouldReceive('get')
             ->andReturn($data);