Merge pull request #14 from borschphp/paas-compatibility

Upd: higher compatibility with PaaS

bootstrap/env.php

@@ -10,10 +10,10 @@
 }
 
 $dotenv = Dotenv\Dotenv::createImmutable(app_path());
-$environment = $dotenv->load();
+$environment = $dotenv->safeLoad();
 
 // In production, save the environment in a file so that it won't be necessary to parse and load .env file at every call.
-if (env('APP_ENV') == 'production') {
+if (env('APP_ENV') == 'production' && count($environment)) {
     $file = new SplFileObject($environment_file, 'w');
     $file->fwrite('<?php'.PHP_EOL.PHP_EOL.'return '.var_export($environment, true).';'.PHP_EOL);
     $file = null;

bootstrap/helpers.php

@@ -9,18 +9,18 @@
  */
 function env(string $key, mixed $default = null): mixed
 {
-    $value = $_ENV[$key] ?? false;
+    $value = $_ENV[$key] ?? $_SERVER[$key] ?? false;
 
     if ($value === false) {
         return $default;
     }
 
-    $cleaned_value = trim(strtolower($value), '() \n\r\t\v\x00');
+    $cleaned_value = trim(strtolower($value), "() \n\r\t\v\x00");
     return match ($cleaned_value) {
-        'true', 'false' => filter_var($cleaned_value, FILTER_VALIDATE_BOOLEAN),
+        'true', 'false', 'yes', 'no' => filter_var($cleaned_value, FILTER_VALIDATE_BOOLEAN),
         'empty' => '',
         'null' => null,
-        default => trim($value, '"\''),
+        default => trim($value)
     };
 }
 

tests/Pest.php

@@ -119,3 +119,15 @@ public function getContainer(): Container
         $this->server_request_to_exception = $factory->createServerRequest('GET', 'https://example.com/to/exception');
     })
     ->in('Unit/Middleware');
+
+uses()
+    ->beforeEach(function () {
+        $_ENV['TEST1'] = 'true';
+        $_ENV['TEST2'] = 'yes';
+        $_ENV['TEST3'] = 'false';
+        $_ENV['TEST4'] = 'no';
+        $_ENV['TEST5'] = 'empty';
+        $_ENV['TEST6'] = 'null';
+        $_ENV['TEST7'] = 'a value   ';
+    })
+    ->in('Unit/Bootstrap/HelpersTest.php');

tests/Unit/Bootstrap/HelpersTest.php

@@ -0,0 +1,23 @@
+<?php
+
+test('env can deal with TRUE', function() {
+    expect(env('TEST1'))->toBeTrue()
+        ->and(env('TEST2'))->toBeTrue();
+});
+
+test('env can deal with FALSE', function() {
+    expect(env('TEST3'))->toBeFalse()
+        ->and(env('TEST4'))->toBeFalse();
+});
+
+test('env can deal with EMPTY', function() {
+    expect(env('TEST5'))->toBe('');
+});
+
+test('env can deal with NULL', function() {
+    expect(env('TEST6'))->toBe(null);
+});
+
+test('env can deal with DEFAULT', function() {
+    expect(env('TEST7'))->toBe('a value');
+});