Enable envoronment configuration via .env

morozov · Oct 9, 2021 · 823615d · 823615d
1 parent d033716
commit 823615d
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.env
 /.phpunit.result.cache
 /.phpcs.cache
 /infection.log

diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
     "doctrine/coding-standard": "^9.0.0",
     "infection/infection": "^0.25",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^4.10"
+    "vimeo/psalm": "^4.10",
+    "vlucas/phpdotenv": "^5.3"
   },
   "config": {
     "platform": {

diff --git a/composer.lock b/composer.lock
diff --git a/etc/container.php b/etc/container.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Dotenv\Dotenv;
 use GuzzleHttp\Client as HttpClient;
 use KiH\Action\Feed;
 use KiH\Action\Index;
@@ -14,12 +15,17 @@
 use Slim\Psr7\Factory\ResponseFactory;
 use UltraLite\Container\Container;
 
+if (class_exists(Dotenv::class)) {
+    Dotenv::createImmutable(dirname(__DIR__))
+        ->safeLoad();
+}
+
 return new Container([
     Client::class => static function (): Client {
         return new VkClient(
             new HttpClient(),
             'kremhrust',
-            getenv('VK_ACCESS_TOKEN') ?: ''
+            $_ENV['VK_ACCESS_TOKEN'] ?? ''
         );
     },
     Generator::class => static function (Container $container): Generator {