Introduce requireEnv helper

src/Illuminate/Support/Env.php

@@ -5,6 +5,7 @@
 use Dotenv\Repository\Adapter\PutenvAdapter;
 use Dotenv\Repository\RepositoryBuilder;
 use PhpOption\Option;
+use RuntimeException;
 
 class Env
 {
@@ -65,13 +66,12 @@ public static function getRepository()
     }
 
     /**
-     * Gets the value of an environment variable.
+     * Get the possible option for this environment variable.
      *
      * @param  string  $key
-     * @param  mixed  $default
-     * @return mixed
+     * @return \PhpOption\Option|\PhpOption\Some
      */
-    public static function get($key, $default = null)
+    protected static function getOption($key)
     {
         return Option::fromValue(static::getRepository()->get($key))
             ->map(function ($value) {
@@ -95,7 +95,31 @@ public static function get($key, $default = null)
                 }
 
                 return $value;
-            })
-            ->getOrCall(fn () => value($default));
+            });
+    }
+
+    /**
+     * Gets the value of a required environment variable.
+     *
+     * @param  string  $key
+     * @return mixed
+     *
+     * @throws \RuntimeException
+     */
+    public static function getRequired($key)
+    {
+        return self::getOption($key)->getOrThrow(new RuntimeException("[$key] has no value"));
+    }
+
+    /**
+     * Gets the value of an environment variable.
+     *
+     * @param  string  $key
+     * @param  mixed  $default
+     * @return mixed
+     */
+    public static function get($key, $default = null)
+    {
+        return self::getOption($key)->getOrCall(fn () => value($default));
     }
 }

src/Illuminate/Support/helpers.php

@@ -139,6 +139,21 @@ function env($key, $default = null)
     }
 }
 
+if (! function_exists('requireEnv')) {
+    /**
+     * Gets the value of a required environment variable.
+     *
+     * @param  string  $key
+     * @return mixed
+     *
+     * @throws \RuntimeException
+     */
+    function requireEnv($key)
+    {
+        return Env::getRequired($key);
+    }
+}
+
 if (! function_exists('filled')) {
     /**
      * Determine if a value is "filled".

tests/Support/SupportHelpersTest.php

@@ -26,6 +26,8 @@ class SupportHelpersTest extends TestCase
     protected function tearDown(): void
     {
         m::close();
+
+        parent::tearDown();
     }
 
     public function testE()
@@ -1011,6 +1013,19 @@ public function testGetFromSERVERFirst()
         $this->assertSame('From $_SERVER', env('foo'));
     }
 
+    public function testRequiredEnvVariableThrowsAnExceptionWhenNotFound(): void
+    {
+        $this->expectExceptionObject(new RuntimeException('[required-does-not-exist] has no value'));
+
+        requireEnv('required-does-not-exist');
+    }
+
+    public function testRequiredEnvReturnsValue(): void
+    {
+        $_SERVER['required-exists'] = 'some-value';
+        $this->assertSame('some-value', requireEnv('required-exists'));
+    }
+
     public static function providesPregReplaceArrayData()
     {
         $pointerArray = ['Taylor', 'Otwell'];