Move from static method to global function

jolicode · Jun 23, 2023 · 1b60b8b · 1b60b8b
1 parent 32c1b76
commit 1b60b8b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/doc/05-context.md b/doc/05-context.md
@@ -130,7 +130,7 @@ use Castor\Context;
 #[AsContext]
 function my_context(): Context
 {
-    return new Context::fromDotEnv();
+    return new Context(load_dot_env());
 }
 ```
 

diff --git a/examples/context.php b/examples/context.php
@@ -8,6 +8,7 @@
 
 use function Castor\get_context;
 use function Castor\io;
+use function Castor\load_dot_env;
 use function Castor\run;
 use function Castor\variable;
 
@@ -65,7 +66,9 @@ function interactiveContext(): Context
 #[AsContext(name: 'path')]
 function contextFromPath(): Context
 {
-    return Context::fromDotEnv(__DIR__ . '/dotenv-context/.env');
+    $data = load_dot_env(__DIR__ . '/dotenv-context/.env');
+
+    return new Context($data);
 }
 
 #[AsTask(description: 'Displays information about the context')]

diff --git a/src/Context.php b/src/Context.php
@@ -2,8 +2,6 @@
 
 namespace Castor;
 
-use Symfony\Component\Dotenv\Dotenv;
-
 class Context implements \ArrayAccess
 {
     public readonly string $currentDirectory;
@@ -213,15 +211,4 @@ public function offsetUnset(mixed $offset): void
     {
         throw new \LogicException('Context is immutable');
     }
-
-    public static function fromDotEnv(string $path = null): self
-    {
-        $path ??= PathHelper::getRoot() . '/.env';
-
-        $dotenv = new Dotenv();
-        $dotenv->loadEnv($path);
-        unset($_ENV['SYMFONY_DOTENV_VARS']);
-
-        return new self(environment: $_ENV);
-    }
 }
diff --git a/src/functions.php b/src/functions.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Process\Exception\ProcessFailedException;
@@ -474,3 +475,14 @@ function fix_exception(\Exception $exception): \Exception
 
     return $exception;
 }
+
+function load_dot_env(string $path = null): array
+{
+    $path ??= PathHelper::getRoot() . '/.env';
+
+    $dotenv = new Dotenv();
+    $dotenv->loadEnv($path);
+    unset($_ENV['SYMFONY_DOTENV_VARS']);
+
+    return $_ENV;
+}