improve helpers

Author: frostealth

bootstrap/environment.php

@@ -1,5 +1,6 @@
 <?php
 
-use bootstrap\helpers\Dotenv;
+use bootstrap\helpers\DotenvInstance as Instance;
+use Dotenv\Dotenv;
 
-(new Dotenv(dirname(__DIR__)))->load();
+Instance::set(new Dotenv(dirname(__DIR__)))->load();

bootstrap/functions.php

@@ -1,6 +1,6 @@
 <?php
 
-use bootstrap\helpers\Dotenv;
+use bootstrap\helpers\DotenvInstance;
 use yii\helpers\ArrayHelper;
 
 if (!function_exists('dotenv')) {
@@ -9,7 +9,7 @@
      */
     function dotenv()
     {
-        return Dotenv::instance();
+        return DotenvInstance::get();
     }
 }
 
@@ -22,9 +22,9 @@ function dotenv()
      */
     function param($key, $default = null)
     {
-        $params = Yii::$app->params;
+        $value = ArrayHelper::getValue(Yii::$app->params, $key, $default);
 
-        return ArrayHelper::keyExists($key, $params) ? ArrayHelper::getValue($params, $key) : $default;
+        return value($value);
     }
 }
 
@@ -39,7 +39,7 @@ function env($key, $default = null)
     {
         $value = getenv($key);
         if ($value === false) {
-            return $default;
+            return value($default);
         }
 
         static $map = [
@@ -50,11 +50,22 @@ function env($key, $default = null)
         ];
 
         $key = strtolower($value);
-        $key = ltrim($key, '(');
-        $key = rtrim($key, ')');
+        $key = trim($key, '()');
 
         $value = isset($map[$key]) ? $map[$key] : $value;
 
         return $value;
     }
 }
+
+if (!function_exists('value')) {
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    function value($value)
+    {
+        return is_callable($value) ? call_user_func($value) : $value;
+    }
+}

bootstrap/helpers/Dotenv.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace bootstrap\helpers;
+
+use Dotenv\Dotenv;
+
+/**
+ * Class DotenvInstance
+ *
+ * @package bootstrap\helpers
+ */
+final class DotenvInstance
+{
+    /** @var \Dotenv\Dotenv */
+    protected static $instance;
+
+    /**
+     * @return \Dotenv\Dotenv
+     */
+    public static function get()
+    {
+        if (!self::$instance) {
+            throw new \RuntimeException('Instance of the "Dotenv\Dotenv" has not been set.');
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param Dotenv $instance
+     *
+     * @return Dotenv
+     */
+    public static function set(Dotenv $instance)
+    {
+        self::$instance = $instance;
+
+        return self::$instance;
+    }
+}

bootstrap/helpers/DotenvInstance.php

@@ -50,11 +50,11 @@ public function behaviors()
     protected function verbs()
     {
         return [
-            'create' => ['POST'],
-            'update' => ['PUT', 'PATCH'],
-            'delete' => ['DELETE'],
-            'index' => ['GET', 'HEAD'],
-            'view' => ['GET', 'HEAD'],
+            'create' => ['post'],
+            'update' => ['put', 'patch'],
+            'delete' => ['delete'],
+            'index' => ['get', 'head'],
+            'view' => ['get', 'head'],
         ];
     }
 

common/controllers/Controller.php

@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": ">=2.0.6",
+        "yiisoft/yii2": ">=2.0.7",
         "yiisoft/yii2-swiftmailer": "*",
         "vlucas/phpdotenv": "~2.2"
     },
@@ -32,6 +32,9 @@
         }
     },
     "scripts": {
+        "post-root-package-install": [
+            "php -r \"copy('.env.example', '.env');\""
+        ],
         "post-create-project-cmd": [
             "yii\\composer\\Installer::postCreateProject"
         ]