Merge changes from 3.14.8

spiral · Dec 11, 2024 · a9d8cfe · a9d8cfe
1 parent 62a76b3
commit a9d8cfe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -34,13 +34,13 @@
     ],
     "require": {
         "php": ">=8.1",
-        "spiral/core": "^3.14.8",
-        "spiral/files": "^3.14.8",
-        "spiral/config": "^3.14.8",
-        "spiral/debug": "^3.14.8",
-        "spiral/exceptions": "^3.14.8",
+        "spiral/core": "^3.15",
+        "spiral/files": "^3.15",
+        "spiral/config": "^3.15",
+        "spiral/debug": "^3.15",
+        "spiral/exceptions": "^3.15",
         "spiral/attributes": "^2.8|^3.0",
-        "spiral/events": "^3.14.8"
+        "spiral/events": "^3.15"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.1",

diff --git a/src/Environment/AppEnvironment.php b/src/Environment/AppEnvironment.php
@@ -40,6 +40,13 @@ public static function detect(EnvironmentInterface $environment): self
     {
         $value = $environment->get('APP_ENV');
 
+        // Aliases
+        $value = match ($value) {
+            'production' => self::Production->value,
+            'test' => self::Testing->value,
+            default => $value,
+        };
+
         return \is_string($value)
             ? (self::tryFrom($value) ?? self::Local)
             : self::Local;

diff --git a/tests/Environment/AppEnvironmentTest.php b/tests/Environment/AppEnvironmentTest.php
@@ -39,9 +39,13 @@ public static function envVariablesDataProvider(): \Traversable
     {
         yield ['wrong', AppEnvironment::Local];
         yield ['prod', AppEnvironment::Production];
+        yield ['production', AppEnvironment::Production];
         yield ['stage', AppEnvironment::Stage];
         yield ['local', AppEnvironment::Local];
+        yield ['dev', AppEnvironment::Local];
+        yield ['development', AppEnvironment::Local];
         yield ['testing', AppEnvironment::Testing];
+        yield ['test', AppEnvironment::Testing];
     }
 
     public function testClassMethods(): void