Update FireFS::makePath()

Author: na2axl

src/FireFS/FireFS.php

@@ -277,7 +277,7 @@ public function toInternalPath(string $path): string
 
         // Convert relative path to absolute path
         if (preg_match('#^(\.)+/#', $internalPath)) {
-            $internalPath = $this->makePath(array($this->workingDir(), $internalPath));
+            $internalPath = $this->makePath($this->workingDir(), $internalPath);
         }
 
         // Apply aliases
@@ -288,7 +288,7 @@ public function toInternalPath(string $path): string
 
             foreach ($this->aliases as $key => $value) {
                 if (substr($internalPath, 0, strlen($key)) == $key) {
-                    $internalPath = $this->makePath(array($value, substr($internalPath, strlen($key))));
+                    $internalPath = $this->makePath($value, substr($internalPath, strlen($key)));
                     $appliedAliasesNbr++;
                 }
             }
@@ -299,7 +299,7 @@ public function toInternalPath(string $path): string
         // Prepend the root path
         $rootPath = $this->rootPath();
         if (!empty($rootPath)) {
-            $internalPath = $this->makePath(array($rootPath, $internalPath));
+            $internalPath = $this->makePath($rootPath, $internalPath);
         }
 
         return $this->cleanPath($internalPath);
@@ -318,10 +318,10 @@ public function rootPath(): string
     /**
      * Implode all parts of $path and return a valid path
      *
-     * @param  array $path Parts of the path to build
+     * @param  string[] $path Parts of the path to build
      * @return string
      */
-    public function makePath(array $path): string
+    public function makePath(string ...$path): string
     {
         return implode(DIRECTORY_SEPARATOR, array_map(function ($field) {
             return rtrim($field, '/\\');
@@ -573,7 +573,7 @@ public function mkdir(string $path, bool $recursive = false): bool
      */
     public function rename(string $path, string $new_name): bool
     {
-        return $this->move($path, $this->makePath(array($this->dirname($path), $new_name)));
+        return $this->move($path, $this->makePath($this->dirname($path), $new_name));
     }
 
     /**
@@ -589,7 +589,7 @@ public function rename(string $path, string $new_name): bool
     public function move(string $path, string $new_path): bool
     {
         if ($this->isDir($new_path) && !$this->isDir($path)) {
-            $new_path = $this->makePath(array($new_path, $this->basename($path)));
+            $new_path = $this->makePath($new_path, $this->basename($path));
         }
 
         $destDirname = $this->dirname($new_path);
@@ -633,7 +633,7 @@ public function basename(string $path): string
     public function copy(string $path, string $new_path): bool
     {
         if ($this->isDir($new_path) && !$this->isDir($path)) {
-            $new_path = $this->cleanPath($this->makePath(array($new_path, $this->basename($path))));
+            $new_path = $this->cleanPath($this->makePath($new_path, $this->basename($path)));
         }
 
         $destDirname = $this->dirname($new_path);
@@ -655,7 +655,7 @@ public function copy(string $path, string $new_path): bool
             $res = false;
 
             foreach ($subfiles as $fileToCopyName => $fileToCopyPath) {
-                $res = $this->copy($this->makePath(array($path, $fileToCopyName)), $this->makePath(array($new_path, $fileToCopyName)));
+                $res = $this->copy($this->makePath($path, $fileToCopyName), $this->makePath($new_path, $fileToCopyName));
 
                 if (!$res)
                     break;
@@ -698,7 +698,7 @@ public function readDir(string $path, bool $recursive = false, array $options =
 
         if ($handle = opendir($path)) {
             while (($file = readdir($handle)) !== false) {
-                $filepath = $this->cleanPath($this->makePath(array($path, $file)));
+                $filepath = $this->cleanPath($this->makePath($path, $file));
 
                 // Removing dirty
                 if ($file == '.' || $file == '..') {
@@ -741,7 +741,7 @@ public function readDir(string $path, bool $recursive = false, array $options =
                 if ($recursive === true && $this->isDir($filepath)) {
                     $subfiles = $this->readDir($filepath, $recursive, $options);
                     foreach ($subfiles as $subfilename => $subfilepath) {
-                        $files[$this->makePath(array($file, $subfilename))] = $subfilepath;
+                        $files[$this->makePath($file, $subfilename)] = $subfilepath;
                     }
                 }
             }
@@ -803,7 +803,7 @@ public function toExternalPath(string $internalPath): string
             foreach ($this->aliases as $key => $value) {
                 $value = '/' . $value;
                 if (substr($externalPath, 0, strlen($value)) == $value) {
-                    $externalPath = $this->makePath(array($key, substr($externalPath, strlen($value))));
+                    $externalPath = $this->makePath($key, substr($externalPath, strlen($value)));
                     $appliedAliasesNbr++;
                 }
             }
@@ -847,7 +847,7 @@ public function toFileSystemPath(string $internalPath): string
 
             foreach ($this->aliases as $key => $value) {
                 if (substr($externalPath, 0, strlen($key)) == $key) {
-                    $externalPath = $this->makePath(array($value, substr($externalPath, strlen($key))));
+                    $externalPath = $this->makePath($value, substr($externalPath, strlen($key)));
                     $appliedAliasesNbr++;
                 }
             }