wip

Author: WyattCast44

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.3.0
+
+- Renamed methods
+- Added support for `.env` files
+
 ### 0.2.1
 
 - Fix array_filter filtering out all env variables

readme.md

@@ -80,16 +80,16 @@ You also have the option of calling named methods to set the configuration optio
 use Statix\Server\Server;
 
 Server::new()
-    ->usePHP('path') 
-    ->onHost('localhost') 
-    ->onPort('8080') 
+    ->php('path') 
+    ->host('localhost') 
+    ->port('8080') 
     ->root('./content')
-    ->useRouter('./router.php')
+    ->router('./router.php')
     ->withEnvVars([
         'APP_DYNAMIC_ENV' => 'server'
     ])->withoutEnvVars([
         'APP_KEY',
-    ]);
+    ])->withEnvFile('path/to/.env');
 ```
 
 ### Capturing the output from the server process

src/Server.php

@@ -2,6 +2,7 @@
 
 namespace Statix\Server;
 
+use Dotenv\Dotenv;
 use Exception;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
@@ -69,7 +70,7 @@ public function __construct(array $configuration = [])
             'withoutEnvVars' => [],
         ], $configuration);
 
-        $this->envVarsToPass = array_merge($_ENV, getenv());
+        $this->envVarsToPass = array_merge($_ENV, getenv(), $_SERVER);
 
         return $this;
     }
@@ -96,7 +97,7 @@ private function findExecutable(): string
 
     public function getConfiguration(string $key = null): mixed
     {
-        if($key != null) {
+        if ($key != null) {
             return $this->configuration[$key] ?? null;
         }
 
@@ -169,7 +170,16 @@ public function router(string $path): self
 
     public function withEnvFile(string $path): self
     {
-        // todo
+        if (! file_exists($path)) {
+            throw new Exception('Given path to env file does not exists: '.$path);
+        }
+
+        (Dotenv::createImmutable(
+            dirname($path),
+            basename($path)
+        ))->safeLoad();
+
+        $this->envVarsToPass = array_merge($_ENV, getenv(), $_SERVER);
 
         return $this;
     }

tests/ServerTest.php

@@ -139,5 +139,3 @@
 
     expect($server->getProcess())->toBeInstanceOf(Process::class);
 });
-
-// with env file support

tests/resources/.env.example

@@ -0,0 +1,2 @@
+APP_NAME="Server"
+APP_ENV="local"