dxkite / suda

server.php

Spacing +7 added lines, -7 removed lines

@@ -2,17 +2,17 @@
 $host = $argv[1] ?? '127.0.0.1:9501';
 list($ip, $port) = explode(':', $host);
 
-defined('SUDA_APP') or define('SUDA_APP', __DIR__ . '/app');
-defined('SUDA_DATA') or define('SUDA_DATA', __DIR__ . '/data');
-defined('SUDA_SYSTEM') or define('SUDA_SYSTEM', __DIR__ . '/suda');
+defined('SUDA_APP') or define('SUDA_APP', __DIR__.'/app');
+defined('SUDA_DATA') or define('SUDA_DATA', __DIR__.'/data');
+defined('SUDA_SYSTEM') or define('SUDA_SYSTEM', __DIR__.'/suda');
 defined('SUDA_PUBLIC') or define('SUDA_PUBLIC', __DIR__);
 defined('SUDA_DEBUG') or define('SUDA_DEBUG', true);
 defined('SUDA_DEBUG_LEVEL') or define('SUDA_DEBUG_LEVEL', 'debug');
-defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP . '/manifest');
-defined('SUDA_DEBUG_LOG_PATH') or define('SUDA_DEBUG_LOG_PATH', SUDA_DATA . '/logs');
+defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP.'/manifest');
+defined('SUDA_DEBUG_LOG_PATH') or define('SUDA_DEBUG_LOG_PATH', SUDA_DATA.'/logs');
 // 设置IP或者端口
 defined('SUDA_SWOOLE_IP') or define('SUDA_SWOOLE_IP', $ip);
 defined('SUDA_SWOOLE_PORT') or define('SUDA_SWOOLE_PORT', $port);
 
-require_once __DIR__ . '/vendor/autoload.php';
-require_once SUDA_SYSTEM . '/loader/swoole.php';
\ No newline at end of file
+require_once __DIR__.'/vendor/autoload.php';
+require_once SUDA_SYSTEM.'/loader/swoole.php';
\ No newline at end of file

suda/src/application/ApplicationModule.php

Spacing +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
             $module = $default;
         }
         if ($module !== null && ($moduleObj = $this->find($module))) {
-            return $moduleObj->getFullName() . ':' . $name;
+            return $moduleObj->getFullName().':'.$name;
         }
         return $name;
     }

suda/src/application/loader/ApplicationLoader.php

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
         foreach ($this->application->getModules() as $name => $module) {
             if ($module->getStatus() === Module::REACHABLE) {
                 $this->loadModuleRoute($module);
-                $this->application->debug()->debug('reachable # ' . $module->getFullName());
+                $this->application->debug()->debug('reachable # '.$module->getFullName());
             }
         }
     }
@@ -83,8 +83,8 @@ 
      */
     protected function loadRouteGroup(Module $module, string $groupName)
     {
-        $group = $groupName === 'default' ? '' : '-' . $groupName;
-        if ($path = $module->getResource()->getConfigResourcePath('config/route' . $group)) {
+        $group = $groupName === 'default' ? '' : '-'.$groupName;
+        if ($path = $module->getResource()->getConfigResourcePath('config/route'.$group)) {
             $routeConfig = Config::loadConfig($path, [
                 'module' => $module->getName(),
                 'group' => $groupName,
@@ -92,7 +92,7 @@ 
                 'config' => $module->getConfig(),
             ]);
             if ($routeConfig !== null) {
-                $prefix = $module->getConfig('route-prefix.' . $groupName, '');
+                $prefix = $module->getConfig('route-prefix.'.$groupName, '');
                 $this->loadRouteConfig($module, $prefix, $groupName, $routeConfig);
             }
         }
@@ -121,9 +121,9 @@ 
             $uri = $config['uri'] ?? '/';
             $anti = array_key_exists('anti-prefix', $config) && $config['anti-prefix'];
             if ($anti) {
-                $uri = '/' . trim($uri, '/');
+                $uri = '/'.trim($uri, '/');
             } else {
-                $uri = '/' . trim($prefix . $uri, '/');
+                $uri = '/'.trim($prefix.$uri, '/');
             }
             $this->application->request($method, $exname, $uri, $attributes);
         }

suda/src/application/loader/ModuleLoader.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
     {
         $this->loadVendorIfExist();
         $this->loadShareLibrary();
-        $this->application->debug()->debug('loaded - ' . $this->module->getFullName());
+        $this->application->debug()->debug('loaded - '.$this->module->getFullName());
     }
 
     /**
@@ -33,7 +33,7 @@ 
     public function toActive()
     {
         $this->loadConfig();
-        $this->application->debug()->debug('active = ' . $this->module->getFullName());
+        $this->application->debug()->debug('active = '.$this->module->getFullName());
     }
 
     /**
@@ -44,7 +44,7 @@ 
         $this->checkRequirements();
         $this->loadPrivateLibrary();
         $this->application->setRunning($this->module);
-        $this->application->debug()->debug('run + ' . $this->module->getFullName());
+        $this->application->debug()->debug('run + '.$this->module->getFullName());
     }
 
     /**
@@ -91,7 +91,7 @@ 
      */
     public function loadVendorIfExist()
     {
-        $vendorAutoload = $this->module->getPath() . '/vendor/autoload.php';
+        $vendorAutoload = $this->module->getPath().'/vendor/autoload.php';
         if (FileSystem::exist($vendorAutoload)) {
             Loader::requireOnce($vendorAutoload);
         }

suda/resource/app/modules/welcome/share/console/TestConsole.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $name = $input->getArgument('name');
         
         if (is_string($name)) {
-            $text = 'Hello ' . $name;
+            $text = 'Hello '.$name;
         } else {
             $text = 'Hello';
         }

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

Spacing +7 added lines, -7 removed lines

@@ -98,8 +98,8 @@ 
         $table = $this->fields->getRealTableName($this->connection);
         $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;
     }
@@ -117,7 +117,7 @@ 
             }
         }
         if (count($primary)) {
-            return 'PRIMARY KEY ('. implode(',', $primary).')';
+            return 'PRIMARY KEY ('.implode(',', $primary).')';
         }
         return  '';
     }
@@ -210,10 +210,10 @@ 
     protected function createField(Field $field)
     {
         $type = strtoupper($field->getValueType()).$this->parseLength($field->getLength());
-        $auto = $field->getAuto() ?'AUTO_INCREMENT':'';
-        $null = $field->isNullable() === null? '': $field->isNullable() === true ? '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 ? '' : $field->isNullable() === true ? '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/database/statement/ReadStatement.php

Spacing +6 added lines, -6 removed lines

@@ -197,7 +197,7 @@ 
     protected function whereStringArray(string $where, array $whereBinder)
     {
         [$where, $whereBinder] = $this->prepareWhereString($where, $whereBinder);
-        $this->where = 'WHERE ' . $where;
+        $this->where = 'WHERE '.$where;
         $this->binder = $this->mergeBinder($this->binder, $whereBinder);
     }
 
@@ -210,7 +210,7 @@ 
     public function groupBy(string $what)
     {
         $what = $this->middleware->inputName($what);
-        $this->groupBy = 'GROUP BY `' . $what . '`';
+        $this->groupBy = 'GROUP BY `'.$what.'`';
         return $this;
     }
 
@@ -253,7 +253,7 @@ 
     protected function havingStringArray(string $having, array $havingBinder)
     {
         [$having, $havingBinder] = $this->prepareWhereString($having, $havingBinder);
-        $this->having = 'HAVING ' . $having;
+        $this->having = 'HAVING '.$having;
         $this->binder = $this->mergeBinder($this->binder, $havingBinder);
     }
 
@@ -269,9 +269,9 @@ 
         $what = $this->middleware->inputName($what);
         $order = strtoupper($order);
         if (strlen($this->orderBy) > 0) {
-            $this->orderBy .= ',`' . $what . '` ' . $order;
+            $this->orderBy .= ',`'.$what.'` '.$order;
         } else {
-            $this->orderBy = 'ORDER BY `' . $what . '` ' . $order;
+            $this->orderBy = 'ORDER BY `'.$what.'` '.$order;
         }
         return $this;
     }
@@ -293,7 +293,7 @@ 
      */
     public function limit(int $start, int $length = null)
     {
-        $this->limit = 'LIMIT ' . $start . ($length !== null ? ',' . $length : '');
+        $this->limit = 'LIMIT '.$start.($length !== null ? ','.$length : '');
         return $this;
     }
 

suda/src/database/statement/WherePrepareTrait.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
     public function prepareQueryMark(string $sql, array $parameter)
     {
         $binders = [];
-        $query = preg_replace_callback('/\?/', function ($match) use (&$binders, $parameter) {
+        $query = preg_replace_callback('/\?/', function($match) use (&$binders, $parameter) {
             $index = count($binders);
             if (array_key_exists($index, $parameter)) {
                 $name = Binder::index($index);
@@ -32,7 +32,7 @@ 
                 } else {
                     $binder = new Binder($name, $parameter[$index]);
                     $binders[] = $binder;
-                    return ':' . $binder->getName();
+                    return ':'.$binder->getName();
                 }
             }
             return $match[0];
@@ -50,14 +50,14 @@ 
     public function prepareInParameter($values, string $name)
     {
         if ($this->countObject($values) <= 0) {
-            throw new SQLException('on field ' . $name . ' value can\'t be empty array');
+            throw new SQLException('on field '.$name.' value can\'t be empty array');
         }
         $names = [];
         $binders = [];
         foreach ($values as $value) {
             $_name = Binder::index($name);
             $binders[] = new Binder($_name, $value);
-            $names[] = ':' . $_name;
+            $names[] = ':'.$_name;
         }
         return [implode(',', $names), $binders];
     }
@@ -85,10 +85,10 @@ 
     public function createQueryOperation(string $name, string $operator, $value, string $indexName = '')
     {
         if ($value instanceof Query) {
-            return new Query("`{$name}` {$operator} " . $value, $value->getBinder());
+            return new Query("`{$name}` {$operator} ".$value, $value->getBinder());
         }
         if ($value instanceof Statement) {
-            return new Query("`{$name}` {$operator} (" . $value->getQuery() . ')', $value->getBinder());
+            return new Query("`{$name}` {$operator} (".$value->getQuery().')', $value->getBinder());
         }
         if ($value instanceof IteratorAggregate || is_array($value)) {
             return $this->prepareIn($name, $operator, $value);
@@ -229,7 +229,7 @@ 
             return $this->createQueryOperation($name, 'in', $values);
         }
         [$inSQL, $binders] = $this->prepareInParameter($values, $name);
-        $sql = '`' . $name . '` ' . strtoupper($operation) . ' (' . $inSQL . ')';
+        $sql = '`'.$name.'` '.strtoupper($operation).' ('.$inSQL.')';
         return new Query($sql, $binders);
     }
 
@@ -244,6 +244,6 @@ 
     public function replaceQuote(string $name, string $replace, string $target)
     {
         $name = ltrim($name, ':');
-        return preg_replace('/(?<!_):' . preg_quote($name) . '/', $replace, $target);
+        return preg_replace('/(?<!_):'.preg_quote($name).'/', $replace, $target);
     }
 }

suda/src/application/database/Database.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         if (array_key_exists($groupName, static::$dataSource)) {
             return static::$dataSource[$groupName];
         }
-        $group = $groupName === 'default' ? '': '-'. $groupName;
+        $group = $groupName === 'default' ? '' : '-'.$groupName;
         $dataSourceConfigPath = $resource->getConfigResourcePath('config/data-source'.$group);
         $dataSource = new DataSource;
         if ($dataSourceConfigPath !== null) {