dxkite / suda

suda/src/application/ModuleBag.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
      * @param string $path
      * @return \suda\application\Module|null
      */
-    public function guess(string $path):?Module
+    public function guess(string $path): ?Module
     {
         foreach ($this->module as $module) {
             if (FileSystem::isOverflowPath($module->getPath(), $path) === false) {
@@ -112,7 +112,7 @@ 
      * @throws ApplicationException
      * @return Module|null
      */
-    public function get(string $name):?Module
+    public function get(string $name): ?Module
     {
         $full = $this->getFullName($name);
         return  $this->module[$full];
@@ -196,7 +196,7 @@ 
         if (array_key_exists($version, $this->knownsFullName[$name])) {
             return $this->knownsFullName[$name][$version];
         }
-        return $hasVersion?$name.':'.$version:end($this->knownsFullName[$name]);
+        return $hasVersion ? $name.':'.$version : end($this->knownsFullName[$name]);
     }
 
     protected function getLikeName(string $name):string

suda/src/application/ApplicationSource.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
      * @param string|null $default
      * @return string|null
      */
-    public function getUrl(Request $request, string $name, array $parameter = [], bool $allowQuery = true, ?string $default = null, ?string $group = null):?string
+    public function getUrl(Request $request, string $name, array $parameter = [], bool $allowQuery = true, ?string $default = null, ?string $group = null): ?string
     {
         $group = $group ?? $request->getAttribute('group');
         $default = $default ?? $request->getAttribute('module');
@@ -41,7 +41,7 @@ 
      */
     protected function getUrlIndex(Request $request):string
     {
-        $indexs = $this->conf('indexs') ?? [ 'index.php' ];
+        $indexs = $this->conf('indexs') ?? ['index.php'];
         $index = ltrim($request->getIndex(), '/');
         if (!in_array($index, $indexs)) {
             return $request->getIndex();
@@ -143,7 +143,7 @@ 
      */
     public function getUribase(Request $request, bool $beautify = true):string {
         $index = $beautify ? $this->getUrlIndex($request) : $request->getIndex();
-        return $request->getUribase() . $index;
+        return $request->getUribase().$index;
     }
 
     /**
@@ -154,6 +154,6 @@ 
      */
     protected function getRouteGroupPrefix(?string $group):string
     {
-        return $group === null || $group === 'default' ? '': '@'. $group;
+        return $group === null || $group === 'default' ? '' : '@'.$group;
     }
 }

suda/src/application/processor/FileRangeProccessor.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 
     public function __construct($file)
     {
-        $this->file = $file instanceof SplFileObject? $file : new SplFileObject($file);
+        $this->file = $file instanceof SplFileObject ? $file : new SplFileObject($file);
         $this->mime = MimeType::getMimeType($this->file->getExtension());
     }
 
@@ -129,7 +129,7 @@ 
     protected function sendMultipleRangePart(Response $response, array $range)
     {
         $response->write('Content-Type: '.$this->mime."\r\n");
-        $response->write('Content-Range: '.$this->getRangeHeader($range) ."\r\n\r\n");
+        $response->write('Content-Range: '.$this->getRangeHeader($range)."\r\n\r\n");
     }
 
     /**
@@ -188,7 +188,7 @@ 
      * @param string $range
      * @return array
      */
-    protected function parseRange(string $range):?array
+    protected function parseRange(string $range): ?array
     {
         $range = trim($range);
         if (strrpos($range, '-') === strlen($range) - 1) {
@@ -200,9 +200,9 @@ 
             list($start, $end) = explode('-', $range, 2);
             $length = intval($end - $start);
             if ($length <= 0) {
-                return ['start' => intval($start) , 'end' => $this->file->getSize() - 1 ];
+                return ['start' => intval($start), 'end' => $this->file->getSize() - 1];
             }
-            return ['start' => intval($start) , 'end' => intval($end) ];
+            return ['start' => intval($start), 'end' => intval($end)];
         }
         return null;
     }

suda/src/application/database/DataAccess.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      * @return DataAccess
      * @throws ReflectionException
      */
-    public static function new(string $object, ?Middleware $middleware = null):DataAccess
+    public static function new(string $object, ?Middleware $middleware = null) : DataAccess
     {
         return new self($object, $middleware);
     }

suda/src/application/database/DebugObserver.php

Spacing +3 added lines, -3 removed lines

@@ -33,10 +33,10 @@
         $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.'] '. implode(':', $statement->getStatement()->errorInfo()));
+            $this->debug->error('query ['.$status.'] '.$query.' '.number_format($timeSpend, 5).'s');
+            $this->debug->error('query ['.$status.'] '.implode(':', $statement->getStatement()->errorInfo()));
         }
     }
 }

suda/src/application/template/TemplateUtil.php

Spacing +4 added lines, -4 removed lines

@@ -44,13 +44,13 @@ 
     protected static function fixConfig(Application $application, ?string $module, array $config)
     {
         if (!array_key_exists('assets-prefix', $config)) {
-            $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS'): 'assets';
+            $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS') : 'assets';
         }
         if (!array_key_exists('static', $config)) {
             $config['static'] = 'static';
         }
         if (!array_key_exists('assets-path', $config)) {
-            $config['assets-path'] = SUDA_PUBLIC. '/'.$config['assets-prefix'];
+            $config['assets-path'] = SUDA_PUBLIC.'/'.$config['assets-prefix'];
         }
         if (!array_key_exists('static-name', $config)) {
             $config['uri-name'] = static::getSafeUriName($application, $module);
@@ -112,7 +112,7 @@ 
     {
         $assetRoot = static::getAssetRoot($application, $module);
         if (in_array($request->getIndex(), $application->conf('index', ['/index.php']))) {
-            $name = static::writableAssets($application, $module) ? dirname($request->getIndex()):$request->getIndex();
+            $name = static::writableAssets($application, $module) ? dirname($request->getIndex()) : $request->getIndex();
             return rtrim(str_replace('\\', '/', $name), '/').$assetRoot;
         }
         return rtrim(str_replace('\\', '/', $request->getIndex()), '/').$assetRoot;
@@ -145,7 +145,7 @@ 
     public static function getStaticRequestAsset(Application $application, Request $request, ?string $module = null):string
     {
         $assetRoot = static::getAssetRoot($application, $module);
-        $name = static::writableAssets($application, $module) ? dirname($request->getIndex()):$request->getIndex();
+        $name = static::writableAssets($application, $module) ? dirname($request->getIndex()) : $request->getIndex();
         return rtrim(str_replace('\\', '/', $name), '/').$assetRoot;
     }
 

suda/src/application/template/compiler/Compiler.php

Spacing +10 added lines, -10 removed lines

@@ -28,14 +28,14 @@ 
      *
      * @var Tag[]
      */
-    protected $tags=[];
+    protected $tags = [];
 
     /**
      * 命令对象
      *
      * @var CommandInterface[]
      */
-    protected $commands=[];
+    protected $commands = [];
 
     public function __construct()
     {
@@ -64,7 +64,7 @@ 
      */
     public function registerTag(Tag $tag)
     {
-        $this->tags[$tag->getName()] =$tag;
+        $this->tags[$tag->getName()] = $tag;
     }
 
     /**
@@ -77,15 +77,15 @@ 
     public function compileText(string $text, array $tagConfig = []):string
     {
         $this->applyTagConfig($tagConfig);
-        $result  = '';
+        $result = '';
         foreach (token_get_all($text) as $token) {
             if (is_array($token)) {
                 list($tag, $content) = $token;
                 // 所有将要编译的文本
                 // 跳过各种的PHP
                 if ($tag == T_INLINE_HTML) {
-                    $content=$this->proccesTags($content);
-                    $content=$this->proccesCommands($content);
+                    $content = $this->proccesTags($content);
+                    $content = $this->proccesCommands($content);
                 }
                 $result .= $content;
             } else {
@@ -109,7 +109,7 @@ 
     {
         foreach ($this->tags as $tag) {
             $pregExp = sprintf('/(!)?%s\s*(.+?)\s*%s/', preg_quote($tag->getOpen()), preg_quote($tag->getClose()));
-            $text = preg_replace_callback($pregExp, function ($match) use ($tag) {
+            $text = preg_replace_callback($pregExp, function($match) use ($tag) {
                 if ($match[1] === '!') {
                     return substr($match[0], 1);
                 } else {
@@ -122,8 +122,8 @@ 
 
     protected function proccesCommands(string $text):string
     {
-        $pregExp ='/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux';
-        $code = preg_replace_callback($pregExp, [$this,'doMatchCommand'], $text);
+        $pregExp = '/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux';
+        $code = preg_replace_callback($pregExp, [$this, 'doMatchCommand'], $text);
         $error = preg_last_error();
         if ($error !== PREG_NO_ERROR) {
             throw new Exception($error);
@@ -139,7 +139,7 @@ 
             list($input, $ignore, $name, $space) = $match;
             $params = '';
         }
-        if ($ignore ==='!') {
+        if ($ignore === '!') {
             return str_replace('@!', '@', $input);
         } else {
             foreach ($this->commands as $command) {

suda/src/application/template/compiler/EchoValueTrait.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
     public function parseEchoValue($var):string
     {
         // 任意变量名: 中文点下划线英文数字
-        $code = preg_replace_callback('/\B[$](\?)?[:]([.\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )?/ux', [$this,'echoValueCallback'], $var);
+        $code = preg_replace_callback('/\B[$](\?)?[:]([.\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )?/ux', [$this, 'echoValueCallback'], $var);
         $error = preg_last_error();
         if ($error !== PREG_NO_ERROR) {
             throw new Exception($error);
@@ -18,14 +18,14 @@ 
     
     protected function echoValueCallback($matchs)
     {
-        $name=$matchs[2];
-        if ($matchs[1]==='?') {
+        $name = $matchs[2];
+        if ($matchs[1] === '?') {
             return '$this->has("'.$name.'")';
         }
         if (isset($matchs[4])) {
             if (preg_match('/\((.+)\)/', $matchs[4], $v)) {
                 $args = trim($v[1]);
-                $args= strlen($args) ?','.$args:'';
+                $args = strlen($args) ? ','.$args : '';
                 return '$this->get("'.$name.'"'.$args.')';
             }
         }

suda/src/application/template/CompilableTemplate.php

Spacing +7 added lines, -7 removed lines

@@ -109,7 +109,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;
     }
@@ -123,7 +123,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';
     }
 
     /**
@@ -131,7 +131,7 @@ 
      *
      * @return string|null
      */
-    public function getSourcePath():?string
+    public function getSourcePath(): ?string
     {
         return $this->source ?? null;
     }
@@ -152,7 +152,7 @@ 
      *
      * @return void
      */
-    protected function compile(){
+    protected function compile() {
         $sourcePath = $this->getSourcePath();
         $destPath = $this->getPath();
         if ($sourcePath === null) {
@@ -205,7 +205,7 @@ 
     public function include(string $path)
     {
         $subfix = $this->config['subfix'] ?? '';
-        $included = new self(Resource::getPathByRelativePath($path. $subfix, dirname($this->source)), $this->config);
+        $included = new self(Resource::getPathByRelativePath($path.$subfix, dirname($this->source)), $this->config);
         $included->parent = $this;
         echo $included->getRenderedString();
     }
@@ -222,13 +222,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()