Converted component to Yii2 bootstrap component

cyberinferno · Jun 27, 2017 · a09dc8b · a09dc8b
1 parent a71d205
commit a09dc8b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/Loader.php b/Loader.php
@@ -3,7 +3,8 @@
 namespace cyberinferno\yii\phpdotenv;
 
 use Dotenv\Dotenv;
-use yii\base\Component;
+use Yii;
+use yii\base\BootstrapInterface;
 
 /**
  * Class Loader
@@ -12,12 +13,16 @@
  *
  * @package yii\phpdotenv
  */
-class Loader extends Component
+class Loader implements BootstrapInterface
 {
     /**
-     * @var string Use if custom environment variable directory
+     * @var string Environment variable file directory
      */
-    public $file;
+    public $path = '@vendor/../';
+    /**
+     * @var string Use if custom environment variable file
+     */
+    public $file = '.env';
     /**
      * @var bool Whether to overload already existing environment variables
      */
@@ -30,17 +35,24 @@ class Loader extends Component
     /**
      * @inheritdoc
      */
-    public function init()
+    public function bootstrap($app)
     {
-        if ($this->file !== null) {
-            $this->_dotenv = new Dotenv(__DIR__, $this->file);
-        } else {
-            $this->_dotenv = new Dotenv(__DIR__);
-        }
-        if ($this->overload) {
-            $this->_dotenv->overload();
-        } else {
-            $this->_dotenv->load();
+        try {
+            if ($this->path === null) {
+                $this->path = '@vendor/../';
+            }
+            if ($this->file === null) {
+                $this->file = '.env';
+            }
+            $this->path = Yii::getAlias($this->path);
+            $this->_dotenv = New Dotenv($this->path, $this->file);
+            if ($this->overload) {
+                $this->_dotenv->overload();
+            } else {
+                $this->_dotenv->load();
+            }
+        } catch (\Exception $e) {
+            \Yii::error('Could not load Dotenv file. ERROR: '.$e->getMessage());
         }
     }
 

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ php composer.phar require cyberinferno/yii2-phpdotenv
 or add
 
 ```json
-"cyberinferno/yii2-phpdotenv": "~1.0.0"
+"cyberinferno/yii2-phpdotenv": "~2.0.0"
 ```
 
 to the require section of your composer.json.
@@ -31,10 +31,11 @@ Usage:
 ```php
 return [
     //....
-    'components' => [
-        'dotenv' => [
+    'bootstrap' => [
+        [
             'class' => 'cyberinferno\yii\phpdotenv\Loader',
-            'file' => '.env', // Optional parameter if custom environment variable directory
+            'path' => '@vendor/../', // Directory of the .env file 
+            'file' => '.env', // Optional parameter if custom environment variable file
             'overload' => false, // Optional parameter whether to overload already existing environment variables. Defaults to false
         ],
     ]