fix some errors, remove .editerconfig

php-toolkit · Jan 4, 2019 · 2ce75b8 · 2ce75b8
1 parent 03ffa12
commit 2ce75b8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/src/Directory.php b/src/Directory.php
@@ -257,7 +257,7 @@ public static function getFiles($path, $ext = null, $recursive = false, $parent
      * @throws \InvalidArgumentException
      * @throws FileNotFoundException
      */
-    public static function getFilesInfo($path, $ext = null, $recursive = 0, &$list): array
+    public static function getFilesInfo($path, $ext = null, $recursive = 0, &$list = []): array
     {
         $path = self::pathFormat($path);
 

diff --git a/src/FileSystem.php b/src/FileSystem.php
@@ -65,7 +65,7 @@ public static function pathFormat(string $dirName): string
     {
         $dirName = str_ireplace('\\', '/', trim($dirName));
 
-        return substr($dirName, -1) === '/' ? $dirName : $dirName . '/';
+        return substr((string)$dirName, -1) === '/' ? $dirName : $dirName . '/';
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ public static function pathFormat(string $dirName): string @@
         {
             $dirName = str_ireplace('\\', '/', trim($dirName));
-            return substr($dirName, -1) === '/' ? $dirName : $dirName . '/';
+            return substr((string)$dirName, -1) === '/' ? $dirName : $dirName . '/';
         }
         /**
@@ Expand Down @@