Rozbo / puck

function.php

Doc Comments +2 added lines, -2 removed lines

@@ -462,8 +462,8 @@
      * 获取环境变量
      *
      * @param  string  $key
-     * @param  mixed   $default
-     * @return mixed
+     * @param  string|false   $default
+     * @return string
      */
     function env($key, $default = null)
     {

Spacing +11 added lines, -11 removed lines

@@ -408,7 +408,7 @@ 
 
     // 过滤查询特殊字符
     if (preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) {
-        $value .= ' ';
+        $value.=' ';
     }
 }
 /**
@@ -416,15 +416,15 @@ 
  *
  * @return string|null
  */
-function config($name=null,$value=null,$default=null){
+function config($name=null, $value=null, $default=null) {
     $config=\puck\Conf::load();
-    if ($name===null){
+    if ($name === null) {
         return $config->all();
     }
-    if ($value===null){
-        return $config->get($name,$default);
+    if ($value === null) {
+        return $config->get($name, $default);
     }
-    $config->set($name,$value);
+    $config->set($name, $value);
 }
 /**
  * 字符串命名风格转换
@@ -441,14 +441,14 @@ 
     }
 }
 
-if (! function_exists('app')) {
+if (!function_exists('app')) {
     /**
      * 获取容器实例
      *
      * @param  string  $make
      * @return mixed|\puck\App
      */
-    function app($make = null)
+    function app($make=null)
     {
         if (is_null($make)) {
             return Container::getInstance();
@@ -457,7 +457,7 @@ 
     }
 }
 
-if (! function_exists('env')) {
+if (!function_exists('env')) {
     /**
      * 获取环境变量
      *
@@ -465,9 +465,9 @@ 
      * @param  mixed   $default
      * @return mixed
      */
-    function env($key, $default = null)
+    function env($key, $default=null)
     {
-        $value = getenv($key);
+        $value=getenv($key);
         if ($value === false) {
             return value($default);
         }

core/App.php

Spacing +5 added lines, -5 removed lines

@@ -23,12 +23,12 @@ 
         $this->initContainer();
     }
 
-    private function initEnv(){
-        $dotEnv = new Dotenv($this->basePath);
+    private function initEnv() {
+        $dotEnv=new Dotenv($this->basePath);
         $dotEnv->load();
         date_default_timezone_set(env('APP_TIMEZONE', 'Asia/Shanghai'));
         define('IS_CLI', php_sapi_name() == 'cli');
-        if (env('DEBUG',false)) {
+        if (env('DEBUG', false)) {
             error_reporting(E_ALL);
             @ini_set('display_errors', 'On');
             //@ob_start();
@@ -45,8 +45,8 @@ 
      */
     private function initContainer() {
         static::setInstance($this);
-        $this->instance('app',$this);
-        $this->bind('pinyin','\puck\helpers\PinYin');
+        $this->instance('app', $this);
+        $this->bind('pinyin', '\puck\helpers\PinYin');
     }
 
 }
\ No newline at end of file