dxkite / suda

suda/src/framework/runnable/target/MethodTarget.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
         $this->method = $method;
         $static = $this->isStatic() ? '->' : '::';
         $name = is_object($object) ? get_class($object) : $object;
-        $this->name = $name . $static . $method;
+        $this->name = $name.$static.$method;
     }
 
     /**
@@ -120,7 +120,7 @@ 
     {
         if (null === $this->requireFile) {
             $this->requireFile = $requireFile;
-            $this->name = $this->name . '@' . $requireFile;
+            $this->name = $this->name.'@'.$requireFile;
         }
         return $this;
     }

suda/src/framework/filesystem/FileSystemInterface.php

Spacing +6 added lines, -6 removed lines

@@ -61,7 +61,7 @@ 
      * @param string $filename
      * @return string|null
      */
-    public static function get(string $filename):?string;
+    public static function get(string $filename): ?string;
 
 
     /**
@@ -84,7 +84,7 @@ 
      * @param int $mode
      * @return Iterator
      */
-    public static function readFiles(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : Iterator;
+    public static function readFiles(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : Iterator;
 
     /**
      * 读目录下文件夹
@@ -96,7 +96,7 @@ 
      * @param int $mode
      * @return Iterator
      */
-    public static function readDirs(string $path, bool $recursive=false, ?string $regex=null, bool $full=false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): Iterator;
+    public static function readDirs(string $path, bool $recursive = false, ?string $regex = null, bool $full = false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): Iterator;
 
     /**
      * 读目录，包括文件，文件夹
@@ -108,7 +108,7 @@ 
      * @param int $mode
      * @return Iterator
      */
-    public static function read(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): Iterator;
+    public static function read(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): Iterator;
 
     /**
      * 截断部分目录
@@ -128,7 +128,7 @@ 
      * @param boolean $move
      * @return boolean
      */
-    public static function copyDir(string $path, string $toPath, ?string $regex=null, bool $move = false):bool;
+    public static function copyDir(string $path, string $toPath, ?string $regex = null, bool $move = false):bool;
     
     /**
      * 移动文件夹
@@ -138,5 +138,5 @@ 
      * @param string|null $regex
      * @return boolean
      */
-    public static function moveDir(string $path, string $toPath, ?string $regex=null):bool;
+    public static function moveDir(string $path, string $toPath, ?string $regex = null):bool;
 }

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

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
         // 任意变量名: 中文点下划线英文数字
         $code = preg_replace_callback(
             '/\B[$](\?)?[:]([.\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )?/ux',
-            [$this,'echoValueCallback'],
+            [$this, 'echoValueCallback'],
             $var
         );
         $error = preg_last_error();
@@ -27,14 +27,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/compiler/Tag.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $this->content = $content;
         $this->name = $name;
         $this->open = $open;
-        $this->close= $close;
+        $this->close = $close;
     }
 
     /**

suda/loader/loader.php

Spacing +5 added lines, -5 removed lines

@@ -42,8 +42,8 @@
     }
 }
 // 加载器
-require_once SUDA_SYSTEM .'/src/framework/loader/Path.php';
-require_once SUDA_SYSTEM .'/src/framework/loader/PathTrait.php';
-require_once SUDA_SYSTEM .'/src/framework/loader/PathInterface.php';
-require_once SUDA_SYSTEM .'/src/framework/loader/IncludeManager.php';
-require_once SUDA_SYSTEM .'/src/framework/loader/Loader.php';
+require_once SUDA_SYSTEM.'/src/framework/loader/Path.php';
+require_once SUDA_SYSTEM.'/src/framework/loader/PathTrait.php';
+require_once SUDA_SYSTEM.'/src/framework/loader/PathInterface.php';
+require_once SUDA_SYSTEM.'/src/framework/loader/IncludeManager.php';
+require_once SUDA_SYSTEM.'/src/framework/loader/Loader.php';

suda/src/application/database/creator/MySQLTableCreator.php

Spacing +7 added lines, -7 removed lines

@@ -105,8 +105,8 @@ 
         $table = $this->connection->rawTableName($this->name);
         $sql = "CREATE TABLE IF NOT EXISTS `{$table}` (\r\n\t";
         $sql .= implode(",\r\n\t", array_filter($content, 'strlen'));
-        $auto = null === $this->auto?'':'AUTO_INCREMENT='.$this->auto;
-        $collate = null === $this->collate?'':'COLLATE '.$this->collate;
+        $auto = null === $this->auto ? '' : 'AUTO_INCREMENT='.$this->auto;
+        $collate = null === $this->collate ? '' : 'COLLATE '.$this->collate;
         $sql .= "\r\n) ENGINE={$this->engine} {$collate} {$auto} DEFAULT CHARSET={$this->charset};";
         return $sql;
     }
@@ -124,7 +124,7 @@ 
             }
         }
         if (count($primary)) {
-            return 'PRIMARY KEY ('. implode(',', $primary).')';
+            return 'PRIMARY KEY ('.implode(',', $primary).')';
         }
         return  '';
     }
@@ -217,10 +217,10 @@ 
     protected function createField(Field $field)
     {
         $type = strtoupper($field->getValueType()).$this->parseLength($field->getLength());
-        $auto = $field->getAuto() ?'AUTO_INCREMENT':'';
-        $null = $field->isNullable() ?'NULL':'NOT NULL';
-        $attr = $field->getAttribute() ?strtoupper($field->getAttribute()):'';
-        $comment = $field->getComment() ?('COMMENT \''.addcslashes($field->getComment(), '\'').'\''):'';
+        $auto = $field->getAuto() ? 'AUTO_INCREMENT' : '';
+        $null = $field->isNullable() ? 'NULL' : 'NOT NULL';
+        $attr = $field->getAttribute() ?strtoupper($field->getAttribute()) : '';
+        $comment = $field->getComment() ? ('COMMENT \''.addcslashes($field->getComment(), '\'').'\'') : '';
         // default设置
         if ($field->hasDefault()) {
             if (null === $field->getDefault()) {

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);
@@ -114,7 +114,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;
@@ -150,7 +150,7 @@ 
         ?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/framework/request/Builder.php

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
         if (array_key_exists('server-port', $this->request->server())) {
             return $this->request->server()['server-port'];
         }
-        return $this->getSecure()?443:80;
+        return $this->getSecure() ? 443 : 80;
     }
 
     /**
@@ -148,7 +148,7 @@ 
      */
     private function createUribase(RequestWrapper $request)
     {
-        $scheme = $request->isSecure()?'https':'http';
+        $scheme = $request->isSecure() ? 'https' : 'http';
         $port = $request->getPort();
         if ($port == 80 && $scheme == 'http') {
             $port = '';
@@ -157,7 +157,7 @@ 
         } else {
             $port = ':'.$port;
         }
-        $base = $scheme.'://'. $request->getHost().$port;
+        $base = $scheme.'://'.$request->getHost().$port;
         $request->setUriBase($base);
     }
 }

suda/src/application/ApplicationSource.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         bool $allowQuery = true,
         ?string $default = null,
         ?string $group = null
-    ):?string {
+    ): ?string {
         $group = $group ?? $request->getAttribute('group');
         $default = $default ?? $request->getAttribute('module');
         $url = $this->route->create($this->getRouteName($name, $default, $group), $parameter, $allowQuery);
@@ -46,7 +46,7 @@ 
      */
     protected function getUrlIndex(Request $request):string
     {
-        $indexArray = $this->conf('index') ?? [ 'index.php' ];
+        $indexArray = $this->conf('index') ?? ['index.php'];
         $index = ltrim($request->getIndex(), '/');
         if (!in_array($index, $indexArray)) {
             return $request->getIndex();
@@ -133,7 +133,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;
     }
 
     /**
@@ -144,6 +144,6 @@ 
      */
     protected function getRouteGroupPrefix(?string $group):string
     {
-        return $group === null || $group === 'default' ? '': '@'. $group;
+        return $group === null || $group === 'default' ? '' : '@'.$group;
     }
 }