dxkite / suda

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

suda/src/application/ModuleBag.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
      * @param string $path
      * @return 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) {
@@ -111,7 +111,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];
@@ -195,7 +195,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/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/orm/connection/MySQLConnection.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
             $password = $this->config['password'] ?? '';
             $pdo = new PDO($this->getDsn(), $user, $password);
             $this->id = static::$connectionCount;
-            static::$connectionCount ++;
+            static::$connectionCount++;
             return $pdo;
         } catch (PDOException $e) {
             throw new SQLException(sprintf(
@@ -64,7 +64,7 @@ 
      */
     public function switchDatabase(string $database)
     {
-        return $this->query(new QueryStatement('USE `' . $database.'`'));
+        return $this->query(new QueryStatement('USE `'.$database.'`'));
     }
 
     public function rawTableName(string $name)

suda/src/orm/connection/SQLiteConnection.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         try {
             $pdo = new PDO($this->getDsn());
             $this->id = static::$connectionCount;
-            static::$connectionCount ++;
+            static::$connectionCount++;
             return $pdo;
         } catch (PDOException $e) {
             throw new SQLException(
@@ -62,7 +62,7 @@ 
      */
     public function switchDatabase(string $database)
     {
-        return $this->query(new QueryStatement('USE `' . $database.'`'));
+        return $this->query(new QueryStatement('USE `'.$database.'`'));
     }
 
     /**

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