dxkite / suda

suda/src/orm/DataSource.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
      * @return Connection
      * @throws SQLException
      */
-    public static function new(string $type, array $config, ?string $name = null): Connection
+    public static function new(string $type, array $config, ?string $name = null) : Connection
     {
         if (array_key_exists($type, static::$type)) {
             return new static::$type[$type]($config, $name);

suda/src/framework/loader/Loader.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
      * @param string $className
      * @return string|null
      */
-    public function getClassPath(string $className):?string
+    public function getClassPath(string $className): ?string
     {
         // 搜索路径
         foreach ($this->includePath as $includeNamespace => $includePaths) {
@@ -58,7 +58,7 @@ 
      * @param string $filename
      * @return string|null
      */
-    public function import(string $filename):?string
+    public function import(string $filename): ?string
     {
         if ($filename = static::realPath($filename)) {
             @require_once $filename;
@@ -101,7 +101,7 @@ 
      * @param string $className
      * @return string|null
      */
-    protected function getClassPathByAlias(string $includePath, string $className):?string
+    protected function getClassPathByAlias(string $includePath, string $className): ?string
     {
         $namepath = static::formatSeparator($className);
         $className = static::realName($className);
@@ -126,7 +126,7 @@ 
      * @param string $className
      * @return string|null
      */
-    protected function getClassPathByName(string $includeNamespace, string $includePath, string $className):?string
+    protected function getClassPathByName(string $includeNamespace, string $includePath, string $className): ?string
     {
         if (is_numeric($includeNamespace)) {
             $path = $includePath.DIRECTORY_SEPARATOR.static::formatSeparator($className).'.php';

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/runnable/target/TargetBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -62,12 +62,12 @@ 
         $methodStart = $splitLength ?: strpos($command, '::') ?: $dynmicsMethod;
         $parameter = self::buildParameter($parameter);
         if ($methodStart > 0) {
-            $splitLength = $splitLength > 0 ? 1:2;
+            $splitLength = $splitLength > 0 ? 1 : 2;
             $methodName = substr($command, $methodStart + $splitLength);
             $command = substr($command, 0, $methodStart);
             list($className, $constructParameter) = self::splitParameter($command);
             $constructParameter = self::buildParameter($constructParameter);
-            $target = new MethodTarget($className, $dynmicsMethod? $constructParameter :null, $methodName, $parameter);
+            $target = new MethodTarget($className, $dynmicsMethod ? $constructParameter : null, $methodName, $parameter);
         } else {
             $target = new FunctionTarget(self::buildName($command), $parameter);
         }
@@ -99,7 +99,7 @@ 
         if (preg_match('/^[\w\\\\\/.]+$/', $name) !== 1) {
             throw new InvalidNameException(sprintf('invaild name: %s ', $name));
         }
-        return  str_replace(['.','/'], '\\', $name);
+        return  str_replace(['.', '/'], '\\', $name);
     }
 
     private static function splitParameter(string $command):array
@@ -110,7 +110,7 @@ 
             $parameter = substr($command, $paramStart + 1, strlen($command) - $paramStart - 2);
             $command = substr($command, 0, $paramStart);
         }
-        return [$command,$parameter];
+        return [$command, $parameter];
     }
 
     private static function buildParameter(?string $parameter)

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/framework/route/uri/MatcherHelper.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
         // 添加 * ? 匹配
         $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 = '';
@@ -70,7 +70,7 @@ 
         $url = static::parseIgnorableParameter($url, $matcher, $parameter, $mapper);
         $url = static::replaceParameter($url, $matcher, $parameter, $mapper);
         if (count($query) && $allowQuery) {
-            return $url . '?' . http_build_query($query, 'v', '&', PHP_QUERY_RFC3986);
+            return $url.'?'.http_build_query($query, 'v', '&', PHP_QUERY_RFC3986);
         }
         return $url;
     }
@@ -88,7 +88,7 @@ 
         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);
@@ -141,7 +141,7 @@ 
     ) {
         return preg_replace_callback(
             '/\{(\w+).+?\}/',
-            function ($match) use ($matcher, $parameter, $mapper, $ignore, &$count) {
+            function($match) use ($matcher, $parameter, $mapper, $ignore, &$count) {
                 if (array_key_exists($match[1], $mapper)) {
                     $count++;
                     return $mapper[$match[1]]->packValue($parameter[$match[1]]);

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/Compiler.php

Spacing +10 added lines, -10 removed lines

@@ -26,14 +26,14 @@ 
      *
      * @var Tag[]
      */
-    protected $tags=[];
+    protected $tags = [];
 
     /**
      * 命令对象
      *
      * @var CommandInterface[]
      */
-    protected $commands=[];
+    protected $commands = [];
 
     public function __construct()
     {
@@ -62,7 +62,7 @@ 
      */
     public function registerTag(Tag $tag)
     {
-        $this->tags[$tag->getName()] =$tag;
+        $this->tags[$tag->getName()] = $tag;
     }
 
     /**
@@ -76,15 +76,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->processCommands($content);
+                    $content = $this->proccesTags($content);
+                    $content = $this->processCommands($content);
                 }
                 $result .= $content;
             } else {
@@ -108,7 +108,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 {
@@ -126,8 +126,8 @@ 
      */
     protected function processCommands(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);
@@ -143,7 +143,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/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;
     }
 
     /**