Merge pull request #145 from mychidarko/v3.x-dev

V3.x dev
leafsphp · Sep 10, 2022 · dea6c86 · dea6c86
2 parents 67713a4 + 6001f4a
commit dea6c86
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 68 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -20,4 +20,4 @@ jobs:
             - name: Commit changes
               uses: stefanzweifel/git-auto-commit-action@v4
               with:
-                  commit_message: 👷 Fix styling
+                  commit_message: 'chore: fix styling'
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
 	"prefer-stable": true,
 	"require": {
 		"leafs/http": "^2.0",
-		"leafs/router": "^0.1.6",
+		"leafs/router": "^0.1.7",
 		"leafs/anchor": "^1.2",
 		"leafs/exception": "^3.0"
 	},

diff --git a/src/functions.php b/src/functions.php
@@ -31,12 +31,12 @@ function app()
      */
     function _env($key, $default = null)
     {
-        $item = getenv($key);
+        $env = array_merge(getenv() ?? [], $_ENV ?? []);
 
-        if (!isset($_ENV[$key]) || (isset($_ENV[$key]) && $_ENV[$key] == null)) {
-            $item = $default;
+        if (!isset($env[$key]) || (isset($env[$key]) && $env[$key] === null)) {
+            $env[$key] = $default;
         }
 
-        return $item;
+        return $env[$key] ?? $default;
     }
 }
diff --git a/tests/app.test.php b/tests/app.test.php
@@ -134,3 +134,17 @@ public function customMethod()
 
     expect($leafInstance1->response->customMethod())->toBe('This is some test response');
 });
+
+test('get route info', function () {
+    $_SERVER['REQUEST_METHOD'] = 'GET';
+    $_SERVER['REQUEST_URI'] = '/homepage';
+
+    $routePath = '/homepage';
+
+    app()->get($routePath, function () use ($routePath) {
+        $routeData = app()->getRoute();
+        expect($routeData['path'])->toBe($routePath);
+    });
+
+    app()->run();
+});
diff --git a/tests/config.test.php b/tests/config.test.php
@@ -49,3 +49,7 @@
     expect($homeConfig['key'])->toBe('2');
     expect(app()->config('home.key'))->toBe('2');
 });
+
+test('Env is successfully retrieved', function () {
+    expect(_env('USER', false))->toBe(getenv('USER'));
+});