Rozbo / puck

core/App.php

Spacing +24 added lines, -24 removed lines

@@ -18,7 +18,7 @@ 
      *
      * @var array
      */
-    protected $loadedConfigurations = [];
+    protected $loadedConfigurations=[];
 
     /**
      * 应用的根目录.
@@ -32,21 +32,21 @@ 
         $this->initContainer();
         $this->initConfig();
     }
-    private function initConfig(){
+    private function initConfig() {
         $this->configure('core');
     }
 
-    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,12 +68,12 @@ 
      */
     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->bind('pinyin','\puck\helpers\PinYin');
-        $this->bind('curl','\puck\helpers\Curl');
+        $this->instance('app', $this);
+        $this->instance('config', new Config());
+        $this->instance('request', new Request($this->config));
+        $this->instance('route', new Route($this->request));
+        $this->bind('pinyin', '\puck\helpers\PinYin');
+        $this->bind('curl', '\puck\helpers\Curl');
     }
 
     /**
@@ -82,16 +82,16 @@ 
      * @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);
         }
 
         if ($this->runningInConsole()) {
-            $this->basePath = getcwd();
+            $this->basePath=getcwd();
         } else {
-            $this->basePath = realpath(getcwd().'/../');
+            $this->basePath=realpath(getcwd().'/../');
         }
 
         return $this->basePath($path);
@@ -117,8 +117,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);
         }
@@ -135,21 +135,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;
             }
         }

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
         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'));

core/Route.php

Spacing +31 added lines, -31 removed lines

@@ -9,18 +9,18 @@ 
     private $request;
 
     public function __construct(Request $request) {
-        $this->request = $request;
-        $this->errorCallback=function (){
+        $this->request=$request;
+        $this->errorCallback=function() {
             die("404");
         };
     }
 
-    public static $halts = false;
-    private $routes = array();
-    private $regexRoutes = [];
-    public static $methods = array();
-    public static $callbacks = array();
-    private $patterns = array(
+    public static $halts=false;
+    private $routes=array();
+    private $regexRoutes=[];
+    public static $methods=array();
+    public static $callbacks=array();
+    private $patterns=array(
         ':any' => '[^/]+',
         ':num' => '[0-9]+',
         ':all' => '.*'
@@ -41,29 +41,29 @@ 
      * @param mixed $callBack
      */
     public function addRoute($method, $uri, $callBack) {
-        $method = strtoupper($method);
+        $method=strtoupper($method);
         //预定义正则路由
         if (strpos($uri, ':') !== false) {
-            $searches = array_keys($this->patterns);
-            $replaces = array_values($this->patterns);
-            $uri = str_replace($searches, $replaces, $uri);
-            $this->regexRoutes[] = [
+            $searches=array_keys($this->patterns);
+            $replaces=array_values($this->patterns);
+            $uri=str_replace($searches, $replaces, $uri);
+            $this->regexRoutes[]=[
                 'method' => $method,
-                'regex' => '#^' . $uri . '$#',
+                'regex' => '#^'.$uri.'$#',
                 'callback' => $callBack
             ];
         } //自定义正则路由
         elseif ($uri[0] == '#'
             || (strlen($uri) > 2 && tools\Str::endsWith($uri, '/') && tools\Str::startsWith($uri, '/'))
         ) {
-            $this->regexRoutes[] = [
+            $this->regexRoutes[]=[
                 'method' => $method,
                 'regex' => $uri,
                 'callback' => $callBack
             ];
         } //直接定义的路由
         else {
-            $this->routes[$method . $uri] = [
+            $this->routes[$method.$uri]=[
                 'method' => $method,
                 'uri' => $uri,
                 'callback' => $callBack
@@ -75,25 +75,25 @@ 
      * Defines callback if route is not found
      */
     public function error($callback) {
-        $this->errorCallback = $callback;
+        $this->errorCallback=$callback;
     }
 
-    public static function haltOnMatch($flag = true) {
-        self::$halts = $flag;
+    public static function haltOnMatch($flag=true) {
+        self::$halts=$flag;
     }
 
 
-    private function foundRoute($route, $param = []) {
+    private function foundRoute($route, $param=[]) {
         try {
             if ($route['callback'] instanceof \Closure) {
-                app()->invokeFunction($route['callback'],$param);
+                app()->invokeFunction($route['callback'], $param);
             } else {
                 // Grab all parts based on a / separator
-                $parts = explode('/', $route['callback']);
+                $parts=explode('/', $route['callback']);
                 // Collect the last index of the array
-                $last = end($parts);
+                $last=end($parts);
                 // Grab the controller name and method call
-                $segments = explode('@', $last);
+                $segments=explode('@', $last);
                 app()->invokeMethod($segments, $param);
             }
         } catch (\ReflectionException $e) {
@@ -125,20 +125,20 @@ 
      */
     public function dispatch() {
         $uri=$this->request->path();
-        $current['uri'] = $uri?$uri:'/';
-        $current['method'] = $this->request->method();
+        $current['uri']=$uri ? $uri : '/';
+        $current['method']=$this->request->method();
         # 第一种情况，直接命中
-        if (isset($this->routes[$current['method'] . $current['uri']])) {
-            $this->foundRoute($this->routes[$current['method'] . $current['uri']]);
+        if (isset($this->routes[$current['method'].$current['uri']])) {
+            $this->foundRoute($this->routes[$current['method'].$current['uri']]);
         } # 第二种情况，any命中
-        else if (isset($this->routes['ANY' . $current['uri']])) {
-            $this->foundRoute($this->routes['ANY' . $current['method']]);
+        else if (isset($this->routes['ANY'.$current['uri']])) {
+            $this->foundRoute($this->routes['ANY'.$current['method']]);
         } # 第三种情况，正则命中
         else {
             if ($this->foundRegexRoute($current)) {
 
             } else {
-                $route['callback'] = $this->errorCallback;
+                $route['callback']=$this->errorCallback;
                 $this->foundRoute($route);
             }
         }