dxkite / suda

suda/src/application/template/ExceptionTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -14,10 +14,10 @@
 {
     public function __construct(Throwable $exception)
     {
-        $this->path = SUDA_RESOURCE. '/error.php';
+        $this->path = SUDA_RESOURCE.'/error.php';
         $type = get_class($exception);
         $this->value = [
-            'error_type' => $type ,
+            'error_type' => $type,
             'error_sort_type' => strpos($type, '\\') === false ? $type : substr($type, strrpos($type, '\\') + 1),
             'error_code' => $exception->getCode(),
             'error_message' => $exception->getMessage(),

suda/src/application/Application.php

Spacing +5 added lines, -5 removed lines

@@ -41,17 +41,17 @@ 
         $this->debug->info('===============================');
         $this->debug->time('loading application');
         $appLoader->load();
-        $this->event->exec('application:load-config', [ $this->config ,$this]);
+        $this->event->exec('application:load-config', [$this->config, $this]);
         $this->debug->timeEnd('loading application');
         $this->debug->time('loading datasource');
         $appLoader->loadDataSource();
         Table::load($this);
         DataAccess::load($this);
-        $this->event->exec('application:load-environment', [ $this->config ,$this]);
+        $this->event->exec('application:load-environment', [$this->config, $this]);
         $this->debug->timeEnd('loading datasource');
         $this->debug->time('loading route');
         $appLoader->loadRoute();
-        $this->event->exec('application:load-route', [$this->route , $this]);
+        $this->event->exec('application:load-route', [$this->route, $this]);
         $this->debug->timeEnd('loading route');
         $this->debug->info('-------------------------------');
     }
@@ -103,7 +103,7 @@ 
             if (!$response->isSended()) {
                 $response->end();
             }
-            $this->debug->info('resposned with code '. $response->getStatus());
+            $this->debug->info('resposned with code '.$response->getStatus());
             $this->debug->timeEnd('sending response');
         } catch (Throwable $e) {
             $this->debug->uncaughtException($e);
@@ -161,7 +161,7 @@ 
     protected function createResponse(?MatchResult $result, Request $request, Response $response)
     {
         if (SUDA_DEBUG) {
-            $response->setHeader('x-route', $result === null?'default':$result->getName());
+            $response->setHeader('x-route', $result === null ? 'default' : $result->getName());
         }
         if ($result === null) {
             $content = $this->defaultResponse($this, $request, $response);

suda/src/application/Resource.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function __construct($resource = [])
     {
-        $this->resource = is_array($resource)?$resource:[$resource];
+        $this->resource = is_array($resource) ? $resource : [$resource];
     }
 
     /**
@@ -66,7 +66,7 @@ 
      * @param string $limitPath 父级溢出
      * @return string|null
      */
-    public function getResourcePath(string $path, string $limitPath = null):?string
+    public function getResourcePath(string $path, string $limitPath = null): ?string
     {
         foreach ($this->resource as $root) {
             $target = $root.'/'.$path;
@@ -84,7 +84,7 @@ 
      * @param string $path
      * @return string|null
      */
-    public function getConfigResourcePath(string $path):?string
+    public function getConfigResourcePath(string $path): ?string
     {
         foreach ($this->resource as $root) {
             if ($target = PathResolver::resolve($root.'/'.$path)) {

suda/src/application/ApplicationBase.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
      * @param string $name
      * @return Module|null
      */
-    public function find(string $name):?Module
+    public function find(string $name): ?Module
     {
         return $this->module->get($name);
     }
@@ -111,7 +111,7 @@ 
                 $this->modulePaths[] = Resource::getPathByRelativePath($path, $this->path);
             }
         } else {
-            $this->modulePaths = [ Resource::getPathByRelativePath('modules', $this->path) ];
+            $this->modulePaths = [Resource::getPathByRelativePath('modules', $this->path)];
         }
     }
 
@@ -134,7 +134,7 @@ 
      */
     protected function className(string $name)
     {
-        return str_replace(['.','/'], '\\', $name);
+        return str_replace(['.', '/'], '\\', $name);
     }
 
     /**

suda/src/framework/Config.php

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
      * @param array|Config $extra
      * @return array|null
      */
-    public static function loadConfig(string $path, $extra = []):?array
+    public static function loadConfig(string $path, $extra = []): ?array
     {
         if (!file_exists($path)) {
             $path = PathResolver::resolve($path);
@@ -121,7 +121,7 @@ 
         }
         if ($path) {
             $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION));
-            if (in_array($ext, ['yaml','yml','json','php','ini'])) {
+            if (in_array($ext, ['yaml', 'yml', 'json', 'php', 'ini'])) {
                 return ContentLoader::{'load'.ucfirst($ext)}($path, $extra);
             }
             return ContentLoader::loadJson($path, $extra);

suda/src/framework/http/Cookie.php

Spacing +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 
         if ($this->expire !== 0) {
             $time = $this->fulltime ? $this->expire : time() + $this->expire;
-            $dateTime = DateTime::createFromFormat('U',  $time , new DateTimeZone('GMT'));
+            $dateTime = DateTime::createFromFormat('U', $time, new DateTimeZone('GMT'));
             $cookie .= '; expires='.str_replace('+0000', '', $dateTime->format('D, d M Y H:i:s T'));
         }
 

suda/src/framework/route/RouteMatcher.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 
     public function __construct(array $methods, string $uri, array $attribute = [])
     {
-        array_walk($methods, function ($value) {
+        array_walk($methods, function($value) {
             return strtoupper($value);
         });
         $this->methods = $methods;
@@ -159,7 +159,7 @@ 
      * @param Request $request
      * @return array|null
      */
-    public function match(Request $request):?array
+    public function match(Request $request): ?array
     {
         if (count($this->methods) > 0 && !in_array($request->getMethod(), $this->methods)) {
             return null;

suda/src/framework/route/uri/MatcherHelper.php

Spacing +7 added lines, -7 removed lines

@@ -34,9 +34,9 @@ 
         // 添加忽略
         $url = preg_replace('/(\[)([^\[\]]+)(?(1)\])/', '(?:$2)?', $url);
         // 添加 * ? 匹配
-        $url = str_replace(['\*','\?'], ['[^/]*?','[^/]'], $url);
+        $url = str_replace(['\*', '\?'], ['[^/]*?', '[^/]'], $url);
         // 编译页面参数
-        $url = preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function ($match) use (&$parameters) {
+        $url = preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function($match) use (&$parameters) {
             $name = $match[1];
             $type = 'string';
             $extra = '';
@@ -65,7 +65,7 @@ 
         // 拆分参数
         list($mapper, $query, $parameter) = static::analyseParameter($matcher, $parameter);
         // for * ?
-        $url = str_replace(['*','?'], ['','-'], $uri);
+        $url = str_replace(['*', '?'], ['', '-'], $uri);
         // for ignore value
         $url = static::parseIgnoreableParameter($url, $matcher, $parameter, $mapper);
         $url = static::replaceParameter($url, $matcher, $parameter, $mapper);
@@ -77,7 +77,7 @@ 
 
     protected static function parseIgnoreableParameter(string $url, UriMatcher  $matcher, array $parameter, array $mapper):string
     {
-        return preg_replace_callback('/\[(.+?)\]/', function ($match) use ($matcher, $parameter, $mapper) {
+        return preg_replace_callback('/\[(.+?)\]/', function($match) use ($matcher, $parameter, $mapper) {
             if (preg_match('/\{(\w+).+?\}/', $match[1])) {
                 $count = 0;
                 $subUrl = static::replaceParameter($match[1], $matcher, $parameter, $mapper, true, $count);
@@ -113,14 +113,14 @@ 
 
     protected static function replaceParameter(string $input, UriMatcher $matcher, array $parameter, array $mapper, bool $ignore = false, ?int &$count = null)
     {
-        return preg_replace_callback('/\{(\w+).+?\}/', function ($match) use ($matcher, $parameter, $mapper, $ignore, &$count) {
+        return preg_replace_callback('/\{(\w+).+?\}/', function($match) use ($matcher, $parameter, $mapper, $ignore, &$count) {
             if (array_key_exists($match[1], $mapper)) {
-                $count ++;
+                $count++;
                 return $mapper[$match[1]]->packValue($parameter[$match[1]]);
             }
             if ($default = $matcher->getParameter($match[1])) {
                 if ($default->hasDefault()) {
-                    $count ++;
+                    $count++;
                     return $default->getDefaultValue();
                 }
             }

suda/src/framework/route/uri/UriMatcher.php

Spacing +4 added lines, -4 removed lines

@@ -46,9 +46,9 @@ 
      * @param boolean $ignoreCase
      * @return array|null
      */
-    public function match(string $url, bool $ignoreCase = true):?array
+    public function match(string $url, bool $ignoreCase = true): ?array
     {
-        $match = '#^'. $this->match.'$#'. ($ignoreCase?'i':'');
+        $match = '#^'.$this->match.'$#'.($ignoreCase ? 'i' : '');
         $parameter = [];
         if (preg_match($match, $url, $parameter, PREG_UNMATCHED_AS_NULL) > 0) {
             return array_slice($parameter, 1);
@@ -79,7 +79,7 @@ 
         return $parameters;
     }
 
-    public function getParameter(string $name):?Parameter
+    public function getParameter(string $name): ?Parameter
     {
         foreach ($this->parameter as $parameter) {
             if ($parameter->getIndexName() === $name) {
@@ -129,7 +129,7 @@ 
      * @param integer $index
      * @return Parameter|null
      */
-    public function getParameterByIndex(int $index):?Parameter
+    public function getParameterByIndex(int $index): ?Parameter
     {
         foreach ($this->parameter as $parameter) {
             if ($parameter->getIndex() === $index) {