update file-utils namespace

php-toolkit · Apr 30, 2018 · f6dab7f · f6dab7f
1 parent b268990
commit f6dab7f
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Toolkit\\FileUtil\\" : "src/"
+      "Toolkit\\File\\" : "src/"
     }
   },
   "suggest": {

diff --git a/example/dir-watcher.php b/example/dir-watcher.php
@@ -8,7 +8,7 @@
 
 require dirname(__DIR__) . '/test/boot.php';
 
-$mw = new \Toolkit\FileUtil\ModifyWatcher();
+$mw = new \Toolkit\File\ModifyWatcher();
 $ret = $mw
     // ->setIdFile(__DIR__ . '/tmp/dir.id')
     ->watch(dirname(__DIR__))

diff --git a/example/file-finder.php b/example/file-finder.php
@@ -11,7 +11,7 @@
 // var_dump(fnmatch('.*', ".gitkeep"));die;
 // var_dump(glob(__DIR__ . '/{t,T}ests', GLOB_BRACE | GLOB_ONLYDIR));
 
-$finder = \Toolkit\FileUtil\FileFinder::create()
+$finder = \Toolkit\File\FileFinder::create()
     ->files()
     ->name('*.php')
     // ->ignoreVCS(false)

diff --git a/src/Directory.php b/src/Directory.php
@@ -7,15 +7,15 @@
  * Uesd: 主要功能是 hi
  */
 
-namespace Toolkit\FileUtil;
+namespace Toolkit\File;
 
 use DirectoryIterator;
-use Toolkit\FileUtil\Exception\FileSystemException;
-use Toolkit\FileUtil\Exception\FileNotFoundException;
+use Toolkit\File\Exception\FileSystemException;
+use Toolkit\File\Exception\FileNotFoundException;
 
 /**
  * Class Directory
- * @package Toolkit\FileUtil
+ * @package Toolkit\File
  */
 class Directory extends FileSystem
 {

diff --git a/src/Exception/FileNotFoundException.php b/src/Exception/FileNotFoundException.php
@@ -6,11 +6,11 @@
  * Time: 22:58
  */
 
-namespace Toolkit\FileUtil\Exception;
+namespace Toolkit\File\Exception;
 
 /**
  * Class FileNotFoundException
- * @package Toolkit\FileUtil\Exception
+ * @package Toolkit\File\Exception
  */
 class FileNotFoundException extends \Exception
 {

diff --git a/src/Exception/FileReadException.php b/src/Exception/FileReadException.php
@@ -6,11 +6,11 @@
  * Time: 23:03
  */
 
-namespace Toolkit\FileUtil\Exception;
+namespace Toolkit\File\Exception;
 
 /**
  * Class FileReadException
- * @package Toolkit\FileUtil\Exception
+ * @package Toolkit\File\Exception
  */
 class FileReadException extends FileSystemException
 {

diff --git a/src/Exception/FileSystemException.php b/src/Exception/FileSystemException.php
@@ -6,11 +6,11 @@
  * Time: 22:58
  */
 
-namespace Toolkit\FileUtil\Exception;
+namespace Toolkit\File\Exception;
 
 /**
  * Class FileSystemException
- * @package Toolkit\FileUtil\Exception
+ * @package Toolkit\File\Exception
  */
 class FileSystemException extends \Exception
 {

diff --git a/src/Exception/IOException.php b/src/Exception/IOException.php
@@ -6,11 +6,11 @@
  * Time: 23:04
  */
 
-namespace Toolkit\FileUtil\Exception;
+namespace Toolkit\File\Exception;
 
 /**
  * Class IOException
- * @package Toolkit\FileUtil\Exception
+ * @package Toolkit\File\Exception
  */
 class IOException extends FileSystemException
 {

diff --git a/src/File.php b/src/File.php
@@ -8,16 +8,16 @@
  * Uesd: 主要功能是 文件相关信息获取
  */
 
-namespace Toolkit\FileUtil;
+namespace Toolkit\File;
 
-use Toolkit\FileUtil\Exception\FileNotFoundException;
-use Toolkit\FileUtil\Exception\FileReadException;
-use Toolkit\FileUtil\Exception\FileSystemException;
-use Toolkit\FileUtil\Exception\IOException;
+use Toolkit\File\Exception\FileNotFoundException;
+use Toolkit\File\Exception\FileReadException;
+use Toolkit\File\Exception\FileSystemException;
+use Toolkit\File\Exception\IOException;
 
 /**
  * Class File
- * @package Toolkit\FileUtil
+ * @package Toolkit\File
  */
 abstract class File extends FileSystem
 {

diff --git a/src/FileFinder.php b/src/FileFinder.php
@@ -6,7 +6,7 @@
  * Time: 21:57
  */
 
-namespace Toolkit\FileUtil;
+namespace Toolkit\File;
 
 /**
  * Class FileFinder
@@ -23,7 +23,7 @@
  *      // something ......
  * }
  * ```
- * @package Toolkit\FileUtil
+ * @package Toolkit\File
  * @ref \Symfony\Component\Finder\Finder
  */
 final class FileFinder implements \IteratorAggregate, \Countable

diff --git a/src/FileSystem.php b/src/FileSystem.php
@@ -8,15 +8,15 @@
  * Uesd: 主要功能是 hi
  */
 
-namespace Toolkit\FileUtil;
+namespace Toolkit\File;
 
-use Toolkit\FileUtil\Exception\IOException;
-use Toolkit\FileUtil\Exception\FileNotFoundException;
+use Toolkit\File\Exception\IOException;
+use Toolkit\File\Exception\FileNotFoundException;
 use Toolkit\ArrUtil\Arr;
 
 /**
  * Class FileSystem
- * @package Toolkit\FileUtil
+ * @package Toolkit\File
  */
 abstract class FileSystem
 {

diff --git a/src/ModifyWatcher.php b/src/ModifyWatcher.php
@@ -6,7 +6,7 @@
  * Time: 20:56
  */
 
-namespace Toolkit\FileUtil;
+namespace Toolkit\File;
 
 use Inhere\Library\Helpers\Sys;
 

diff --git a/src/ReadTrait.php b/src/ReadTrait.php
@@ -7,18 +7,18 @@
  * Time: 10:35
  */
 
-namespace Toolkit\FileUtil;
+namespace Toolkit\File;
 
-use Toolkit\FileUtil\Exception\FileNotFoundException;
-use Toolkit\FileUtil\Exception\FileSystemException;
-use Toolkit\FileUtil\Exception\FileReadException;
-use Toolkit\FileUtil\Parsers\IniParser;
-use Toolkit\FileUtil\Parsers\JsonParser;
-use Toolkit\FileUtil\Parsers\YmlParser;
+use Toolkit\File\Exception\FileNotFoundException;
+use Toolkit\File\Exception\FileSystemException;
+use Toolkit\File\Exception\FileReadException;
+use Toolkit\File\Parsers\IniParser;
+use Toolkit\File\Parsers\JsonParser;
+use Toolkit\File\Parsers\YmlParser;
 
 /**
  * Class Read
- * @package Toolkit\FileUtil
+ * @package Toolkit\File
  */
 trait ReadTrait
 {

diff --git a/test/boot.php b/test/boot.php
@@ -10,14 +10,14 @@
 spl_autoload_register(function ($class) {
     $file = null;
 
-    if (0 === strpos($class,'Toolkit\FileUtil\Example\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\FileUtil\Example\\')));
+    if (0 === strpos($class,'Toolkit\File\Example\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\File\Example\\')));
         $file = dirname(__DIR__) . "/example/{$path}.php";
-    } elseif (0 === strpos($class,'Toolkit\FileUtil\Test\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\FileUtil\Test\\')));
+    } elseif (0 === strpos($class,'Toolkit\File\Test\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\File\Test\\')));
         $file = __DIR__ . "/{$path}.php";
-    } elseif (0 === strpos($class,'Toolkit\FileUtil\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\FileUtil\\')));
+    } elseif (0 === strpos($class,'Toolkit\File\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\File\\')));
         $file = dirname(__DIR__) . "/src/{$path}.php";
     }