dxkite / suda

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

suda/src/framework/request/Builder.php

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
         if (array_key_exists('server-port', $this->request->server())) {
             return $this->request->server()['server-port'];
         }
-        return $this->getSecure()?443:80;
+        return $this->getSecure() ? 443 : 80;
     }
 
     /**
@@ -148,7 +148,7 @@ 
      */
     private function createUribase(RequestWrapper $request)
     {
-        $scheme = $request->isSecure()?'https':'http';
+        $scheme = $request->isSecure() ? 'https' : 'http';
         $port = $request->getPort();
         if ($port == 80 && $scheme == 'http') {
             $port = '';
@@ -157,7 +157,7 @@ 
         } else {
             $port = ':'.$port;
         }
-        $base = $scheme.'://'. $request->getHost().$port;
+        $base = $scheme.'://'.$request->getHost().$port;
         $request->setUriBase($base);
     }
 }

suda/src/application/ApplicationSource.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         bool $allowQuery = true,
         ?string $default = null,
         ?string $group = null
-    ):?string {
+    ): ?string {
         $group = $group ?? $request->getAttribute('group');
         $default = $default ?? $request->getAttribute('module');
         $url = $this->route->create($this->getRouteName($name, $default, $group), $parameter, $allowQuery);
@@ -46,7 +46,7 @@ 
      */
     protected function getUrlIndex(Request $request):string
     {
-        $indexArray = $this->conf('index') ?? [ 'index.php' ];
+        $indexArray = $this->conf('index') ?? ['index.php'];
         $index = ltrim($request->getIndex(), '/');
         if (!in_array($index, $indexArray)) {
             return $request->getIndex();
@@ -133,7 +133,7 @@ 
     public function getUriBase(Request $request, bool $beautify = true):string
     {
         $index = $beautify ? $this->getUrlIndex($request) : $request->getIndex();
-        return $request->getUriBase() . $index;
+        return $request->getUriBase().$index;
     }
 
     /**
@@ -144,6 +144,6 @@ 
      */
     protected function getRouteGroupPrefix(?string $group):string
     {
-        return $group === null || $group === 'default' ? '': '@'. $group;
+        return $group === null || $group === 'default' ? '' : '@'.$group;
     }
 }

suda/src/framework/http/Status.php

Spacing +42 added lines, -42 removed lines

@@ -9,7 +9,7 @@ 
     public static $statusTexts = [
         100 => 'Continue',
         101 => 'Switching Protocols',
-        102 => 'Processing',            // RFC2518
+        102 => 'Processing', // RFC2518
         103 => 'Early Hints',
         200 => 'OK',
         201 => 'Created',
@@ -18,9 +18,9 @@ 
         204 => 'No Content',
         205 => 'Reset Content',
         206 => 'Partial Content',
-        207 => 'Multi-Status',          // RFC4918
-        208 => 'Already Reported',      // RFC5842
-        226 => 'IM Used',               // RFC3229
+        207 => 'Multi-Status', // RFC4918
+        208 => 'Already Reported', // RFC5842
+        226 => 'IM Used', // RFC3229
         300 => 'Multiple Choices',
         301 => 'Moved Permanently',
         302 => 'Found',
@@ -28,7 +28,7 @@ 
         304 => 'Not Modified',
         305 => 'Use Proxy',
         307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',    // RFC7238
+        308 => 'Permanent Redirect', // RFC7238
         400 => 'Bad Request',
         401 => 'Unauthorized',
         402 => 'Payment Required',
@@ -47,34 +47,34 @@ 
         415 => 'Unsupported Media Type',
         416 => 'Range Not Satisfiable',
         417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',                                               // RFC2324
-        421 => 'Misdirected Request',                                         // RFC7540
-        422 => 'Unprocessable Entity',                                        // RFC4918
-        423 => 'Locked',                                                      // RFC4918
-        424 => 'Failed Dependency',                                           // RFC4918
-        425 => 'Too Early',                                                   // RFC-ietf-httpbis-replay-04
-        426 => 'Upgrade Required',                                            // RFC2817
-        428 => 'Precondition Required',                                       // RFC6585
-        429 => 'Too Many Requests',                                           // RFC6585
-        431 => 'Request Header TableStruct Too Large',                             // RFC6585
-        451 => 'Unavailable For Legal Reasons',                               // RFC7725
+        418 => 'I\'m a teapot', // RFC2324
+        421 => 'Misdirected Request', // RFC7540
+        422 => 'Unprocessable Entity', // RFC4918
+        423 => 'Locked', // RFC4918
+        424 => 'Failed Dependency', // RFC4918
+        425 => 'Too Early', // RFC-ietf-httpbis-replay-04
+        426 => 'Upgrade Required', // RFC2817
+        428 => 'Precondition Required', // RFC6585
+        429 => 'Too Many Requests', // RFC6585
+        431 => 'Request Header TableStruct Too Large', // RFC6585
+        451 => 'Unavailable For Legal Reasons', // RFC7725
         500 => 'Internal Server Error',
         501 => 'Not Implemented',
         502 => 'Bad Gateway',
         503 => 'Service Unavailable',
         504 => 'Gateway Timeout',
         505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates',                                     // RFC2295
-        507 => 'Insufficient Storage',                                        // RFC4918
-        508 => 'Loop Detected',                                               // RFC5842
-        510 => 'Not Extended',                                                // RFC2774
-        511 => 'Network Authentication Required',                             // RFC6585
+        506 => 'Variant Also Negotiates', // RFC2295
+        507 => 'Insufficient Storage', // RFC4918
+        508 => 'Loop Detected', // RFC5842
+        510 => 'Not Extended', // RFC2774
+        511 => 'Network Authentication Required', // RFC6585
     ];
 
     const HTTP_CONTINUE = 100;
     const HTTP_SWITCHING_PROTOCOLS = 101;
-    const HTTP_PROCESSING = 102;            // RFC2518
-    const HTTP_EARLY_HINTS = 103;           // RFC8297
+    const HTTP_PROCESSING = 102; // RFC2518
+    const HTTP_EARLY_HINTS = 103; // RFC8297
     const HTTP_OK = 200;
     const HTTP_CREATED = 201;
     const HTTP_ACCEPTED = 202;
@@ -82,9 +82,9 @@ 
     const HTTP_NO_CONTENT = 204;
     const HTTP_RESET_CONTENT = 205;
     const HTTP_PARTIAL_CONTENT = 206;
-    const HTTP_MULTI_STATUS = 207;          // RFC4918
-    const HTTP_ALREADY_REPORTED = 208;      // RFC5842
-    const HTTP_IM_USED = 226;               // RFC3229
+    const HTTP_MULTI_STATUS = 207; // RFC4918
+    const HTTP_ALREADY_REPORTED = 208; // RFC5842
+    const HTTP_IM_USED = 226; // RFC3229
     const HTTP_MULTIPLE_CHOICES = 300;
     const HTTP_MOVED_PERMANENTLY = 301;
     const HTTP_FOUND = 302;
@@ -93,7 +93,7 @@ 
     const HTTP_USE_PROXY = 305;
     const HTTP_RESERVED = 306;
     const HTTP_TEMPORARY_REDIRECT = 307;
-    const HTTP_PERMANENTLY_REDIRECT = 308;  // RFC7238
+    const HTTP_PERMANENTLY_REDIRECT = 308; // RFC7238
     const HTTP_BAD_REQUEST = 400;
     const HTTP_UNAUTHORIZED = 401;
     const HTTP_PAYMENT_REQUIRED = 402;
@@ -112,21 +112,21 @@ 
     const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
     const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
     const HTTP_EXPECTATION_FAILED = 417;
-    const HTTP_I_AM_A_TEAPOT = 418;                                               // RFC2324
-    const HTTP_MISDIRECTED_REQUEST = 421;                                         // RFC7540
-    const HTTP_UNPROCESSABLE_ENTITY = 422;                                        // RFC4918
-    const HTTP_LOCKED = 423;                                                      // RFC4918
-    const HTTP_FAILED_DEPENDENCY = 424;                                           // RFC4918
+    const HTTP_I_AM_A_TEAPOT = 418; // RFC2324
+    const HTTP_MISDIRECTED_REQUEST = 421; // RFC7540
+    const HTTP_UNPROCESSABLE_ENTITY = 422; // RFC4918
+    const HTTP_LOCKED = 423; // RFC4918
+    const HTTP_FAILED_DEPENDENCY = 424; // RFC4918
 
     /**
      * @deprecated
      */
-    const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;   // RFC2817
-    const HTTP_TOO_EARLY = 425;                                                   // RFC-ietf-httpbis-replay-04
-    const HTTP_UPGRADE_REQUIRED = 426;                                            // RFC2817
-    const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
-    const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
-    const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;                             // RFC6585
+    const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; // RFC2817
+    const HTTP_TOO_EARLY = 425; // RFC-ietf-httpbis-replay-04
+    const HTTP_UPGRADE_REQUIRED = 426; // RFC2817
+    const HTTP_PRECONDITION_REQUIRED = 428; // RFC6585
+    const HTTP_TOO_MANY_REQUESTS = 429; // RFC6585
+    const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; // RFC6585
     const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451;
     const HTTP_INTERNAL_SERVER_ERROR = 500;
     const HTTP_NOT_IMPLEMENTED = 501;
@@ -134,10 +134,10 @@ 
     const HTTP_SERVICE_UNAVAILABLE = 503;
     const HTTP_GATEWAY_TIMEOUT = 504;
     const HTTP_VERSION_NOT_SUPPORTED = 505;
-    const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506;                        // RFC2295
-    const HTTP_INSUFFICIENT_STORAGE = 507;                                        // RFC4918
-    const HTTP_LOOP_DETECTED = 508;                                               // RFC5842
-    const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
+    const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506; // RFC2295
+    const HTTP_INSUFFICIENT_STORAGE = 507; // RFC4918
+    const HTTP_LOOP_DETECTED = 508; // RFC5842
+    const HTTP_NOT_EXTENDED = 510; // RFC2774
     const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
 
     /**

suda/src/application/loader/ModuleLoader.php

Spacing +3 added lines, -3 removed lines

@@ -203,7 +203,7 @@ 
      */
     protected function loadRouteGroup(string $groupName)
     {
-        $group = $groupName === 'default' ? '': '-'. $groupName;
+        $group = $groupName === 'default' ? '' : '-'.$groupName;
         if ($path = $this->module->getResource()->getConfigResourcePath('config/route'.$group)) {
             $routeConfig = Config::loadConfig($path, [
                 'module' => $this->module->getName(),
@@ -229,7 +229,7 @@ 
      */
     protected function loadRouteConfig(string $prefix, string $groupName, array $routeConfig)
     {
-        $module =  $this->module->getFullName();
+        $module = $this->module->getFullName();
         foreach ($routeConfig as $name => $config) {
             $exname = $this->application->getRouteName($name, $module, $groupName);
             $method = $config['method'] ?? [];
@@ -243,7 +243,7 @@ 
             if ($anti) {
                 $uri = '/'.trim($uri, '/');
             } else {
-                $uri = '/'.trim($prefix . $uri, '/');
+                $uri = '/'.trim($prefix.$uri, '/');
             }
             $this->application->request($method, $exname, $uri, $attributes);
         }

suda/src/application/Module.php

Spacing +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function getFullName(): string
     {
-        return $this->getName() . ':' . $this->getVersion();
+        return $this->getName().':'.$this->getVersion();
     }
 
     /**
@@ -119,7 +119,7 @@ 
      */
     public function getUriSafeName(): string
     {
-        return $this->getName() . '/' . $this->getVersion();
+        return $this->getName().'/'.$this->getVersion();
     }
 
     /**

suda/src/application/template/ExceptionTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -14,10 +14,10 @@
     public function __construct(Throwable $exception)
     {
         parent::__construct('', []);
-        $this->path = SUDA_RESOURCE. '/error.php';
+        $this->path = SUDA_RESOURCE.'/error.php';
         $type = get_class($exception);
         $this->value = [
-            'error_type' => $type ,
+            'error_type' => $type,
             'error_sort_type' => strpos($type, '\\') === false ? $type : substr($type, strrpos($type, '\\') + 1),
             'error_code' => $exception->getCode(),
             'error_message' => $exception->getMessage(),