Merge pull request #7 from codemix/upgrade-phpdotenv-5

Upgrade to DotEnv 5.x

Author: mikehaertl

.travis.yml

@@ -5,10 +5,6 @@ php:
   - "7.3"
   - "7.2"
   - "7.1"
-  - "7.0"
-  - "5.6"
-  - "5.5"
-  - "5.4"
 
 install:
   - sudo apt-get update

composer.json

@@ -10,8 +10,9 @@
     }
   ],
   "require": {
+    "php": "^7.1.3 || ^8.0",
     "yiisoft/yii2": "*",
-    "vlucas/phpdotenv": "2.5.*"
+    "vlucas/phpdotenv": "^5.0"
   },
   "require-dev": {
     "phpunit/phpunit": ">4.0 <8"

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="true"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>

src/Config.php

@@ -231,7 +231,7 @@ public static function bootstrap($directory, $vendor = null, $initEnv = true)
     public static function initEnv($directory = null)
     {
         if ($directory !== null && file_exists($directory . DIRECTORY_SEPARATOR . '.env')) {
-            $dotenv = new \Dotenv\Dotenv($directory);
+            $dotenv = \Dotenv\Dotenv::createImmutable($directory);
             $dotenv->load();
         }
 

tests/EnvTest.php

@@ -61,11 +61,11 @@ public function testCanGetEnvVarsFromEnvFile()
 
     public function testEnvFileDoesNotClearEnvVars()
     {
-        putenv('TEST1=654');
-        putenv('TEST2=xyz');
+        $_ENV['TEST1'] = '654';
+        $_ENV['TEST2'] = 'xyz';
         Config::initEnv(__DIR__ . '/app');
 
-        $this->assertEquals(654, Config::env('TEST1'));
+        $this->assertEquals('654', Config::env('TEST1'));
         $this->assertEquals('xyz', Config::env('TEST2'));
         $this->assertEquals('dotenv1', Config::env('VAR1'));
         $this->assertEquals(2, Config::env('VAR2'));
@@ -74,13 +74,13 @@ public function testEnvFileDoesNotClearEnvVars()
 
     public function testEnvFileDoesNotOverrideEnvVars()
     {
-        putenv('VAR1=654');
-        putenv('VAR2=xyz');
+        $_ENV['VAR1'] = '654';
+        $_ENV['VAR2'] = 'xyz';
         Config::initEnv(__DIR__ . '/app');
 
         $this->assertEquals(0, Config::env('YII_DEBUG'));
         $this->assertEquals('dev', Config::env('YII_ENV'));
-        $this->assertEquals(654, Config::env('VAR1'));
+        $this->assertEquals('654', Config::env('VAR1'));
         $this->assertEquals('xyz', Config::env('VAR2'));
     }