dxkite / suda

suda/src/framework/loader/PathTrait.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
      */
     public static function formatSeparator(string $path):string
     {
-        return str_replace(['\\','/'], DIRECTORY_SEPARATOR, $path);
+        return str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $path);
     }
 
     /**
@@ -83,7 +83,7 @@ 
     {
         if (static::getHomePath() !== null && strpos($path, '~') === 0) {
             $scheme = '';
-            $subpath = static::getHomePath() .DIRECTORY_SEPARATOR.substr($path, 1);
+            $subpath = static::getHomePath().DIRECTORY_SEPARATOR.substr($path, 1);
         } elseif (strpos($path, '://') !== false) {
             list($scheme, $subpath) = explode('://', $path, 2);
             $scheme .= '://';
@@ -98,7 +98,7 @@ 
     /**
      * @return string|null
      */
-    public static function getHomePath():?string
+    public static function getHomePath(): ?string
     {
         if (defined('USER_HOME_PATH')) {
             return constant('USER_HOME_PATH');

suda/src/framework/filesystem/FileHelper.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
      */
     public static function delete(string $filename):bool
     {
-        if (($path=Path::format($filename)) !== null) {
+        if (($path = Path::format($filename)) !== null) {
             if (!is_writable($path)) {
                 return false;
             }
@@ -45,7 +45,7 @@ 
      */
     public static function move(string $src, string $dest):bool
     {
-        if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) {
+        if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) {
             return rename($path, $dest);
         }
         return false;
@@ -60,7 +60,7 @@ 
      */
     public static function copy(string $src, string $dest):bool
     {
-        if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) {
+        if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) {
             return copy($path, $dest);
         }
         return false;
@@ -88,9 +88,9 @@ 
      * @param string $filename
      * @return string|null
      */
-    public static function get(string $filename):?string
+    public static function get(string $filename): ?string
     {
-        if (is_readable($filename) && ($path=Path::format($filename)) !== null) {
+        if (is_readable($filename) && ($path = Path::format($filename)) !== null) {
             return file_get_contents($path);
         }
         return null;

suda/resource/suda_panic.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 function suda_panic($error_type, $error_message, $error_code = 500)
 {
-    date_default_timezone_set(defined('DEFAULT_TIMEZONE')?constant('DEFAULT_TIMEZONE'):'PRC');
+    date_default_timezone_set(defined('DEFAULT_TIMEZONE') ?constant('DEFAULT_TIMEZONE') : 'PRC');
     header('HTTP/1.1 500 Internal Server Error');
     header('Status:500 Internal Server Error');
     ob_start();
     $error_sort_type = strpos($error_type, '\\') === false ? $error_type : substr($error_type, strrpos($error_type, '\\') + 1);
-    include __DIR__ .'/error.php';
+    include __DIR__.'/error.php';
     header('Content-Type:text/html; charset=UTF-8');
     header('Content-Length:'.ob_get_length());
     die(ob_get_clean());

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/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/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;
     }
 
     /**