dxkite / suda

nebula/src/application/filesystem/FileHelper.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
      */
     public static function delete(string $filename):bool
     {
-        if (($path=Path::format($filename)) !== null) {
+        if (($path = Path::format($filename)) !== null) {
             if (!is_writable($path)) {
                 return false;
             }
@@ -43,7 +43,7 @@ 
      */    
     public static function move(string $src, string $dest):bool
     {
-        if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) {
+        if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) {
             return rename($path, $dest);
         }
         return false;
@@ -58,7 +58,7 @@ 
      */
     public static function copy(string $src, string $dest):bool
     {
-        if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) {
+        if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) {
             return copy($path, $dest);
         }
         return false;
@@ -86,9 +86,9 @@ 
      * @param string $name
      * @return string|null
      */
-    public static function get(string $filename):?string
+    public static function get(string $filename): ?string
     {
-        if (is_readable($filename) && ($path=Path::format($filename)) !== null) {
+        if (is_readable($filename) && ($path = Path::format($filename)) !== null) {
             return file_get_contents($path);
         }
         return null;

nebula/src/application/filesystem/DirectoryHelper.php

Spacing +9 added lines, -9 removed lines

@@ -94,11 +94,11 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function readFiles(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator
+    public static function readFiles(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator
     {
         $parent = Path::format($path);
         foreach (static::read($path, $recursive, $regex, false, $mode) as $subpath) {
-            $path = $full?$subpath:$parent.DIRECTORY_SEPARATOR.$subpath;
+            $path = $full ? $subpath : $parent.DIRECTORY_SEPARATOR.$subpath;
             if (is_file($path)) {
                 yield $subpath;
             }
@@ -114,11 +114,11 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function readDirs(string $path, bool $recursive=false, ?string $regex=null, bool $full=false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
+    public static function readDirs(string $path, bool $recursive = false, ?string $regex = null, bool $full = false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
     {
         $parent = Path::format($path);
         foreach (static::read($path, $recursive, $regex, false, $mode) as $subpath) {
-            $path = $full?$subpath:$parent.DIRECTORY_SEPARATOR.$subpath;
+            $path = $full ? $subpath : $parent.DIRECTORY_SEPARATOR.$subpath;
             if (is_dir($path)) {
                 yield $subpath;
             }
@@ -134,7 +134,7 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function read(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
+    public static function read(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
     {
         $directory = Path::format($path);
         if ($directory && \is_dir($directory)) {
@@ -150,7 +150,7 @@ 
     }
     
 
-    protected static function buildIterator(string $directory, bool $recursive=false, ?string $regex = null, int $mode): \Iterator
+    protected static function buildIterator(string $directory, bool $recursive = false, ?string $regex = null, int $mode): \Iterator
     {
         $it = new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS);
         if ($regex !== null) {
@@ -171,7 +171,7 @@ 
      */
     public static function cut(string $path, string $basepath):string
     {
-        $path =  PathTrait::toAbsolutePath($path);
+        $path = PathTrait::toAbsolutePath($path);
         $basepath = PathTrait::toAbsolutePath($basepath);
         if (strpos($path, $basepath.DIRECTORY_SEPARATOR) === 0) {
             return substr($path, \strlen($basepath) + 1);
@@ -188,7 +188,7 @@ 
      * @param boolean $move
      * @return boolean
      */
-    public static function copy(string $path, string $toPath, ?string $regex=null, bool $move = false):bool
+    public static function copy(string $path, string $toPath, ?string $regex = null, bool $move = false):bool
     {
         $directory = Path::format($path);
         static::makes($toPath);
@@ -227,7 +227,7 @@ 
      * @param string|null $regex
      * @return boolean
      */
-    public static function move(string $path, string $toPath, ?string $regex=null):bool
+    public static function move(string $path, string $toPath, ?string $regex = null):bool
     {
         return static::copy($path, $toPath, $regex, true);
     }

nebula/src/application/filesystem/FileSystem.php

Indentation +3 added lines, -3 removed lines

@@ -19,9 +19,9 @@
     }
 
     use FileHelper  {
-       delete as protected deleteFile;
-       FileHelper::copy insteadof DirectoryHelper;
-       FileHelper::move insteadof DirectoryHelper;
+        delete as protected deleteFile;
+        FileHelper::copy insteadof DirectoryHelper;
+        FileHelper::move insteadof DirectoryHelper;
     }
 
 

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public static function delete(string $path):bool
     {
-        if (($path=Path::format($path)) !== null) {
+        if (($path = Path::format($path)) !== null) {
             if (is_file($path)) {
                 return static::deleteFile($path);
             }

nebula/src/component/loader/IncludeManager.php

Spacing +9 added lines, -9 removed lines

@@ -15,14 +15,14 @@ 
      *
      * @var array
      */
-    protected $namespace=[ __NAMESPACE__ ];
+    protected $namespace = [__NAMESPACE__];
 
     /**
      * 包含路径
      *
      * @var array
      */
-    protected $includePath=[];
+    protected $includePath = [];
 
     /**
      * 将JAVA，路径分割转换为PHP分割符
@@ -32,7 +32,7 @@ 
      */
     public static function realName(string $name):string
     {
-        return str_replace(['.','/'], '\\', $name);
+        return str_replace(['.', '/'], '\\', $name);
     }
 
     /**
@@ -41,7 +41,7 @@ 
      * @param string $name
      * @return string|null
      */
-    public static function realPath(string $name):?string
+    public static function realPath(string $name): ?string
     {
         return Path::format($name);
     }
@@ -52,7 +52,7 @@ 
      * @param string $filename
      * @return string|null
      */
-    public function import(string $filename):?string
+    public function import(string $filename): ?string
     {
         if ($filename = static::realPath($filename)) {
             @require_once $filename;
@@ -68,16 +68,16 @@ 
         return null;
     }
 
-    public function addIncludePath(string $path, string $namespace=null)
+    public function addIncludePath(string $path, string $namespace = null)
     {
         if ($path = static::realPath($path)) {
             $namespace = $namespace ?? 0;
             if (array_key_exists($namespace, $this->includePath)) {
                 if (!\in_array($path, $this->includePath[$namespace])) {
-                    $this->includePath[$namespace][]=$path;
+                    $this->includePath[$namespace][] = $path;
                 }
             } else {
-                $this->includePath[$namespace][]=$path;
+                $this->includePath[$namespace][] = $path;
             }
         }
     }
@@ -95,7 +95,7 @@ 
     public function setNamespace(string $namespace)
     {
         if (!in_array($namespace, $this->namespace)) {
-            $this->namespace[]=$namespace;
+            $this->namespace[] = $namespace;
         }
     }
 }

nebula/src/application/Resource.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
     {
         $path = $source;
         if (Path::isRelativePath($source)) {
-            $path =  $relative.'/'.$path;
+            $path = $relative.'/'.$path;
         }
         return Path::toAbsolutePath($path);
     }
@@ -53,7 +53,7 @@ 
      * @param string $path
      * @return string|null
      */
-    public function getResourcePath(string $path):?string
+    public function getResourcePath(string $path): ?string
     {
         foreach ($this->resource as $root) {
             $target = $root.'/'.$path;
@@ -70,10 +70,10 @@ 
      * @param string $path
      * @return string|null
      */
-    public function getConfigResourcePath(string $path):?string
+    public function getConfigResourcePath(string $path): ?string
     {
         foreach ($this->resource as $root) {
-            if ( $target = Config::resolve($root.'/'.$path)) {
+            if ($target = Config::resolve($root.'/'.$path)) {
                 return $target;
             }
         }

nebula/loader/loader.php

Spacing +6 added lines, -6 removed lines

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

nebula/src/application/cache/FileCache.php

Spacing +21 added lines, -21 removed lines

@@ -32,19 +32,19 @@ 
      * @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
     {
         if ($this->disable()) {
             return false;
         }
-        $path=$this->getPath($name);
-        $this->value[$name]=$value;
+        $path = $this->getPath($name);
+        $this->value[$name] = $value;
         FileSystem::makes(dirname($path));
-        $value=serialize($value);
+        $value = serialize($value);
         if (is_null($expire)) {
-            $expire=time() + $this->defaultLiveTime;
+            $expire = time() + $this->defaultLiveTime;
         }
-        return file_put_contents($path, $expire.'|'.$value)!==false;
+        return file_put_contents($path, $expire.'|'.$value) !== false;
     }
 
     /**
@@ -52,19 +52,19 @@ 
      * @param string $name 名
      * @return mixed|null
      */
-    public function get(string $name, $defalut=null)
+    public function get(string $name, $defalut = null)
     {
         // 有值就获取值
         if (array_key_exists($name, $this->value)) {
-            $value=$this->value[$name];
+            $value = $this->value[$name];
             return $value;
         }
         // 没值就在cache文件中查找
-        $path=$this->getPath($name);
+        $path = $this->getPath($name);
         if (FileSystem::exist($path)) {
-            $value=FileSystem::get($path);
-            list($time, $value)=explode('|', $value, 2);
-            if (time()<intval($time)) {
+            $value = FileSystem::get($path);
+            list($time, $value) = explode('|', $value, 2);
+            if (time() < intval($time)) {
                 // 未过期则返回
                 return unserialize($value);
             } else {
@@ -95,7 +95,7 @@ 
      */
     public function has(string $name):bool
     {
-        return $this->get($name)!==null;
+        return $this->get($name) !== null;
     }
 
     /**
@@ -103,11 +103,11 @@ 
      */
     public function gc()
     {
-        $files=FileSystem::readFiles($this->path, true);
+        $files = FileSystem::readFiles($this->path, true);
         foreach ($files as $file) {
-            $value=FileSystem::get($file);
-            list($time, $value)=explode('|', $value, 2);
-            if (time()>intval($time)) {
+            $value = FileSystem::get($file);
+            list($time, $value) = explode('|', $value, 2);
+            if (time() > intval($time)) {
                 FileSystem::delete($file);
             }
         }
@@ -131,12 +131,12 @@ 
     private function getPath(string $name)
     {
         if (strpos($name, '.')) {
-            list($main, $sub)=explode('.', $name, 2);
+            list($main, $sub) = explode('.', $name, 2);
         } else {
-            $main=$name;
-            $sub=$name;
+            $main = $name;
+            $sub = $name;
         }
-        $fname= $this->path.'/'.$main.'/'.substr(md5($sub), 0, 4).'.cache';
+        $fname = $this->path.'/'.$main.'/'.substr(md5($sub), 0, 4).'.cache';
         return $fname;
     }
 }

nebula/src/component/route/RouteCollection.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
      *
      * @param RouteMatcher[] $collection
      */
-    public function __construct(array $collection=[])
+    public function __construct(array $collection = [])
     {
         $this->mergeArray($collection);
     }
@@ -34,7 +34,7 @@ 
      * @param array $collection
      * @return void
      */
-    public function mergeArray(array $collection=[])
+    public function mergeArray(array $collection = [])
     {
         $this->collection = array_merge($this->collection, $collection);
     }
@@ -68,7 +68,7 @@ 
      * @param string $name
      * @return RouteMatcher|null
      */
-    public function get(string $name):?RouteMatcher
+    public function get(string $name): ?RouteMatcher
     {
         return $this->collection[$name] ?? null;
     }

nebula/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