some update for file-parse lib

inhere · inhere · commit abee6ddd0d9c · 2018-04-30T16:03:11.000+08:00
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ parse ini,json,yml file.
 ## install
 
 ```bash
-composer require mylib/file-parse
+composer require toolkit/file-parse
 ```
 
 ## license
diff --git a/composer.json b/composer.json
@@ -1,9 +1,9 @@
 {
-  "name": "mylib/file-parse",
+  "name": "toolkit/file-parse",
   "type": "library",
   "description": "some file parse tool library of the php",
   "keywords": ["library","tool","php"],
-  "homepage": "https://github.com/php-mylib/file-parse",
+  "homepage": "https://github.com/php-toolkit/file-parse",
   "license": "MIT",
   "authors": [
     {
@@ -14,11 +14,11 @@
   ],
   "require": {
     "php": ">=7.0.0",
-    "mylib/str-utils": "~1.0"
+    "toolkit/str-utils": "~1.0"
   },
   "autoload": {
     "psr-4": {
-      "MyLib\\FileParse\\" : "src/"
+      "Toolkit\\File\\Parse\\" : "src/"
     }
   },
   "suggest": {
diff --git a/src/BaseParser.php b/src/BaseParser.php
@@ -6,11 +6,11 @@
  * Time: 上午11:43
  */
 
-namespace MyLib\FileParse;
+namespace Toolkit\File\Parse;
 
 /**
  * Class BaseParser
- * @package MyLib\FileParse
+ * @package Toolkit\File\Parse
  */
 abstract class BaseParser
 {
@@ -42,7 +42,7 @@ abstract protected static function doParse(
      */
     public static function parse($string, $enhancement = false, callable $pathHandler = null, $fileDir = ''): array
     {
-        if (is_file($string)) {
+        if (\is_file($string)) {
             return self::parseFile($string, $enhancement, $pathHandler, $fileDir);
         }
 
@@ -59,12 +59,12 @@ public static function parse($string, $enhancement = false, callable $pathHandle
      */
     public static function parseFile($file, $enhancement = false, callable $pathHandler = null, $fileDir = ''): array
     {
-        if (!is_file($file)) {
+        if (!\is_file($file)) {
             throw new \InvalidArgumentException("Target file [$file] not exists");
         }
 
         $fileDir = $fileDir ?: \dirname($file);
-        $data = file_get_contents($file);
+        $data = \file_get_contents($file);
 
         return static::doParse($data, $enhancement, $pathHandler, $fileDir);
     }
diff --git a/src/IniParser.php b/src/IniParser.php
@@ -6,11 +6,11 @@
  * Time: 上午11:41
  */
 
-namespace MyLib\FileParse;
+namespace Toolkit\File\Parse;
 
 /**
  * Class IniParser
- * @package MyLib\FileParse
+ * @package Toolkit\File\Parse
  */
 class IniParser extends BaseParser
 {
@@ -53,14 +53,14 @@ protected static function doParse($string, $enhancement = false, callable $pathH
                 }
 
                 // if $importFile is not exists AND $importFile is not a absolute path AND have $parentFile
-                if ($fileDir && !file_exists($extendFile) && $extendFile[0] !== '/') {
-                    $extendFile = $fileDir . '/' . trim($extendFile, './');
+                if ($fileDir && !\file_exists($extendFile) && $extendFile[0] !== '/') {
+                    $extendFile = $fileDir . '/' . \trim($extendFile, './');
                 }
 
                 // $importFile is file
-                if (is_file($extendFile)) {
-                    $data = file_get_contents($extendFile);
-                    $array = array_merge(parse_ini_string(trim($data), true), $array);
+                if (\is_file($extendFile)) {
+                    $data = \file_get_contents($extendFile);
+                    $array = \array_merge(parse_ini_string(trim($data), true), $array);
                 } else {
                     throw new \UnexpectedValueException("needed extended file [$extendFile] don't exists!");
                 }
@@ -71,23 +71,23 @@ protected static function doParse($string, $enhancement = false, callable $pathH
                     continue;
                 }
 
-                if (0 === strpos($item, self::IMPORT_KEY . '#')) {
-                    $importFile = trim(substr($item, 7));
+                if (0 === \strpos($item, self::IMPORT_KEY . '#')) {
+                    $importFile = trim(\substr($item, 7));
 
                     // if needed custom handle $importFile path. e.g: Maybe it uses custom alias path
                     if ($pathHandler && \is_callable($pathHandler)) {
                         $importFile = $pathHandler($importFile);
                     }
 
                     // if $importFile is not exists AND $importFile is not a absolute path AND have $parentFile
-                    if ($fileDir && !file_exists($importFile) && $importFile[0] !== '/') {
+                    if ($fileDir && !\file_exists($importFile) && $importFile[0] !== '/') {
                         $importFile = $fileDir . '/' . trim($importFile, './');
                     }
 
                     // $importFile is file
-                    if (is_file($importFile)) {
-                        $data = file_get_contents($importFile);
-                        $array[$key] = parse_ini_string(trim($data), true);
+                    if (\is_file($importFile)) {
+                        $data = \file_get_contents($importFile);
+                        $array[$key] = \parse_ini_string(trim($data), true);
                     } else {
                         throw new \UnexpectedValueException("needed imported file [$importFile] don't exists!");
                     }
diff --git a/src/JsonParser.php b/src/JsonParser.php
@@ -6,13 +6,13 @@
  * Time: 上午11:41
  */
 
-namespace MyLib\FileParse;
+namespace Toolkit\File\Parse;
 
-use MyLib\StrUtil\JsonHelper;
+use Toolkit\StrUtil\JsonHelper;
 
 /**
  * Class JsonParser
- * @package MyLib\FileParse
+ * @package Toolkit\File\Parse
  */
 class JsonParser extends BaseParser
 {
@@ -55,14 +55,14 @@ protected static function doParse($string, $enhancement = false, callable $pathH
                 }
 
                 // if $importFile is not exists AND $importFile is not a absolute path AND have $parentFile
-                if ($fileDir && !file_exists($extendFile) && $extendFile[0] !== '/') {
+                if ($fileDir && !\file_exists($extendFile) && $extendFile[0] !== '/') {
                     $extendFile = $fileDir . '/' . trim($extendFile, './');
                 }
 
                 // $importFile is file
-                if (is_file($extendFile)) {
-                    $data = file_get_contents($extendFile);
-                    $array = array_merge(JsonHelper::parse($data), $array);
+                if (\is_file($extendFile)) {
+                    $data = \file_get_contents($extendFile);
+                    $array = \array_merge(JsonHelper::parse($data), $array);
                 } else {
                     throw new \UnexpectedValueException("needed extended file [$extendFile] don't exists!");
                 }
@@ -73,22 +73,22 @@ protected static function doParse($string, $enhancement = false, callable $pathH
                     continue;
                 }
 
-                if (0 === strpos($item, self::IMPORT_KEY . '#')) {
-                    $importFile = trim(substr($item, 6));
+                if (0 === \strpos($item, self::IMPORT_KEY . '#')) {
+                    $importFile = \trim(\substr($item, 6));
 
                     // if needed custom handle $importFile path. e.g: Maybe it uses custom alias path
                     if ($pathHandler && \is_callable($pathHandler)) {
                         $importFile = $pathHandler($importFile);
                     }
 
                     // if $importFile is not exists AND $importFile is not a absolute path AND have $parentFile
-                    if ($fileDir && !file_exists($importFile) && $importFile[0] !== '/') {
+                    if ($fileDir && !\file_exists($importFile) && $importFile[0] !== '/') {
                         $importFile = $fileDir . '/' . trim($importFile, './');
                     }
 
                     // $importFile is file
-                    if (is_file($importFile)) {
-                        $data = file_get_contents($importFile);
+                    if (\is_file($importFile)) {
+                        $data = \file_get_contents($importFile);
                         $array[$key] = JsonHelper::parse($data);
                     } else {
                         throw new \UnexpectedValueException("needed imported file [$importFile] don't exists!");
diff --git a/src/YmlParser.php b/src/YmlParser.php
@@ -6,13 +6,13 @@
  * Time: 上午11:41
  */
 
-namespace MyLib\FileParse;
+namespace Toolkit\File\Parse;
 
 use Symfony\Component\Yaml\Parser;
 
 /**
  * Class YmlParser
- * @package MyLib\FileParse
+ * @package Toolkit\File\Parse
  */
 class YmlParser extends BaseParser
 {
@@ -36,7 +36,7 @@ protected static function doParse($string, $enhancement = false, callable $pathH
             throw new \InvalidArgumentException('param type error! must is string.');
         }
 
-        if (!class_exists(Parser::class)) {
+        if (!\class_exists(Parser::class)) {
             throw new \UnexpectedValueException('yml format parser Class ' . Parser::class . " don't exists! please install package 'symfony/yaml'.");
         }
 
@@ -60,14 +60,14 @@ protected static function doParse($string, $enhancement = false, callable $pathH
                 }
 
                 // if $importFile is not exists AND $importFile is not a absolute path AND have $parentFile
-                if ($fileDir && !file_exists($extendFile) && $extendFile[0] !== '/') {
+                if ($fileDir && !\file_exists($extendFile) && $extendFile[0] !== '/') {
                     $extendFile = $fileDir . '/' . trim($extendFile, './');
                 }
 
                 // $importFile is file
-                if (is_file($extendFile)) {
-                    $data = file_get_contents($extendFile);
-                    $array = array_merge($parser->parse(trim($data)), $array);
+                if (\is_file($extendFile)) {
+                    $data = \file_get_contents($extendFile);
+                    $array = \array_merge($parser->parse(trim($data)), $array);
                 } else {
                     throw new \UnexpectedValueException("needed extended file $extendFile don't exists!");
                 }
@@ -78,22 +78,22 @@ protected static function doParse($string, $enhancement = false, callable $pathH
                     continue;
                 }
 
-                if (0 === strpos($item, self::IMPORT_KEY . '#')) {
-                    $importFile = trim(substr($item, 6));
+                if (0 === \strpos($item, self::IMPORT_KEY . '#')) {
+                    $importFile = \trim(\substr($item, 6));
 
                     // if needed custom handle $importFile path. e.g: Maybe it uses custom alias path
                     if ($pathHandler && \is_callable($pathHandler)) {
                         $importFile = $pathHandler($importFile);
                     }
 
                     // if $importFile is not exists AND $importFile is not a absolute path AND have $parentFile
-                    if ($fileDir && !file_exists($importFile) && $importFile[0] !== '/') {
+                    if ($fileDir && !\file_exists($importFile) && $importFile[0] !== '/') {
                         $importFile = $fileDir . '/' . trim($importFile, './');
                     }
 
                     // $importFile is file
-                    if (is_file($importFile)) {
-                        $data = file_get_contents($importFile);
+                    if (\is_file($importFile)) {
+                        $data = \file_get_contents($importFile);
                         $array[$key] = $parser->parse(trim($data));
                     } else {
                         throw new \UnexpectedValueException("needed imported file $importFile don't exists!");
diff --git a/test/IniParserTest.php b/test/IniParserTest.php
@@ -6,14 +6,14 @@
  * Time: 20:25
  */
 
-namespace MyLib\FileParse\Test;
+namespace Toolkit\File\Parse\Test;
 
-use MyLib\FileParse\IniParser;
+use Toolkit\File\Parse\IniParser;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class IniParserTest
- * @package MyLib\FileParse\Test
+ * @package Toolkit\File\Parse\Test
  */
 class IniParserTest extends TestCase
 {
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,'MyLib\FileParse\Example\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('MyLib\FileParse\Example\\')));
+    if (0 === strpos($class,'Toolkit\File\Parse\Example\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\File\Parse\Example\\')));
         $file = dirname(__DIR__) . "/example/{$path}.php";
-    } elseif (0 === strpos($class,'MyLib\FileParse\Test\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('MyLib\FileParse\Test\\')));
+    } elseif (0 === strpos($class,'Toolkit\File\Parse\Test\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\File\Parse\Test\\')));
         $file = __DIR__ . "/{$path}.php";
-    } elseif (0 === strpos($class,'MyLib\FileParse\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('MyLib\FileParse\\')));
+    } elseif (0 === strpos($class,'Toolkit\File\Parse\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\File\Parse\\')));
         $file = dirname(__DIR__) . "/src/{$path}.php";
     }
 

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`* Time: 上午11:43`
`7`	`7`	`*/`
`8`	`8`
`9`		`-namespace MyLib\FileParse;`
	`9`	`+namespace Toolkit\File\Parse;`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Class BaseParser`
`13`		`- * @package MyLib\FileParse`
	`13`	`+ * @package Toolkit\File\Parse`
`14`	`14`	`*/`
`15`	`15`	`abstract class BaseParser`
`16`	`16`	`{`
`@@ -42,7 +42,7 @@ abstract protected static function doParse(`
`42`	`42`	`*/`
`43`	`43`	`public static function parse($string, $enhancement = false, callable $pathHandler = null, $fileDir = ''): array`
`44`	`44`	`{`
`45`		`- if (is_file($string)) {`
	`45`	`+ if (\is_file($string)) {`
`46`	`46`	`return self::parseFile($string, $enhancement, $pathHandler, $fileDir);`
`47`	`47`	`}`
`48`	`48`
`@@ -59,12 +59,12 @@ public static function parse($string, $enhancement = false, callable $pathHandle`
`59`	`59`	`*/`
`60`	`60`	`public static function parseFile($file, $enhancement = false, callable $pathHandler = null, $fileDir = ''): array`
`61`	`61`	`{`
`62`		`- if (!is_file($file)) {`
	`62`	`+ if (!\is_file($file)) {`
`63`	`63`	`throw new \InvalidArgumentException("Target file [$file] not exists");`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`$fileDir = $fileDir ?: \dirname($file);`
`67`		`- $data = file_get_contents($file);`
	`67`	`+ $data = \file_get_contents($file);`
`68`	`68`
`69`	`69`	`return static::doParse($data, $enhancement, $pathHandler, $fileDir);`
`70`	`70`	`}`