@@ -101,7 +101,7 @@ |
||
| 101 | 101 | $class = [$class]; |
| 102 | 102 | } |
| 103 | 103 | foreach ($class as $index => $className) { |
| 104 | - $class[$index] = $this->className($className) . '->onRequest'; |
|
| 104 | + $class[$index] = $this->className($className).'->onRequest'; |
|
| 105 | 105 | } |
| 106 | 106 | return $class; |
| 107 | 107 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | protected function prepare(Request $request, Response $response) |
| 86 | 86 | { |
| 87 | - $response->setHeader('x-powered-by', 'suda/' . SUDA_VERSION, true); |
|
| 87 | + $response->setHeader('x-powered-by', 'suda/'.SUDA_VERSION, true); |
|
| 88 | 88 | $response->getWrapper()->register(ExceptionContentWrapper::class, [Throwable::class]); |
| 89 | 89 | $response->getWrapper()->register(TemplateWrapper::class, [RawTemplate::class]); |
| 90 | 90 | |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | if (!$appResponse->isSend()) { |
| 139 | 139 | $appResponse->end(); |
| 140 | 140 | } |
| 141 | - $this->debug->info('responded with code ' . $appResponse->getStatus()); |
|
| 141 | + $this->debug->info('responded with code '.$appResponse->getStatus()); |
|
| 142 | 142 | $this->debug->timeEnd('sending response'); |
| 143 | 143 | } catch (Throwable $e) { |
| 144 | 144 | $this->debug->uncaughtException($e); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | public function request(array $method, string $name, string $url, array $attributes = []) |
| 162 | 162 | { |
| 163 | 163 | $route = $attributes['config'] ?? []; |
| 164 | - $runnable = RunnableRequestProcessor::class . '->onRequest'; |
|
| 164 | + $runnable = RunnableRequestProcessor::class.'->onRequest'; |
|
| 165 | 165 | if (array_key_exists('class', $route)) { |
| 166 | 166 | $attributes['class'] = $route['class']; |
| 167 | 167 | } elseif (array_key_exists('source', $route)) { |
@@ -105,8 +105,8 @@ discard block |
||
| 105 | 105 | $table = $this->fields->getRealTableName($this->connection); |
| 106 | 106 | $sql = "CREATE TABLE IF NOT EXISTS `{$table}` (\r\n\t"; |
| 107 | 107 | $sql .= implode(",\r\n\t", array_filter($content, 'strlen')); |
| 108 | - $auto = null === $this->auto?'':'AUTO_INCREMENT='.$this->auto; |
|
| 109 | - $collate = null === $this->collate?'':'COLLATE '.$this->collate; |
|
| 108 | + $auto = null === $this->auto ? '' : 'AUTO_INCREMENT='.$this->auto; |
|
| 109 | + $collate = null === $this->collate ? '' : 'COLLATE '.$this->collate; |
|
| 110 | 110 | $sql .= "\r\n) ENGINE={$this->engine} {$collate} {$auto} DEFAULT CHARSET={$this->charset};"; |
| 111 | 111 | return $sql; |
| 112 | 112 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | if (count($primary)) { |
| 127 | - return 'PRIMARY KEY ('. implode(',', $primary).')'; |
|
| 127 | + return 'PRIMARY KEY ('.implode(',', $primary).')'; |
|
| 128 | 128 | } |
| 129 | 129 | return ''; |
| 130 | 130 | } |
@@ -217,10 +217,10 @@ discard block |
||
| 217 | 217 | protected function createField(Field $field) |
| 218 | 218 | { |
| 219 | 219 | $type = strtoupper($field->getValueType()).$this->parseLength($field->getLength()); |
| 220 | - $auto = $field->getAuto() ?'AUTO_INCREMENT':''; |
|
| 221 | - $null = $field->isNullable() ?'NULL':'NOT NULL'; |
|
| 222 | - $attr = $field->getAttribute() ?strtoupper($field->getAttribute()):''; |
|
| 223 | - $comment = $field->getComment() ?('COMMENT \''.addcslashes($field->getComment(), '\'').'\''):''; |
|
| 220 | + $auto = $field->getAuto() ? 'AUTO_INCREMENT' : ''; |
|
| 221 | + $null = $field->isNullable() ? 'NULL' : 'NOT NULL'; |
|
| 222 | + $attr = $field->getAttribute() ?strtoupper($field->getAttribute()) : ''; |
|
| 223 | + $comment = $field->getComment() ? ('COMMENT \''.addcslashes($field->getComment(), '\'').'\'') : ''; |
|
| 224 | 224 | // default设置 |
| 225 | 225 | if ($field->hasDefault()) { |
| 226 | 226 | if (null === $field->getDefault()) { |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | public function __construct(string $tableName, string $connection = 'default', bool $raw = false) |
| 27 | 27 | { |
| 28 | 28 | parent::__construct( |
| 29 | - $this->initStruct($tableName,$raw), |
|
| 29 | + $this->initStruct($tableName, $raw), |
|
| 30 | 30 | Database::getDataSource($connection), |
| 31 | 31 | $this); |
| 32 | 32 | } |
@@ -72,8 +72,8 @@ |
||
| 72 | 72 | 'context' => $this->context, |
| 73 | 73 | 'backtrace' => $throwable->getTrace(), |
| 74 | 74 | ]; |
| 75 | - $exceptionHash = md5($throwable->getFile() . $throwable->getLine() . $throwable->getCode()); |
|
| 76 | - $path = $dumpPath . '/' . microtime(true) . '.' . substr($exceptionHash, 0, 8) . '.json'; |
|
| 75 | + $exceptionHash = md5($throwable->getFile().$throwable->getLine().$throwable->getCode()); |
|
| 76 | + $path = $dumpPath.'/'.microtime(true).'.'.substr($exceptionHash, 0, 8).'.json'; |
|
| 77 | 77 | FileSystem::make($dumpPath); |
| 78 | 78 | FileSystem::put($path, json_encode( |
| 79 | 79 | new DebugObject($dumper), |
@@ -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 |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . '/vendor/autoload.php'; |
|
| 2 | +require_once __DIR__.'/vendor/autoload.php'; |
|
| 3 | 3 | |
| 4 | 4 | use suda\framework\Config; |
| 5 | 5 | use suda\application\Module; |
@@ -12,21 +12,21 @@ discard block |
||
| 12 | 12 | use suda\application\builder\ApplicationBuilder; |
| 13 | 13 | use suda\application\loader\ApplicationBaseLoader; |
| 14 | 14 | |
| 15 | -defined('SUDA_APP') or define('SUDA_APP', __DIR__ . '/app'); |
|
| 16 | -defined('SUDA_DATA') or define('SUDA_DATA', __DIR__ . '/data'); |
|
| 17 | -defined('SUDA_SYSTEM') or define('SUDA_SYSTEM', __DIR__ . '/suda'); |
|
| 15 | +defined('SUDA_APP') or define('SUDA_APP', __DIR__.'/app'); |
|
| 16 | +defined('SUDA_DATA') or define('SUDA_DATA', __DIR__.'/data'); |
|
| 17 | +defined('SUDA_SYSTEM') or define('SUDA_SYSTEM', __DIR__.'/suda'); |
|
| 18 | 18 | defined('SUDA_PUBLIC') or define('SUDA_PUBLIC', __DIR__); |
| 19 | 19 | defined('SUDA_DEBUG') or define('SUDA_DEBUG', true); |
| 20 | 20 | defined('SUDA_DEBUG_LEVEL') or define('SUDA_DEBUG_LEVEL', 'debug'); |
| 21 | -defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP . '/manifest'); |
|
| 22 | -defined('SUDA_DEBUG_LOG_PATH') or define('SUDA_DEBUG_LOG_PATH', SUDA_DATA . '/logs'); |
|
| 21 | +defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP.'/manifest'); |
|
| 22 | +defined('SUDA_DEBUG_LOG_PATH') or define('SUDA_DEBUG_LOG_PATH', SUDA_DATA.'/logs'); |
|
| 23 | 23 | |
| 24 | -require_once SUDA_SYSTEM . '/loader/loader.php'; |
|
| 24 | +require_once SUDA_SYSTEM.'/loader/loader.php'; |
|
| 25 | 25 | |
| 26 | 26 | // 初始化系统加载器 |
| 27 | 27 | $loader = new Loader; |
| 28 | 28 | $loader->register(); |
| 29 | -$loader->addIncludePath(SUDA_SYSTEM . '/src', 'suda'); |
|
| 29 | +$loader->addIncludePath(SUDA_SYSTEM.'/src', 'suda'); |
|
| 30 | 30 | // 初始化数据目录 |
| 31 | 31 | $manifestConfig = ApplicationBuilder::loadManifest(SUDA_APP, SUDA_APP_MANIFEST); |
| 32 | 32 | |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | [ |
| 41 | 41 | 'log-level' => SUDA_DEBUG_LEVEL, |
| 42 | 42 | 'save-path' => SUDA_DEBUG_LOG_PATH, |
| 43 | - 'save-dump-path' => SUDA_DEBUG_LOG_PATH . '/dump', |
|
| 44 | - 'save-zip-path' => SUDA_DEBUG_LOG_PATH . '/zip', |
|
| 43 | + 'save-dump-path' => SUDA_DEBUG_LOG_PATH.'/dump', |
|
| 44 | + 'save-zip-path' => SUDA_DEBUG_LOG_PATH.'/zip', |
|
| 45 | 45 | 'log-format' => '%message%', |
| 46 | 46 | ] |
| 47 | 47 | ); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | /** @var Command $cmd */ |
| 67 | 67 | $className = Loader::realName($item['class']); |
| 68 | 68 | $cmd = new $className; |
| 69 | - $cmd->setName($module->getName() . ':' . $cmd->getName()); |
|
| 69 | + $cmd->setName($module->getName().':'.$cmd->getName()); |
|
| 70 | 70 | $app->add($cmd); |
| 71 | 71 | } |
| 72 | 72 | } |