dxkite / suda

nebula/component/template/TemplateLoader.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     
     public static function credibleLoad(string $name): Template
     {
-        if (($template = static::load($name))!==null) {
+        if (($template = static::load($name)) !== null) {
             return $template;
         }
         $empty = new EmptyTemplate;

nebula/component/template/EchoValueTrait.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
     public function parseEchoValue($var):string
     {
         // 任意变量名: 中文点下划线英文数字
-        $code = preg_replace_callback('/\B[$](\?)?[:]([.\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )?/ux', [$this,'echoValueCallback'], $var);
+        $code = preg_replace_callback('/\B[$](\?)?[:]([.\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )?/ux', [$this, 'echoValueCallback'], $var);
         $error = preg_last_error();
         if ($error !== PREG_NO_ERROR) {
             throw new \Exception($error);
@@ -16,14 +16,14 @@ 
     
     protected function echoValueCallback($matchs)
     {
-        $name=$matchs[2];
-        if ($matchs[1]==='?') {
+        $name = $matchs[2];
+        if ($matchs[1] === '?') {
             return '$this->has("'.$name.'")';
         }
         if (isset($matchs[4])) {
             if (preg_match('/\((.+)\)/', $matchs[4], $v)) {
                 $args = trim($v[1]);
-                $args= strlen($args) ?','.$args:'';
+                $args = strlen($args) ? ','.$args : '';
                 return '$this->get("'.$name.'"'.$args.')';
             }
         }

nebula/component/template/Tag.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $this->content = $content;
         $this->name = $name;
         $this->open = $open;
-        $this->close= $close;
+        $this->close = $close;
     }
 
     public function compile(string $content):string

nebula/component/template/Compiler.php

Spacing +10 added lines, -10 removed lines

@@ -26,14 +26,14 @@ 
      *
      * @var Tag[]
      */
-    protected $tags=[];
+    protected $tags = [];
 
     /**
      * 命令对象
      *
      * @var CommandInterface[]
      */
-    protected $commands=[];
+    protected $commands = [];
 
     public function __construct()
     {
@@ -62,7 +62,7 @@ 
      */
     public function registerTag(Tag $tag)
     {
-        $this->tags[$tag->getName()] =$tag;
+        $this->tags[$tag->getName()] = $tag;
     }
 
     /**
@@ -75,15 +75,15 @@ 
     public function compileText(string $text, array $tagConfig = []):string
     {
         $this->applyTagConfig($tagConfig);
-        $result  = '';
+        $result = '';
         foreach (token_get_all($text) as $token) {
             if (is_array($token)) {
                 list($tag, $content) = $token;
                 // 所有将要编译的文本
                 // 跳过各种的PHP
                 if ($tag == T_INLINE_HTML) {
-                    $content=$this->proccesTags($content);
-                    $content=$this->proccesCommands($content);
+                    $content = $this->proccesTags($content);
+                    $content = $this->proccesCommands($content);
                 }
                 $result .= $content;
             } else {
@@ -107,7 +107,7 @@ 
     {
         foreach ($this->tags as $tag) {
             $pregExp = sprintf('/(!)?%s\s*(.+?)\s*%s/', preg_quote($tag->getOpen()), preg_quote($tag->getClose()));
-            $text = \preg_replace_callback($pregExp, function ($match) use ($tag) {
+            $text = \preg_replace_callback($pregExp, function($match) use ($tag) {
                 if ($match[1] === '!') {
                     return substr($match[0], 1);
                 } else {
@@ -120,8 +120,8 @@ 
 
     protected function proccesCommands(string $text):string
     {
-        $pregExp ='/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux';
-        $code = preg_replace_callback($pregExp, [$this,'doMatchCommand'], $text);
+        $pregExp = '/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux';
+        $code = preg_replace_callback($pregExp, [$this, 'doMatchCommand'], $text);
         $error = preg_last_error();
         if ($error !== PREG_NO_ERROR) {
             throw new \Exception($error);
@@ -137,7 +137,7 @@ 
             list($input, $ignore, $name, $space) = $match;
             $params = '';
         }
-        if ($ignore ==='!') {
+        if ($ignore === '!') {
             return \str_replace('@!', '@', $input);
         } else {
             foreach ($this->commands as $command) {

nebula/component/template/Command.php

Spacing +2 added lines, -2 removed lines

@@ -40,14 +40,14 @@
     public function parseStartInsert($exp)
     {
         preg_match('/\((.+)\)/', $exp, $v);
-        $name=trim(str_replace('\'', '-', trim($v[1], '"\'')));
+        $name = trim(str_replace('\'', '-', trim($v[1], '"\'')));
         return '<?php $this->insert(\''.$name.'\',function () { ?>';
     }
     
     public function parseInsert($exp)
     {
         preg_match('/\((.+)\)/', $exp, $v);
-        $name=str_replace('\'', '-', trim($v[1], '"\''));
+        $name = str_replace('\'', '-', trim($v[1], '"\''));
         return "<?php \$this->exec('{$name}'); ?>";
     }
     

nebula/component/template/EmptyTemplate.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
      */
     protected $extends;
 
-    public function get(string $name=null, $default=null)
+    public function get(string $name = null, $default = null)
     {
         if (is_null($name)) {
             return $this->value;
@@ -37,7 +37,7 @@ 
 
     public function assign(array $values)
     {
-        $this->value=array_merge($this->value, $values);
+        $this->value = array_merge($this->value, $values);
         return $this;
     }
     
@@ -62,7 +62,7 @@ 
 
     public function getRenderedString()
     {
-        $text =  'EmptyTemplate<'.$this->get('name', 'null').'>';
+        $text = 'EmptyTemplate<'.$this->get('name', 'null').'>';
         if ($this->extends) {
             $text = $this->extends->getRenderedString();
         }

nebula/component/cacheable/CacheInterface.php

Spacing +2 added lines, -2 removed lines

@@ -15,14 +15,14 @@
      * @param int $expire 过期时间
      * @return bool
      */
-    public function set(string $name, $value, int $expire=null):bool;
+    public function set(string $name, $value, int $expire = null):bool;
 
     /**
      * 获取值
      * @param string $name 名
      * @return mixed|null
      */
-    public function get(string $name, $defalut=null);
+    public function get(string $name, $defalut = null);
 
     /**
      * 删除值

nebula/application/config/Config.php

Spacing +9 added lines, -9 removed lines

@@ -9,9 +9,9 @@ 
  */
 class Config extends ConfigLoader
 {
-    public $config=[];
+    public $config = [];
 
-    public function load(string $path, array $extra =[])
+    public function load(string $path, array $extra = [])
     {
         $data = $this->loadConfig($path, $extra);
         if ($data) {
@@ -26,10 +26,10 @@ 
 
     public function assign(array $config)
     {
-        return $this->config=array_merge($this->config, $config);
+        return $this->config = array_merge($this->config, $config);
     }
 
-    public function get(string $name=null, $default=null)
+    public function get(string $name = null, $default = null)
     {
         if (is_null($name)) {
             return $this->config;
@@ -37,7 +37,7 @@ 
         return ArrayDotAccess::get($this->config, $name, $default);
     }
 
-    public function set(string $name, $value, $combine=null)
+    public function set(string $name, $value, $combine = null)
     {
         return ArrayDotAccess::set($this->config, $name, $value, $combine);
     }
@@ -47,17 +47,17 @@ 
         return ArrayDotAccess::exist($this->config, $name);
     }
 
-    public function parseValue(string $content, array $extra =[]):string
+    public function parseValue(string $content, array $extra = []):string
     {
-        return preg_replace_callback('/\$\{(.+?)\}/', function ($matchs) use ($extra) {
+        return preg_replace_callback('/\$\{(.+?)\}/', function($matchs) use ($extra) {
             $name = $matchs[1];
-            if (($value = ArrayDotAccess::get($extra, $name, null))!==null) {
+            if (($value = ArrayDotAccess::get($extra, $name, null)) !== null) {
             } elseif (defined($name)) {
                 $value = constant($name);
             } else {
                 $value = $this->get($name, $matchs[0]);
             }
-            return is_string($value)?trim(json_encode($value), '"'):$value;
+            return is_string($value) ?trim(json_encode($value), '"') : $value;
         }, $content);
     }
 }

nebula/application/config/ConfigLoader.php

Spacing +15 added lines, -15 removed lines

@@ -9,11 +9,11 @@ 
  */
 abstract class ConfigLoader
 {
-    public function loadConfig(string $path, array $extra =[]):?array
+    public function loadConfig(string $path, array $extra = []): ?array
     {
-        $data=null;
+        $data = null;
         if (!file_exists($path)) {
-            $path =$this->resolve($path);
+            $path = $this->resolve($path);
         }
         if ($path) {
             $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION));
@@ -27,25 +27,25 @@ 
         return $data;
     }
 
-    protected function loadJson(string $path, array $extra =[]):array
+    protected function loadJson(string $path, array $extra = []):array
     {
         $content = file_get_contents($path);
-        $content =$this->parseValue($content, $extra);
+        $content = $this->parseValue($content, $extra);
         $data = json_decode($content, true);
-        if (json_last_error()!==JSON_ERROR_NONE) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             throw new JSONException(json_last_error());
         }
         return $data;
     }
 
-    protected function loadIni(string $path, array $extra =[]):array
+    protected function loadIni(string $path, array $extra = []):array
     {
         $content = file_get_contents($path);
-        $content =$this->parseValue($content, $extra);
+        $content = $this->parseValue($content, $extra);
         return \parse_ini_string($content, true) ?: [];
     }
 
-    protected function loadYaml(string $path, array $extra =[]):array
+    protected function loadYaml(string $path, array $extra = []):array
     {
         if (function_exists('yaml_parse')) {
             $name = 'yaml_parse';
@@ -55,25 +55,25 @@ 
             throw new YamlException("parse yaml config error : missing yaml extension or spyc", 1);
         }
         $content = file_get_contents($path);
-        $content =$this->parseValue($content, $extra);
+        $content = $this->parseValue($content, $extra);
         return \call_user_func_array($name, [$content]);
     }
 
-    abstract public function parseValue(string $content, array $extra =[]):string;
+    abstract public function parseValue(string $content, array $extra = []):string;
 
-    public function resolve(string $path):?string
+    public function resolve(string $path): ?string
     {
         if (file_exists($path)) {
             return $path;
         }
         $basepath = pathinfo($path, PATHINFO_FILENAME);
-        if (file_exists($conf = $basepath.'.yml')  || file_exists($conf = $basepath.'.yaml')) {
+        if (file_exists($conf = $basepath.'.yml') || file_exists($conf = $basepath.'.yaml')) {
             if (function_exists('yaml_parse') || class_exists('Spyc')) {
                 return $conf;
             }
         }
-        foreach (['.json','.php','.ini'] as $ext) {
-            if (file_exists($conf=$basepath.$ext)) {
+        foreach (['.json', '.php', '.ini'] as $ext) {
+            if (file_exists($conf = $basepath.$ext)) {
                 return $conf;
             }
         }