dxkite / suda

suda/src/framework/debug/attach/AttachTrait.php

Spacing +4 added lines, -4 removed lines

@@ -21,10 +21,10 @@ 
     protected function analyse(array $context)
     {
         $replace = [];
-        $attach = [] ;
+        $attach = [];
         foreach ($context as $key => $val) {
             if ($this->isReplacedObj($val)) {
-                $replace['{' . $key . '}'] = $val;
+                $replace['{'.$key.'}'] = $val;
             } else {
                 $attach[$key] = $val;
             }
@@ -34,7 +34,7 @@ 
 
     protected function isReplacedObj($val) : bool
     {
-        return !is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && ! $val instanceof \Throwable;
+        return !is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && !$val instanceof \Throwable;
     }
 
     public function interpolate(string $message, array $context, array $attribute)
@@ -42,7 +42,7 @@ 
         list($attach, $replace) = $this->analyse($context);
         $attribute = array_merge($this->attribute, $attribute);
         foreach ($attribute as $key => $val) {
-            $replace['%' . $key . '%'] = $val;
+            $replace['%'.$key.'%'] = $val;
         }
         $message = strtr($message, $replace);
         $attachInfo = '';

suda/src/framework/route/uri/UriMatcher.php

Spacing +4 added lines, -4 removed lines

@@ -47,9 +47,9 @@ 
      * @param boolean $ignoreCase
      * @return array|null
      */
-    public function match(string $url, bool $ignoreCase = true):?array
+    public function match(string $url, bool $ignoreCase = true): ?array
     {
-        $match = '#^'. $this->match.'$#'. ($ignoreCase?'i':'');
+        $match = '#^'.$this->match.'$#'.($ignoreCase ? 'i' : '');
         $parameter = [];
         if (preg_match($match, $url, $parameter, PREG_UNMATCHED_AS_NULL) > 0) {
             return array_slice($parameter, 1);
@@ -78,7 +78,7 @@ 
         return $parameters;
     }
 
-    public function getParameter(string $name):?Parameter
+    public function getParameter(string $name): ?Parameter
     {
         foreach ($this->parameter as $parameter) {
             if ($parameter->getIndexName() === $name) {
@@ -128,7 +128,7 @@ 
      * @param integer $index
      * @return \suda\framework\route\uri\parameter\Parameter|null
      */
-    public function getParameterByIndex(int $index):?Parameter
+    public function getParameterByIndex(int $index): ?Parameter
     {
         foreach ($this->parameter as $parameter) {
             if ($parameter->getIndex() === $index) {

suda/src/application/template/ModuleTemplateCompiler.php

Spacing +3 added lines, -3 removed lines

@@ -20,10 +20,10 @@
     protected $tag = [
         'raw' => ['{{!', '}}', '<?php echo $code; ?>'],
         'comment' => ['{--', '--}', '<?php /* $code */ ?>'],
-        'echo' => [ '{{', '}}', '<?php echo htmlspecialchars($this->application->_($code), ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>' ],
+        'echo' => ['{{', '}}', '<?php echo htmlspecialchars($this->application->_($code), ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>'],
         'string' => ['{=', '}', '<?php echo htmlspecialchars($this->application->_("$code"), ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>'],
-        'raw-string' => ['@{', '}', '<?php echo htmlspecialchars($code, ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>' ],
-        'event' => ['{:', '}', '<?php $this->application->event()->exec("$code", [$this]); ?>' ],
+        'raw-string' => ['@{', '}', '<?php echo htmlspecialchars($code, ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>'],
+        'event' => ['{:', '}', '<?php $this->application->event()->exec("$code", [$this]); ?>'],
     ];
 
     public function __construct()

suda/src/application/LanguageBag.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
      *
      * @var array
      */
-    private $locales=[];
+    private $locales = [];
 
     /**
      * 包含本地化语言数组
@@ -49,7 +49,7 @@ 
      */
     public static function format(string $string, array $param)
     {
-        return preg_replace_callback('/(?<!\$)\$(\{)?(\d+|\w+?\b)(?(1)\})/', function ($match) use ($param) {
+        return preg_replace_callback('/(?<!\$)\$(\{)?(\d+|\w+?\b)(?(1)\})/', function($match) use ($param) {
             $key = $match[2];
             if (array_key_exists($key, $param)) {
                 return strval($param[$key]);

suda/src/framework/Config.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
      * @param array|\suda\framework\Config $extra
      * @return array|null
      */
-    public static function loadConfig(string $path, $extra = []):?array
+    public static function loadConfig(string $path, $extra = []): ?array
     {
         if (!file_exists($path)) {
             $path = PathResolver::resolve($path);
@@ -122,7 +122,7 @@ 
         }
         if ($path) {
             $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION));
-            if (in_array($ext, ['yaml','yml','json','php','ini'])) {
+            if (in_array($ext, ['yaml', 'yml', 'json', 'php', 'ini'])) {
                 return ContentLoader::{'load'.ucfirst($ext)}($path, $extra);
             }
             return ContentLoader::loadJson($path, $extra);

suda/src/application/template/compiler/Command.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
     
     protected function parseStatic($content)
     {
-        $content = strlen(trim($content)) === 0 ?'()':$content;
+        $content = strlen(trim($content)) === 0 ? '()' : $content;
         return '<?php echo $this->getStaticPrefix'.$content.'; ?>';
     }
 

suda/src/orm/connection/creator/MySQLTableCreator.php

Spacing +7 added lines, -7 removed lines

@@ -70,8 +70,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;
     }
@@ -135,11 +135,11 @@ 
 
     protected function createField(Field $field)
     {
-        $type = $field->getLength()? strtoupper($field->getValueType()).'('.$field->getLength().')':strtoupper($field->getValueType());
-        $auto = $field->getAuto() ?'AUTO_INCREMENT':'';
-        $null = $field->isNullable() ?'NULL':'NOT NULL';
-        $attr = $field->getAttribute() ?strtoupper($field->getAttribute()):'';
-        $comment = $field->getComment() ?('COMMENT \''.addcslashes($field->getComment(), '\'').'\''):'';
+        $type = $field->getLength() ? strtoupper($field->getValueType()).'('.$field->getLength().')' : strtoupper($field->getValueType());
+        $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/framework/runnable/target/MethodTarget.php

Spacing +3 added lines, -3 removed lines

@@ -48,12 +48,12 @@ 
      */
     public function __construct($object, ?array $constructParameter = null, string $method, array $parameter = [])
     {
-        $this->object = is_object($object)? $object: $this->getPHPClassName($object);
+        $this->object = is_object($object) ? $object : $this->getPHPClassName($object);
         $this->constructParameter = $constructParameter;
         $this->method = $method;
         $this->parameter = $parameter;
         $static = $this->isStatic() ? '->' : '::';
-        $name = \is_object($object)? \get_class($object) : $object;
+        $name = \is_object($object) ? \get_class($object) : $object;
         $this->name = $name.$static.$method;
     }
 
@@ -62,7 +62,7 @@ 
      *
      * @return object|null 动态类可获取
      */
-    public function getObjectInstance():?object
+    public function getObjectInstance(): ?object
     {
         if (\is_object($this->object)) {
             return $this->object;

suda/src/framework/Route.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
     {
         $this->routes = new RouteCollection;
         $this->runnable = [];
-        $this->default = new Runnable([__CLASS__ , 'defaultResponse']);
+        $this->default = new Runnable([__CLASS__, 'defaultResponse']);
     }
 
     /**
@@ -289,7 +289,7 @@ 
      * @param boolean $allowQuery
      * @return string|null
      */
-    public function create(string $name, array $parameter, bool $allowQuery = true):?string
+    public function create(string $name, array $parameter, bool $allowQuery = true): ?string
     {
         if ($matcher = $this->routes->get($name)) {
             return UriMatcher::buildUri($matcher->getMatcher(), $parameter, $allowQuery);