dxkite / suda

suda/src/application/database/DebugObserver.php

Spacing +2 added lines, -2 removed lines

@@ -26,9 +26,9 @@
         $status = $result ? 'OK' : 'Err';
         if ($result) {
             $effect = $statement->getStatement()->rowCount();
-            $this->debug->info('query ['.$status.'] '.$query.' '. number_format($timeSpend, 5).'s and effect '. $effect . ' rows');
+            $this->debug->info('query ['.$status.'] '.$query.' '.number_format($timeSpend, 5).'s and effect '.$effect.' rows');
         } else {
-            $this->debug->error('query ['.$status.'] '.$query.' '. number_format($timeSpend, 5).'s');
+            $this->debug->error('query ['.$status.'] '.$query.' '.number_format($timeSpend, 5).'s');
             $this->debug->error('query ['.$status.'] '.\implode(':', $statement->getStatement()->errorInfo()));
         }
     }

suda/src/application/AppicationBase.php

Spacing +3 added lines, -3 removed lines

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

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

Spacing +7 added lines, -7 removed lines

@@ -30,9 +30,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 = '';
@@ -61,7 +61,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);
@@ -73,7 +73,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);
@@ -109,14 +109,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/parameter/StringParameter.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     public function packValue(?string $matched)
     {
-        return $matched ? urlencode($matched): '';
+        return $matched ? urlencode($matched) : '';
     }
     
     /**

suda/src/application/loader/ModuleLoader.php

Spacing +3 added lines, -3 removed lines

@@ -180,7 +180,7 @@ 
      */
     protected function loadRouteGroup(string $groupName)
     {
-        $group = $groupName === 'default' ? '': '-'. $groupName;
+        $group = $groupName === 'default' ? '' : '-'.$groupName;
         if ($path = $this->module->getResource()->getConfigResourcePath('config/route'.$group)) {
             $routeConfig = Config::loadConfig($path, [
                 'module' => $this->module->getName(),
@@ -204,7 +204,7 @@ 
      */
     protected function loadRouteConfig(string $prefix, string $groupName, array $routeConfig)
     {
-        $module =  $this->module->getFullName();
+        $module = $this->module->getFullName();
         foreach ($routeConfig as $name => $config) {
             $exname = $this->application->getRouteName($name, $module, $groupName);
             $method = $config['method'] ?? [];
@@ -218,7 +218,7 @@ 
             if ($anti) {
                 $uri = '/'.trim($uri, '/');
             } else {
-                $uri = '/'.trim($prefix . $uri, '/');
+                $uri = '/'.trim($prefix.$uri, '/');
             }
             $this->application->request($method, $exname, $uri, $attriute);
         }

suda/src/framework/debug/attach/DumpTrait.php

Spacing +5 added lines, -5 removed lines

@@ -64,11 +64,11 @@ 
     protected static function valueToString(string $key, $value, int $deep):string
     {
         if (is_string($value) && strlen($value) > static::$dumpStringLength) {
-            return  $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE) .'... ,';
+            return  $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE).'... ,';
         } elseif (is_bool($value)) {
             return $key.'='.($value ? 'true' : 'false').' ,';
         } else {
-            return $key.'='.self::parameterToString($value, $deep - 1) .' ,';
+            return $key.'='.self::parameterToString($value, $deep - 1).' ,';
         }
     }
 
@@ -116,7 +116,7 @@ 
         $argsDump = '';
         if (!empty($trace['args'])) {
             foreach ($trace['args'] as $arg) {
-                $argsDump .= self::parameterToString($arg) .',';
+                $argsDump .= self::parameterToString($arg).',';
             }
             $argsDump = rtrim($argsDump, ',');
         }
@@ -126,8 +126,8 @@ 
 
     public static function dumpThrowable(\Throwable $e)
     {
-        $dump = get_class($e).':'. $e->getMessage() .PHP_EOL;
-        $dump .= 'At: ' . $e->getFile().':'.$e->getLine().PHP_EOL;
+        $dump = get_class($e).':'.$e->getMessage().PHP_EOL;
+        $dump .= 'At: '.$e->getFile().':'.$e->getLine().PHP_EOL;
         $dump .= static::dumpTrace($e->getTrace());
         return $dump;
     }

suda/src/application/exception/MissingTemplateException.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct(string $name, int $type = 0)
     {
         $this->name = $name;
-        parent::__construct(sprintf('missing template %s', $name, $type == 0 ? 'source':'dest'));
+        parent::__construct(sprintf('missing template %s', $name, $type == 0 ? 'source' : 'dest'));
     }
 
 

suda/src/application/template/CompilableTemplate.php

Spacing +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
 
     protected function getStaticOutpath()
     {
-        $path = $this->config['assets-public'] ?? \constant('SUDA_PUBLIC').'/assets/'. $this->getStaticName();
+        $path = $this->config['assets-public'] ?? \constant('SUDA_PUBLIC').'/assets/'.$this->getStaticName();
         FileSystem::make($path);
         return $path;
     }
@@ -120,7 +120,7 @@ 
     {
         $output = $this->config['output'] ?? \constant('SUDA_DATA').'/template';
         FileSystem::make($output);
-        return $output .'/'. $this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php';
+        return $output.'/'.$this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php';
     }
 
     /**
@@ -128,7 +128,7 @@ 
      *
      * @return string|null
      */
-    public function getSourcePath():?string
+    public function getSourcePath(): ?string
     {
         return $this->source ?? null;
     }
@@ -149,7 +149,7 @@ 
      *
      * @return void
      */
-    protected function compile(){
+    protected function compile() {
         $sourcePath = $this->getSourcePath();
         $destPath = $this->getPath();
         if ($sourcePath === null) {
@@ -202,7 +202,7 @@ 
     public function include(string $path)
     {
         $subfix = $this->config['subfix'] ?? '';
-        $included = new self(Resource::getPathByRelativedPath($path. $subfix, dirname($this->source)), $this->config);
+        $included = new self(Resource::getPathByRelativedPath($path.$subfix, dirname($this->source)), $this->config);
         $included->parent = $this;
         echo $included->getRenderedString();
     }
@@ -219,13 +219,13 @@ 
     {
         $this->prepareStaticSource();
         if (\array_key_exists('assets-prefix', $this->config)) {
-            $prefix = $this->config['assets-prefix'] ;
+            $prefix = $this->config['assets-prefix'];
         } elseif (defined('SUDA_ASSETS')) {
             $prefix = \constant('SUDA_ASSETS');
         } else {
             $prefix = '/assets';
         }
-        return $prefix .'/'.$this->getStaticName();
+        return $prefix.'/'.$this->getStaticName();
     }
 
     protected function prepareStaticSource()

suda/src/application/template/ModuleTemplate.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
      *
      * @return string|null
      */
-    public function getSourcePath():?string
+    public function getSourcePath(): ?string
     {
         $subfix = $this->config['subfix'] ?? '.tpl.html';
         return $this->getResource($this->module)->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix);
@@ -39,9 +39,9 @@ 
      */
     public function getPath()
     {
-        $output = $this->config['output'] ?? \constant('SUDA_DATA').'/template/'. $this->uriName;
+        $output = $this->config['output'] ?? \constant('SUDA_DATA').'/template/'.$this->uriName;
         FileSystem::make($output);
-        return $output .'/'. $this->name.'.php';
+        return $output.'/'.$this->name.'.php';
     }
 
     /**
@@ -69,7 +69,7 @@ 
             }
             return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group);
         } elseif (is_array($name) && \is_string($defaultName)) {
-            return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name) , true, $this->module, $this->group);
+            return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name), true, $this->module, $this->group);
         } elseif (is_string($defaultName)) {
             return $this->application->getUrl($this->request, $defaultName, $this->request->get() ?? [], true, $this->module, $this->group);
         }
@@ -88,7 +88,7 @@ 
         if ($this->request->getAttribute('route') === $full) {
             if (\is_array($parameter)) {
                 foreach ($parameter as $key => $value) {
-                    if ($this->request->getQuery($key) != $value){
+                    if ($this->request->getQuery($key) != $value) {
                         return false;
                     }
                 }