Added $path of '.env' file to ChainFactory::api() and WalletFactory::…

…api()
alienzin · Aug 28, 2018 · 6576ee7 · 6576ee7
1 parent 867536f
commit 6576ee7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/src/Adapter/Settings/DotenvAdapter.php b/src/Adapter/Settings/DotenvAdapter.php
@@ -16,7 +16,10 @@ class DotenvAdapter implements SettingsInterface
     /**
      * DotenvAdapter constructor
      *
-     * @param Dotenv $client
+     * @param  Dotenv $client
+     * @param  bool $ifLoad
+     * @throws SettingsException
+     * @throws SettingsNotFoundException
      */
     public function __construct(Dotenv $settings)
     {

diff --git a/src/ChainFactory.php b/src/ChainFactory.php
@@ -19,15 +19,20 @@ class ChainFactory
     /**
      * Simple convenience factory which can be overloaded or used with defaults
      *
-     * @param string                 $env
-     * @param SettingsInterface|null $settings
-     * @param HttpInterface|null     $http
+     * @param  string|null            $path
+     * @param  string                 $env
+     * @param  SettingsInterface|null $settings
+     * @param  HttpInterface|null     $http
      *
      * @return ChainController
+     * @throws Exception\SettingsException
+     * @throws Exception\SettingsNotFoundException
+     * @throws \ErrorException
      */
-    public function api(string $env = '.env', SettingsInterface $settings = null, HttpInterface $http = null): ChainController
+    public function api(string $path = null, string $env = '.env', SettingsInterface $settings = null, HttpInterface $http = null): ChainController
     {
-        $settings = $settings ?? new DotenvAdapter(new Dotenv(dirname(__DIR__), $env));
+        $path = $path ?? dirname(__DIR__);
+        $settings = $settings ?? new DotenvAdapter(new Dotenv($path, $env));
         $http = $http ?? new CurlAdapter(new Curl);
 
         return new ChainController(

diff --git a/src/WalletFactory.php b/src/WalletFactory.php
@@ -19,15 +19,20 @@ class WalletFactory
     /**
      * Simple convenience factory which can be overloaded or used with defaults
      *
-     * @param string                 $env
-     * @param SettingsInterface|null $settings
-     * @param HttpInterface|null     $http
+     * @param  string|null            $path
+     * @param  string                 $env
+     * @param  SettingsInterface|null $settings
+     * @param  HttpInterface|null     $http
      *
      * @return WalletController
+     * @throws Exception\SettingsException
+     * @throws Exception\SettingsNotFoundException
+     * @throws \ErrorException
      */
-    public function api(string $env = '.env', SettingsInterface $settings = null, HttpInterface $http = null): WalletController
+    public function api(string $path = null, string $env = '.env', SettingsInterface $settings = null, HttpInterface $http = null): WalletController
     {
-        $settings = $settings ?? new DotenvAdapter(new Dotenv(dirname(__DIR__), $env));
+        $path = $path ?? dirname(__DIR__);
+        $settings = $settings ?? new DotenvAdapter(new Dotenv($path, $env));
         $http = $http ?? new CurlAdapter(new Curl);
 
         return new WalletController(