Switch to phpdotenv v5 (#33139)

Author: GrahamCampbell

composer.json

@@ -41,7 +41,7 @@
         "symfony/routing": "^5.1",
         "symfony/var-dumper": "^5.1",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2",
-        "vlucas/phpdotenv": "^4.0",
+        "vlucas/phpdotenv": "^5.0",
         "voku/portable-ascii": "^1.4.8"
     },
     "replace": {

src/Illuminate/Support/Env.php

@@ -2,9 +2,7 @@
 
 namespace Illuminate\Support;
 
-use Dotenv\Repository\Adapter\EnvConstAdapter;
 use Dotenv\Repository\Adapter\PutenvAdapter;
-use Dotenv\Repository\Adapter\ServerConstAdapter;
 use Dotenv\Repository\RepositoryBuilder;
 use PhpOption\Option;
 
@@ -54,16 +52,13 @@ public static function disablePutenv()
     public static function getRepository()
     {
         if (static::$repository === null) {
-            $adapters = array_merge(
-                [new EnvConstAdapter, new ServerConstAdapter],
-                static::$putenv ? [new PutenvAdapter] : []
-            );
+            $builder = RepositoryBuilder::createWithDefaultAdapters();
 
-            static::$repository = RepositoryBuilder::create()
-                ->withReaders($adapters)
-                ->withWriters($adapters)
-                ->immutable()
-                ->make();
+            if (static::$putenv) {
+                $builder = $builder->addAdapter(PutenvAdapter::class);
+            }
+
+            static::$repository = $builder->immutable()->make();
         }
 
         return static::$repository;

src/Illuminate/Support/composer.json

@@ -45,7 +45,7 @@
         "ramsey/uuid": "Required to use Str::uuid() (^4.0).",
         "symfony/process": "Required to use the composer class (^5.1).",
         "symfony/var-dumper": "Required to use the dd function (^5.1).",
-        "vlucas/phpdotenv": "Required to use the Env class and env helper (^4.0)."
+        "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.0)."
     },
     "config": {
         "sort-packages": true

tests/Support/SupportHelpersTest.php

@@ -637,11 +637,11 @@ public function testEnvEscapedString()
         $this->assertSame('x"null"x', env('foo'));
     }
 
-    public function testGetFromENVFirst()
+    public function testGetFromSERVERFirst()
     {
         $_ENV['foo'] = 'From $_ENV';
         $_SERVER['foo'] = 'From $_SERVER';
-        $this->assertSame('From $_ENV', env('foo'));
+        $this->assertSame('From $_SERVER', env('foo'));
     }
 
     public function providesPregReplaceArrayData()