Fix #190: Use environment variables instead of constants (#193)

rustamwin · web-flow · commit 600b27ccdd79 · 2021-09-28T21:38:31.000+03:00
diff --git a/.env.example b/.env.example
@@ -0,0 +1,2 @@
+YII_ENV=
+YII_DEBUG=true
diff --git a/composer.json b/composer.json
@@ -13,7 +13,11 @@
         "test": "phpunit --testdox --no-interaction",
         "test-watch": "phpunit-watcher watch",
         "post-update-cmd": [
-            "App\\Installer::postUpdate"
+            "App\\Installer::postUpdate",
+            "App\\Installer::copyEnvFile"
+        ],
+        "post-create-project-cmd": [
+            "App\\Installer::copyEnvFile"
         ]
     },
     "require": {
@@ -23,6 +27,7 @@
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "symfony/console": "^5.3",
+        "vlucas/phpdotenv": "^5.3",
         "yiisoft/aliases": "^2.0",
         "yiisoft/assets": "^1.0",
         "yiisoft/cache": "^1.0",
diff --git a/preload.php b/preload.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Dotenv\Dotenv;
+
+require_once __DIR__ . '/vendor/autoload.php';
+
+$dotenv = Dotenv::createImmutable(__DIR__);
+$dotenv->load();
+
+$_ENV['YII_ENV'] = empty($_ENV['YII_ENV']) ? null : (string)$_ENV['YII_ENV'];
+$_SERVER['YII_ENV'] = $_ENV['YII_ENV'];
+
+$_ENV['YII_DEBUG'] = filter_var(
+    !empty($_ENV['YII_DEBUG']) ? $_ENV['YII_DEBUG'] : true,
+    FILTER_VALIDATE_BOOLEAN,
+    FILTER_NULL_ON_FAILURE
+) ?? true;
+$_SERVER['YII_DEBUG'] = $_ENV['YII_DEBUG'];
diff --git a/psalm.xml b/psalm.xml
@@ -7,10 +7,10 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
         <file name="public/index.php"/>
-        <file name="public/index-test.php"/>
         <file name="yii"/>
+        <file name="preload.php"/>
     </projectFiles>
 </psalm>
 
diff --git a/public/index-test.php b/public/index-test.php
diff --git a/public/index.php b/public/index.php
@@ -4,6 +4,10 @@
 
 use App\Runner\WebApplicationRunner;
 
+/**
+ * @psalm-var string $_SERVER['REQUEST_URI']
+ */
+
 // PHP built-in server routing.
 if (PHP_SAPI === 'cli-server') {
     // Serve static files as is.
@@ -17,21 +21,15 @@
     $_SERVER['SCRIPT_NAME'] = '/index.php';
 }
 
-require_once dirname(__DIR__) . '/vendor/autoload.php';
-
-/**
- * Set debug value for web application runner, for default its `true` add additionally the validation of the
- * container-di configurations (debug mode).
- */
-define('YII_DEBUG', getenv('YII_DEBUG') ? (bool)getenv('YII_DEBUG') : true);
+require_once dirname(__DIR__) . '/preload.php';
 
-/**
- * Set environment value for web application runner, for default its `null`.
- *
- * @link https://github.com/yiisoft/config#environments
- */
-define('YII_ENV', getenv('YII_ENV') ?: null);
+if ($_ENV['YII_ENV'] === 'test') {
+    $c3 = dirname(__DIR__) . '/c3.php';
+    if (file_exists($c3)) {
+        require_once $c3;
+    }
+}
 
 // Run web application runner
-$runner = new WebApplicationRunner(YII_DEBUG, YII_ENV);
+$runner = new WebApplicationRunner($_ENV['YII_DEBUG'], $_ENV['YII_ENV']);
 $runner->run();
diff --git a/src/Installer.php b/src/Installer.php
@@ -33,4 +33,11 @@ private static function chmodRecursive(string $path, int $mode): void
             chmod($item, $mode);
         }
     }
+
+    public static function copyEnvFile(): void
+    {
+        if (!file_exists('.env')) {
+            copy('.env.example', '.env');
+        }
+    }
 }
diff --git a/yii b/yii
@@ -5,21 +5,8 @@ declare(strict_types=1);
 
 use App\Runner\ConsoleApplicationRunner;
 
-require_once __DIR__ . '/vendor/autoload.php';
-
-/**
- * Set debug value for console application runner, for default its `true` add additionally the validation of the
- * container-di configurations (debug mode).
- */
-define('YII_DEBUG', getenv('YII_DEBUG') ? (bool)getenv('YII_DEBUG') : true);
-
-/**
- * Set environment value for web application runner, for default its `null`.
- *
- * @link https://github.com/yiisoft/config#environments
- */
-define('YII_ENV', getenv('YII_ENV') ?: null);
+require_once __DIR__ . '/preload.php';
 
 // Run console application runner
-$consoleRunner = new ConsoleApplicationRunner(YII_DEBUG, YII_ENV);
-$consoleRunner->run();
+$runner = new ConsoleApplicationRunner($_ENV['YII_DEBUG'], $_ENV['YII_ENV']);
+$runner->run();

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,11 @@ private static function chmodRecursive(string $path, int $mode): void`
`33`	`33`	`chmod($item, $mode);`
`34`	`34`	`}`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public static function copyEnvFile(): void`
	`38`	`+ {`
	`39`	`+ if (!file_exists('.env')) {`
	`40`	`+ copy('.env.example', '.env');`
	`41`	`+ }`
	`42`	`+ }`
`36`	`43`	`}`