Rozbo / puck

core/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
 {
 
     protected $viewPath='';
-    protected $title = '';
+    protected $title='';
     private $twig;
     private $tVar=array();
 
@@ -50,15 +50,15 @@ 
     /**
      * @param string $name
      */
-    protected function assign($name, $value = '') {
+    protected function assign($name, $value='') {
         if (is_array($name)) {
-            $this->tVar = array_merge($this->tVar, $name);
+            $this->tVar=array_merge($this->tVar, $name);
         } else {
-            $this->tVar[$name] = $value;
+            $this->tVar[$name]=$value;
         }
     }
 
-    protected function model($modelName, $vars = []) {
-        return app($modelName . '_model', $vars);
+    protected function model($modelName, $vars=[]) {
+        return app($modelName.'_model', $vars);
     }
 }
\ No newline at end of file

core/App.php

Spacing +24 added lines, -24 removed lines

@@ -15,7 +15,7 @@ 
      *
      * @var array
      */
-    protected $loadedConfigurations = [];
+    protected $loadedConfigurations=[];
 
     /**
      * 应用的根目录.
@@ -30,17 +30,17 @@ 
         $this->initConfig();
     }
 
-    private function initEnv(){
-        try{
-            $dotEnv = new Dotenv($this->basePath);
+    private function initEnv() {
+        try {
+            $dotEnv=new Dotenv($this->basePath);
             $dotEnv->load();
         }
-        catch (\Dotenv\Exception\InvalidPathException $e){
+        catch (\Dotenv\Exception\InvalidPathException $e) {
             die("环境配置文件`.env`没有被找到.");
         }
         date_default_timezone_set(env('APP_TIMEZONE', 'Asia/Shanghai'));
         define('IS_CLI', $this->runningInConsole());
-        define('IS_DEBUG',env('DEBUG',false));
+        define('IS_DEBUG', env('DEBUG', false));
         if (IS_DEBUG) {
             error_reporting(E_ALL);
             @ini_set('display_errors', 'On');
@@ -68,13 +68,13 @@ 
      */
     private function initContainer() {
         static::setInstance($this);
-        $this->instance('app',$this);
-        $this->instance('config',new Config());
-        $this->instance('request',new Request($this->config));
-        $this->instance('route',new Route($this->request));
+        $this->instance('app', $this);
+        $this->instance('config', new Config());
+        $this->instance('request', new Request($this->config));
+        $this->instance('route', new Route($this->request));
         $this->regexBind('#^(\w+)_model$#', "\\tests\\app\\models\\\\$1");
-        $this->bind('pinyin','\puck\helpers\PinYin');
-        $this->bind('curl','\puck\helpers\Curl');
+        $this->bind('pinyin', '\puck\helpers\PinYin');
+        $this->bind('curl', '\puck\helpers\Curl');
         $this->bind('dom', '\puck\helpers\Dom');
     }
 
@@ -94,8 +94,8 @@ 
             return;
         }
         //标记为已加载
-        $this->loadedConfigurations[$name] = true;
-        $path = $this->getConfigurationPath($name);
+        $this->loadedConfigurations[$name]=true;
+        $path=$this->getConfigurationPath($name);
         if ($path) {
             $this->make('config')->set($name, require $path);
         }
@@ -111,21 +111,21 @@ 
      * @param  string|null  $name
      * @return string
      */
-    public function getConfigurationPath($name = null)
+    public function getConfigurationPath($name=null)
     {
-        if (! $name) {
-            $appConfigDir = $this->basePath('configs').'/';
+        if (!$name) {
+            $appConfigDir=$this->basePath('configs').'/';
 
             if (file_exists($appConfigDir)) {
                 return $appConfigDir;
-            } elseif (file_exists($path = __DIR__.'/configs/')) {
+            } elseif (file_exists($path=__DIR__.'/configs/')) {
                 return $path;
             }
         } else {
-            $appConfigPath = $this->basePath('configs').'/'.$name.'.php';
+            $appConfigPath=$this->basePath('configs').'/'.$name.'.php';
             if (file_exists($appConfigPath)) {
                 return $appConfigPath;
-            } elseif (file_exists($path = __DIR__.'/configs/'.$name.'.php')) {
+            } elseif (file_exists($path=__DIR__.'/configs/'.$name.'.php')) {
                 return $path;
             }
         }
@@ -137,15 +137,15 @@ 
      * @param  string|null $path
      * @return string
      */
-    public function basePath($path = null) {
+    public function basePath($path=null) {
         if (isset($this->basePath)) {
-            return $this->basePath . ($path ? '/' . $path : $path);
+            return $this->basePath.($path ? '/'.$path : $path);
         }
 
         if ($this->runningInConsole()) {
-            $this->basePath = getcwd();
+            $this->basePath=getcwd();
         } else {
-            $this->basePath = realpath(getcwd() . '/../');
+            $this->basePath=realpath(getcwd().'/../');
         }
 
         return $this->basePath($path);

core/Container.php

Spacing +35 added lines, -35 removed lines

@@ -19,7 +19,7 @@ 
     // 容器中绑定的对象标识
     protected $bind=[];
     // 正则绑定 
-    protected $regexBind = [];
+    protected $regexBind=[];
     /**
      * 获取当前容器的实例（单例）
      * @access public
@@ -47,7 +47,7 @@ 
 
 
     public function regexBind($regex, $class) {
-        $this->regexBind[$regex] = $class;
+        $this->regexBind[$regex]=$class;
     }
 
     /**
@@ -86,10 +86,10 @@ 
      * @param array $vars 变量
      * @return mixed
      */
-    public function invokeFunction($function, $vars = [])
+    public function invokeFunction($function, $vars=[])
     {
-        $reflect = new \ReflectionFunction($function);
-        $args = $this->bindParams($reflect, $vars);
+        $reflect=new \ReflectionFunction($function);
+        $args=$this->bindParams($reflect, $vars);
         return $reflect->invokeArgs($args);
     }
 
@@ -134,36 +134,36 @@ 
      * @param array $vars 变量
      * @return object
      */
-    public function make($abstract, $vars = [], $newInstance = false) {
+    public function make($abstract, $vars=[], $newInstance=false) {
         if (isset($this->instances[$abstract])) {
-            $object = $this->instances[$abstract];
+            $object=$this->instances[$abstract];
         } else {
             if (isset($this->bind[$abstract])) {
-                $concrete = $this->bind[$abstract];
-                $object = $this->makeObject($concrete, $vars);
+                $concrete=$this->bind[$abstract];
+                $object=$this->makeObject($concrete, $vars);
             } else {
                 //正则绑定
-                $result = preg_filter(array_keys($this->regexBind), array_values($this->regexBind), $abstract);
+                $result=preg_filter(array_keys($this->regexBind), array_values($this->regexBind), $abstract);
                 if ($result) {
-                    $concrete = is_array($result) ? end($result) : $result;
-                    $object = $this->makeObject($concrete, $vars);
+                    $concrete=is_array($result) ? end($result) : $result;
+                    $object=$this->makeObject($concrete, $vars);
                 } else {
-                    $object = $this->invokeClass($abstract, $vars);
+                    $object=$this->invokeClass($abstract, $vars);
                 }
             }
 
             if (!$newInstance) {
-                $this->instances[$abstract] = $object;
+                $this->instances[$abstract]=$object;
             }
         }
         return $object;
     }
 
-    private function makeObject($concrete, $vars = []) {
+    private function makeObject($concrete, $vars=[]) {
         if ($concrete instanceof \Closure) {
-            $object = $this->invokeFunction($concrete, $vars);
+            $object=$this->invokeFunction($concrete, $vars);
         } else {
-            $object = $this->make($concrete, $vars);
+            $object=$this->make($concrete, $vars);
         }
         return $object;
     }
@@ -175,23 +175,23 @@ 
      * @param array $vars 变量
      * @return mixed
      */
-    public function invokeClass($class, $vars = []) {
+    public function invokeClass($class, $vars=[]) {
         try {
-            $reflect = new \ReflectionClass($class);
+            $reflect=new \ReflectionClass($class);
         } catch (\ReflectionException $e) {
-            $classArray = explode("\\", $class);
-            $classSelf = array_pop($classArray);
-            $classSelf = Str::studly($classSelf);
+            $classArray=explode("\\", $class);
+            $classSelf=array_pop($classArray);
+            $classSelf=Str::studly($classSelf);
             array_push($classArray, $classSelf);
-            $class = implode("\\", $classArray);
-            $reflect = new \ReflectionClass($class);
+            $class=implode("\\", $classArray);
+            $reflect=new \ReflectionClass($class);
         }
 
-        $constructor = $reflect->getConstructor();
+        $constructor=$reflect->getConstructor();
         if ($constructor) {
-            $args = $this->bindParams($constructor, $vars);
+            $args=$this->bindParams($constructor, $vars);
         } else {
-            $args = [];
+            $args=[];
         }
         return $reflect->newInstanceArgs($args);
     }
@@ -203,15 +203,15 @@ 
      * @param array $vars 变量
      * @return mixed
      */
-    public function invokeMethod($method, $vars = []) {
+    public function invokeMethod($method, $vars=[]) {
         if (is_array($method)) {
-            $class = is_object($method[0]) ? $method[0] : $this->invokeClass($method[0]);
-            $reflect = new \ReflectionMethod($class, $method[1]);
+            $class=is_object($method[0]) ? $method[0] : $this->invokeClass($method[0]);
+            $reflect=new \ReflectionMethod($class, $method[1]);
         } else {
             // 静态方法
-            $reflect = new \ReflectionMethod($method);
+            $reflect=new \ReflectionMethod($method);
         }
-        $args = $this->bindParams($reflect, $vars);
+        $args=$this->bindParams($reflect, $vars);
         return $reflect->invokeArgs(isset($class) ? $class : null, $args);
     }
 
@@ -247,11 +247,11 @@ 
      * @param string|\Closure $concrete 要绑定的类或者闭包
      * @return void
      */
-    public function bind($abstract, $concrete = null) {
+    public function bind($abstract, $concrete=null) {
         if (is_array($abstract)) {
-            $this->bind = array_merge($this->bind, $abstract);
+            $this->bind=array_merge($this->bind, $abstract);
         } else {
-            $this->bind[$abstract] = $concrete;
+            $this->bind[$abstract]=$concrete;
         }
     }
 

core/tools/Str.php

Spacing +46 added lines, -46 removed lines

@@ -12,19 +12,19 @@ 
      *
      * @var array
      */
-    protected static $snakeCache = [];
+    protected static $snakeCache=[];
     /**
      * The cache of camel-cased words.
      *
      * @var array
      */
-    protected static $camelCache = [];
+    protected static $camelCache=[];
     /**
      * The cache of studly-cased words.
      *
      * @var array
      */
-    protected static $studlyCache = [];
+    protected static $studlyCache=[];
 
     /**
      * 判断一个字符串是否以给定字符串开始
@@ -71,7 +71,7 @@ 
             return static::$camelCache[$value];
         }
 
-        return static::$camelCache[$value] = lcfirst(static::studly($value));
+        return static::$camelCache[$value]=lcfirst(static::studly($value));
     }
 
     /**
@@ -81,15 +81,15 @@ 
      * @return string
      */
     public static function studly($value) {
-        $key = $value;
+        $key=$value;
 
         if (isset(static::$studlyCache[$key])) {
             return static::$studlyCache[$key];
         }
 
-        $value = ucwords(str_replace(['-', '_'], ' ', $value));
+        $value=ucwords(str_replace(['-', '_'], ' ', $value));
 
-        return static::$studlyCache[$key] = str_replace(' ', '', $value);
+        return static::$studlyCache[$key]=str_replace(' ', '', $value);
     }
 
     /**
@@ -100,9 +100,9 @@ 
      * @return string
      */
     public static function finish($value, $cap) {
-        $quoted = preg_quote($cap, '/');
+        $quoted=preg_quote($cap, '/');
 
-        return preg_replace('/(?:' . $quoted . ')+$/u', '', $value) . $cap;
+        return preg_replace('/(?:'.$quoted.')+$/u', '', $value).$cap;
     }
 
     /**
@@ -117,14 +117,14 @@ 
             return true;
         }
 
-        $pattern = preg_quote($pattern, '#');
+        $pattern=preg_quote($pattern, '#');
 
         // Asterisks are translated into zero-or-more regular expression wildcards
         // to make it convenient to check if the strings starts with the given
         // pattern such as "library/*", making any string check convenient.
-        $pattern = str_replace('\*', '.*', $pattern);
+        $pattern=str_replace('\*', '.*', $pattern);
 
-        return (bool)preg_match('#^' . $pattern . '\z#u', $value);
+        return (bool) preg_match('#^'.$pattern.'\z#u', $value);
     }
 
     /**
@@ -144,20 +144,20 @@ 
      * @param  string $delimiter
      * @return string
      */
-    public static function snake($value, $delimiter = '_') {
-        $key = $value;
+    public static function snake($value, $delimiter='_') {
+        $key=$value;
 
         if (isset(static::$snakeCache[$key][$delimiter])) {
             return static::$snakeCache[$key][$delimiter];
         }
 
         if (!ctype_lower($value)) {
-            $value = preg_replace('/\s+/u', '', $value);
+            $value=preg_replace('/\s+/u', '', $value);
 
-            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1' . $delimiter, $value));
+            $value=static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
         }
 
-        return static::$snakeCache[$key][$delimiter] = $value;
+        return static::$snakeCache[$key][$delimiter]=$value;
     }
 
     /**
@@ -178,12 +178,12 @@ 
      * @param  string $end
      * @return string
      */
-    public static function limit($value, $limit = 100, $end = '...') {
+    public static function limit($value, $limit=100, $end='...') {
         if (mb_strwidth($value, 'UTF-8') <= $limit) {
             return $value;
         }
 
-        return rtrim(mb_strimwidth($value, 0, $limit, '', 'UTF-8')) . $end;
+        return rtrim(mb_strimwidth($value, 0, $limit, '', 'UTF-8')).$end;
     }
 
     /**
@@ -194,14 +194,14 @@ 
      * @param  string $end
      * @return string
      */
-    public static function words($value, $words = 100, $end = '...') {
-        preg_match('/^\s*+(?:\S++\s*+){1,' . $words . '}/u', $value, $matches);
+    public static function words($value, $words=100, $end='...') {
+        preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches);
 
         if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) {
             return $value;
         }
 
-        return rtrim($matches[0]) . $end;
+        return rtrim($matches[0]).$end;
     }
 
     /**
@@ -221,7 +221,7 @@ 
      * @param  string|null $default
      * @return array
      */
-    public static function parseCallback($callback, $default = null) {
+    public static function parseCallback($callback, $default=null) {
         return static::contains($callback, '@') ? explode('@', $callback, 2) : [$callback, $default];
     }
 
@@ -233,7 +233,7 @@ 
      * @return bool
      */
     public static function contains($haystack, $needles) {
-        foreach ((array)$needles as $needle) {
+        foreach ((array) $needles as $needle) {
             if ($needle != '' && mb_strpos($haystack, $needle) !== false) {
                 return true;
             }
@@ -248,7 +248,7 @@ 
      * @param  int $count
      * @return string
      */
-    public static function plural($value, $count = 2) {
+    public static function plural($value, $count=2) {
         return Pluralizer::plural($value, $count);
     }
 
@@ -262,12 +262,12 @@ 
      * @param  int $length
      * @return string
      */
-    public static function quickRandom($length = 16) {
+    public static function quickRandom($length=16) {
         if (PHP_MAJOR_VERSION > 5) {
             return static::random($length);
         }
 
-        $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $pool='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
         return substr(str_shuffle(str_repeat($pool, $length)), 0, $length);
     }
@@ -278,15 +278,15 @@ 
      * @param  int $length
      * @return string
      */
-    public static function random($length = 16) {
-        $string = '';
+    public static function random($length=16) {
+        $string='';
 
-        while (($len = strlen($string)) < $length) {
-            $size = $length - $len;
+        while (($len=strlen($string)) < $length) {
+            $size=$length - $len;
 
-            $bytes = random_bytes($size);
+            $bytes=random_bytes($size);
 
-            $string .= substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, $size);
+            $string.=substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, $size);
         }
 
         return $string;
@@ -302,7 +302,7 @@ 
      */
     public static function replaceArray($search, array $replace, $subject) {
         foreach ($replace as $value) {
-            $subject = static::replaceFirst($search, $value, $subject);
+            $subject=static::replaceFirst($search, $value, $subject);
         }
 
         return $subject;
@@ -317,7 +317,7 @@ 
      * @return string
      */
     public static function replaceFirst($search, $replace, $subject) {
-        $position = strpos($subject, $search);
+        $position=strpos($subject, $search);
 
         if ($position !== false) {
             return substr_replace($subject, $replace, $position, strlen($search));
@@ -335,7 +335,7 @@ 
      * @return string
      */
     public static function replaceLast($search, $replace, $subject) {
-        $position = strrpos($subject, $search);
+        $position=strrpos($subject, $search);
 
         if ($position !== false) {
             return substr_replace($subject, $replace, $position, strlen($search));
@@ -371,19 +371,19 @@ 
      * @param  string $separator
      * @return string
      */
-    public static function slug($title, $separator = '-') {
-        $title = static::ascii($title);
+    public static function slug($title, $separator='-') {
+        $title=static::ascii($title);
 
         // Convert all dashes/underscores into separator
-        $flip = $separator == '-' ? '_' : '-';
+        $flip=$separator == '-' ? '_' : '-';
 
-        $title = preg_replace('![' . preg_quote($flip) . ']+!u', $separator, $title);
+        $title=preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
 
         // Remove all characters that are not the separator, letters, numbers, or whitespace.
-        $title = preg_replace('![^' . preg_quote($separator) . '\pL\pN\s]+!u', '', mb_strtolower($title));
+        $title=preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', mb_strtolower($title));
 
         // Replace all separator characters and whitespace by a single separator
-        $title = preg_replace('![' . preg_quote($separator) . '\s]+!u', $separator, $title);
+        $title=preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
 
         return trim($title, $separator);
     }
@@ -396,7 +396,7 @@ 
      */
     public static function ascii($value) {
         foreach (static::charsArray() as $key => $val) {
-            $value = str_replace($val, $key, $value);
+            $value=str_replace($val, $key, $value);
         }
 
         return preg_replace('/[^\x20-\x7E]/u', '', $value);
@@ -418,7 +418,7 @@ 
             return $charsArray;
         }
 
-        return $charsArray = [
+        return $charsArray=[
             '0' => ['°', '₀', '۰'],
             '1' => ['¹', '₁', '۱'],
             '2' => ['²', '₂', '۲'],
@@ -542,7 +542,7 @@ 
      * @return string
      */
     public static function ucfirst($string) {
-        return static::upper(static::substr($string, 0, 1)) . static::substr($string, 1);
+        return static::upper(static::substr($string, 0, 1)).static::substr($string, 1);
     }
 
     /**
@@ -563,7 +563,7 @@ 
      * @param  int|null $length
      * @return string
      */
-    public static function substr($string, $start, $length = null) {
+    public static function substr($string, $start, $length=null) {
         return mb_substr($string, $start, $length, 'UTF-8');
     }
 }
\ No newline at end of file