dxkite / suda

suda/src/application/module/NameFinder.php

Spacing +3 added lines, -3 removed lines

@@ -55,8 +55,8 @@ 
         $rpos = \strrpos($name, ':');
         if ($rpos > 0) {
             $module = substr($name, 0, $rpos);
-            $name = \substr($name, $rpos+1);
-            $moduleFull  = $this->getFullName($module);
+            $name = \substr($name, $rpos + 1);
+            $moduleFull = $this->getFullName($module);
             return [$moduleFull, $name];
         }
         if ($rpos === 0) {
@@ -77,7 +77,7 @@ 
         if (\array_key_exists($version, $this->knownsFullName[$name])) {
             return $this->knownsFullName[$name][$version];
         }
-        return $hasVersion?$name.':'.$version:end($this->knownsFullName[$name]);
+        return $hasVersion ? $name.':'.$version : end($this->knownsFullName[$name]);
     }
     
     protected function getLikeName(string $name):string

suda/src/application/module/Module.php

Spacing +4 added lines, -4 removed lines

@@ -84,9 +84,9 @@ 
 
     public function getRoute(string $groupName): GroupRoutes
     {
-        $group = $groupName === 'default' ? '': '-'. $groupName;
-        $routeConfig = $this->getConfigFrom('route'.$group, ['group' => $group,]);
-        $routes =  new GroupRoutes($groupName);
+        $group = $groupName === 'default' ? '' : '-'.$groupName;
+        $routeConfig = $this->getConfigFrom('route'.$group, ['group' => $group, ]);
+        $routes = new GroupRoutes($groupName);
         if (\is_array($routeConfig)) {
             // debug()->debug('load route {group} from {module}',['group'=>$groupName, 'module' => $this->getFullName()]);
             $prefix = $this->config->get('route.prefix', '');
@@ -141,7 +141,7 @@ 
      */
     public function getFullName()
     {
-        return $this->name .':'. $this->version;
+        return $this->name.':'.$this->version;
     }
 
     /**

suda/src/application/module/Builder.php

Spacing +2 added lines, -2 removed lines

@@ -42,9 +42,9 @@
             $extension !== 'module') {
             return null;
         }
-        $zip=new ZipArchive;
+        $zip = new ZipArchive;
         if ($zip->open($path, ZipArchive::CHECKCONS)) {
-            $unzipPath = $unpackPath.'/'. pathinfo($path, PATHINFO_FILENAME) .'-'.substr(md5_file($path), 0, 8);
+            $unzipPath = $unpackPath.'/'.pathinfo($path, PATHINFO_FILENAME).'-'.substr(md5_file($path), 0, 8);
             $zip->extractTo($unzipPath);
             $zip->close();
             return Config::resolve($unzipPath.'/module');

suda/src/application/module/Manager.php

Spacing +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
     public function registerModule()
     {
         $scan = $this->getContext()->getConfig()->get('app.module.scan-path', []);
-        $cache = $this->getContext()->getApplication()->getDataPath() .'/module-cache';
+        $cache = $this->getContext()->getApplication()->getDataPath().'/module-cache';
         FileSystem::makes($cache);
         // 扫描加载
         foreach (Builder::scan($scan, $cache) as $module) {
@@ -190,7 +190,7 @@ 
      * @param string $name
      * @return Module|null
      */
-    public function find(string $name):?Module
+    public function find(string $name): ?Module
     {
         $fullName = $this->finder->getFullName($name);
         return $this->module[$fullName] ?? null;

suda/src/application/Route.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function loadFromModule(Manager $manager)
     {
-        $groups =  $this->applicaton->getConfig()->get('app.active', ['default']);
+        $groups = $this->applicaton->getConfig()->get('app.active', ['default']);
         foreach ($groups as $group) {
             $manager->loadRoute($group, $this);
         }
@@ -78,7 +78,7 @@ 
      * @param Request $request
      * @return MatchResult|null
      */
-    public function match(Request $request):?MatchResult
+    public function match(Request $request): ?MatchResult
     {
         foreach ($this->routes as $group => $routes) {
             if (($result = $routes->match($request)) !== null) {

suda/src/application/config/Config.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
         $this->config = $config;
     }
 
-    public function load(string $path, array $extra =[])
+    public function load(string $path, array $extra = [])
     {
         $data = $this->loadConfig($path, $extra);
         if ($data) {
@@ -35,10 +35,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;
@@ -46,7 +46,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);
     }
@@ -56,17 +56,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);
     }
 }

suda/src/application/config/ConfigLoader.php

Spacing +14 added lines, -14 removed lines

@@ -9,9 +9,9 @@ 
  */
 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 = static::resolve($path);
         }
@@ -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  static function resolve(string $path):?string
+    public  static function resolve(string $path): ?string
     {
         if (file_exists($path)) {
             return $path;
         }
         $basepath = dirname($path).'/'.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;
             }
         }

suda/loader/loader.php

Spacing +6 added lines, -6 removed lines

@@ -22,9 +22,9 @@
     }
 }
 
-require_once SUDA_SYSTEM .'/src/component/loader/Path.php';
-require_once SUDA_SYSTEM .'/src/component/loader/PathTrait.php';
-require_once SUDA_SYSTEM .'/src/component/loader/PathInterface.php';
-require_once SUDA_SYSTEM .'/src/component/loader/IncludeManager.php';
-require_once SUDA_SYSTEM .'/src/component/loader/Loader.php';
-require_once SUDA_SYSTEM .'/src/application/Loader.php';
+require_once SUDA_SYSTEM.'/src/component/loader/Path.php';
+require_once SUDA_SYSTEM.'/src/component/loader/PathTrait.php';
+require_once SUDA_SYSTEM.'/src/component/loader/PathInterface.php';
+require_once SUDA_SYSTEM.'/src/component/loader/IncludeManager.php';
+require_once SUDA_SYSTEM.'/src/component/loader/Loader.php';
+require_once SUDA_SYSTEM.'/src/application/Loader.php';

suda/loader/web.php

Spacing +3 added lines, -3 removed lines

@@ -4,15 +4,15 @@
 use suda\application\Loader;
 use suda\application\Request;
 
-require_once __DIR__ .'/loader.php';
+require_once __DIR__.'/loader.php';
 
 
 
 // 初始化系统加载器
 $loader = new Loader;
 $loader->register();
-$loader->addIncludePath(SUDA_SYSTEM .'/src', 'suda');
-$loader->import(SUDA_SYSTEM .'/src/functions.php');
+$loader->addIncludePath(SUDA_SYSTEM.'/src', 'suda');
+$loader->import(SUDA_SYSTEM.'/src/functions.php');
 // 初始化请求
 $request = Request::buildFromServer();
 $request->apply(true);