@@ -26,7 +26,7 @@ |
||
| 26 | 26 | */ |
| 27 | 27 | public function loadVendorIfExist() |
| 28 | 28 | { |
| 29 | - $vendorAutoload = $this->application->getPath() . '/vendor/autoload.php'; |
|
| 29 | + $vendorAutoload = $this->application->getPath().'/vendor/autoload.php'; |
|
| 30 | 30 | if (FileSystem::exist($vendorAutoload)) { |
| 31 | 31 | Loader::requireOnce($vendorAutoload); |
| 32 | 32 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | $group = $group ?? $request->getAttribute('group'); |
| 58 | 58 | $default = $default ?? $request->getAttribute('module'); |
| 59 | 59 | $url = $this->route->create($this->getRouteName($name, $default, $group), $parameter, $allowQuery); |
| 60 | - return $this->getUrlIndex($request) . ltrim($url, '/'); |
|
| 60 | + return $this->getUrlIndex($request).ltrim($url, '/'); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | public function getUriBase(Request $request, bool $beautify = true): string |
| 90 | 90 | { |
| 91 | 91 | $index = $beautify ? $this->getUrlIndex($request) : $request->getIndex(); |
| 92 | - return $request->getUriBase() . $index; |
|
| 92 | + return $request->getUriBase().$index; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | protected function getRouteGroupPrefix(?string $group): string |
| 102 | 102 | { |
| 103 | - return $group === null || $group === 'default' ? '' : '@' . $group; |
|
| 103 | + return $group === null || $group === 'default' ? '' : '@'.$group; |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | } |
| 139 | 139 | $prefixGroup = $this->getRouteGroupPrefix($group); |
| 140 | 140 | if ($module !== null && ($moduleObj = $this->find($module))) { |
| 141 | - return $moduleObj->getFullName() . $prefixGroup . ':' . $name; |
|
| 141 | + return $moduleObj->getFullName().$prefixGroup.':'.$name; |
|
| 142 | 142 | } |
| 143 | 143 | return $name; |
| 144 | 144 | } |
@@ -2,17 +2,17 @@ |
||
| 2 | 2 | $host = $argv[1] ?? '127.0.0.1:9501'; |
| 3 | 3 | list($ip, $port) = explode(':', $host); |
| 4 | 4 | |
| 5 | -defined('SUDA_APP') or define('SUDA_APP', __DIR__ . '/app'); |
|
| 6 | -defined('SUDA_DATA') or define('SUDA_DATA', __DIR__ . '/data'); |
|
| 7 | -defined('SUDA_SYSTEM') or define('SUDA_SYSTEM', __DIR__ . '/suda'); |
|
| 5 | +defined('SUDA_APP') or define('SUDA_APP', __DIR__.'/app'); |
|
| 6 | +defined('SUDA_DATA') or define('SUDA_DATA', __DIR__.'/data'); |
|
| 7 | +defined('SUDA_SYSTEM') or define('SUDA_SYSTEM', __DIR__.'/suda'); |
|
| 8 | 8 | defined('SUDA_PUBLIC') or define('SUDA_PUBLIC', __DIR__); |
| 9 | 9 | defined('SUDA_DEBUG') or define('SUDA_DEBUG', true); |
| 10 | 10 | defined('SUDA_DEBUG_LEVEL') or define('SUDA_DEBUG_LEVEL', 'debug'); |
| 11 | -defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP . '/manifest'); |
|
| 12 | -defined('SUDA_DEBUG_LOG_PATH') or define('SUDA_DEBUG_LOG_PATH', SUDA_DATA . '/logs'); |
|
| 11 | +defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP.'/manifest'); |
|
| 12 | +defined('SUDA_DEBUG_LOG_PATH') or define('SUDA_DEBUG_LOG_PATH', SUDA_DATA.'/logs'); |
|
| 13 | 13 | // 设置IP或者端口 |
| 14 | 14 | defined('SUDA_SWOOLE_IP') or define('SUDA_SWOOLE_IP', $ip); |
| 15 | 15 | defined('SUDA_SWOOLE_PORT') or define('SUDA_SWOOLE_PORT', $port); |
| 16 | 16 | |
| 17 | -require_once __DIR__ . '/vendor/autoload.php'; |
|
| 18 | -require_once SUDA_SYSTEM . '/loader/swoole.php'; |
|
| 19 | 17 | \ No newline at end of file |
| 18 | +require_once __DIR__.'/vendor/autoload.php'; |
|
| 19 | +require_once SUDA_SYSTEM.'/loader/swoole.php'; |
|
| 20 | 20 | \ No newline at end of file |
@@ -267,7 +267,7 @@ |
||
| 267 | 267 | $module = $default; |
| 268 | 268 | } |
| 269 | 269 | if ($module !== null && ($moduleObj = $this->find($module))) { |
| 270 | - return $moduleObj->getFullName() . ':' . $name; |
|
| 270 | + return $moduleObj->getFullName().':'.$name; |
|
| 271 | 271 | } |
| 272 | 272 | return $name; |
| 273 | 273 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | foreach ($this->application->getModules() as $name => $module) { |
| 50 | 50 | if ($module->getStatus() === Module::REACHABLE) { |
| 51 | 51 | $this->loadModuleRoute($module); |
| 52 | - $this->application->debug()->debug('reachable # ' . $module->getFullName()); |
|
| 52 | + $this->application->debug()->debug('reachable # '.$module->getFullName()); |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | protected function loadRouteGroup(Module $module, string $groupName) |
| 85 | 85 | { |
| 86 | - $group = $groupName === 'default' ? '' : '-' . $groupName; |
|
| 87 | - if ($path = $module->getResource()->getConfigResourcePath('config/route' . $group)) { |
|
| 86 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
| 87 | + if ($path = $module->getResource()->getConfigResourcePath('config/route'.$group)) { |
|
| 88 | 88 | $routeConfig = Config::loadConfig($path, [ |
| 89 | 89 | 'module' => $module->getName(), |
| 90 | 90 | 'group' => $groupName, |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | 'config' => $module->getConfig(), |
| 93 | 93 | ]); |
| 94 | 94 | if ($routeConfig !== null) { |
| 95 | - $prefix = $module->getConfig('route-prefix.' . $groupName, ''); |
|
| 95 | + $prefix = $module->getConfig('route-prefix.'.$groupName, ''); |
|
| 96 | 96 | $this->loadRouteConfig($module, $prefix, $groupName, $routeConfig); |
| 97 | 97 | } |
| 98 | 98 | } |
@@ -121,9 +121,9 @@ discard block |
||
| 121 | 121 | $uri = $config['uri'] ?? '/'; |
| 122 | 122 | $anti = array_key_exists('anti-prefix', $config) && $config['anti-prefix']; |
| 123 | 123 | if ($anti) { |
| 124 | - $uri = '/' . trim($uri, '/'); |
|
| 124 | + $uri = '/'.trim($uri, '/'); |
|
| 125 | 125 | } else { |
| 126 | - $uri = '/' . trim($prefix . $uri, '/'); |
|
| 126 | + $uri = '/'.trim($prefix.$uri, '/'); |
|
| 127 | 127 | } |
| 128 | 128 | $this->application->request($method, $exname, $uri, $attributes); |
| 129 | 129 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | $this->loadVendorIfExist(); |
| 24 | 24 | $this->loadShareLibrary(); |
| 25 | - $this->application->debug()->debug('loaded - ' . $this->module->getFullName()); |
|
| 25 | + $this->application->debug()->debug('loaded - '.$this->module->getFullName()); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | public function toActive() |
| 34 | 34 | { |
| 35 | 35 | $this->loadConfig(); |
| 36 | - $this->application->debug()->debug('active = ' . $this->module->getFullName()); |
|
| 36 | + $this->application->debug()->debug('active = '.$this->module->getFullName()); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | $this->checkRequirements(); |
| 45 | 45 | $this->loadPrivateLibrary(); |
| 46 | 46 | $this->application->setRunning($this->module); |
| 47 | - $this->application->debug()->debug('run + ' . $this->module->getFullName()); |
|
| 47 | + $this->application->debug()->debug('run + '.$this->module->getFullName()); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | public function loadVendorIfExist() |
| 93 | 93 | { |
| 94 | - $vendorAutoload = $this->module->getPath() . '/vendor/autoload.php'; |
|
| 94 | + $vendorAutoload = $this->module->getPath().'/vendor/autoload.php'; |
|
| 95 | 95 | if (FileSystem::exist($vendorAutoload)) { |
| 96 | 96 | Loader::requireOnce($vendorAutoload); |
| 97 | 97 | } |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | $name = $input->getArgument('name'); |
| 34 | 34 | |
| 35 | 35 | if (is_string($name)) { |
| 36 | - $text = 'Hello ' . $name; |
|
| 36 | + $text = 'Hello '.$name; |
|
| 37 | 37 | } else { |
| 38 | 38 | $text = 'Hello'; |
| 39 | 39 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | abstract class TableCreator |
| 13 | 13 | { |
| 14 | 14 | protected static $map = [ |
| 15 | - 'mysql' => MySQLTableCreator::class, |
|
| 15 | + 'mysql' => MySQLTableCreator::class, |
|
| 16 | 16 | ]; |
| 17 | 17 | |
| 18 | 18 | abstract function create(Connection $connection, TableStruct $fields); |
@@ -98,8 +98,8 @@ discard block |
||
| 98 | 98 | $table = $this->fields->getRealTableName($this->connection); |
| 99 | 99 | $sql = "CREATE TABLE IF NOT EXISTS `{$table}` (\r\n\t"; |
| 100 | 100 | $sql .= implode(",\r\n\t", array_filter($content, 'strlen')); |
| 101 | - $auto = null === $this->auto?'':'AUTO_INCREMENT='.$this->auto; |
|
| 102 | - $collate = null === $this->collate?'':'COLLATE '.$this->collate; |
|
| 101 | + $auto = null === $this->auto ? '' : 'AUTO_INCREMENT='.$this->auto; |
|
| 102 | + $collate = null === $this->collate ? '' : 'COLLATE '.$this->collate; |
|
| 103 | 103 | $sql .= "\r\n) ENGINE={$this->engine} {$collate} {$auto} DEFAULT CHARSET={$this->charset};"; |
| 104 | 104 | return $sql; |
| 105 | 105 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | if (count($primary)) { |
| 120 | - return 'PRIMARY KEY ('. implode(',', $primary).')'; |
|
| 120 | + return 'PRIMARY KEY ('.implode(',', $primary).')'; |
|
| 121 | 121 | } |
| 122 | 122 | return ''; |
| 123 | 123 | } |
@@ -210,10 +210,10 @@ discard block |
||
| 210 | 210 | protected function createField(Field $field) |
| 211 | 211 | { |
| 212 | 212 | $type = strtoupper($field->getValueType()).$this->parseLength($field->getLength()); |
| 213 | - $auto = $field->getAuto() ?'AUTO_INCREMENT':''; |
|
| 214 | - $null = $field->isNullable() === null? '': $field->isNullable() === true ? 'NULL':'NOT NULL'; |
|
| 215 | - $attr = $field->getAttribute() ?strtoupper($field->getAttribute()):''; |
|
| 216 | - $comment = $field->getComment() ?('COMMENT \''.addcslashes($field->getComment(), '\'').'\''):''; |
|
| 213 | + $auto = $field->getAuto() ? 'AUTO_INCREMENT' : ''; |
|
| 214 | + $null = $field->isNullable() === null ? '' : $field->isNullable() === true ? 'NULL' : 'NOT NULL'; |
|
| 215 | + $attr = $field->getAttribute() ?strtoupper($field->getAttribute()) : ''; |
|
| 216 | + $comment = $field->getComment() ? ('COMMENT \''.addcslashes($field->getComment(), '\'').'\'') : ''; |
|
| 217 | 217 | // default设置 |
| 218 | 218 | if ($field->hasDefault()) { |
| 219 | 219 | if (null === $field->getDefault()) { |