1616use Toolkit \FsUtil \Exception \IOException ;
1717use Toolkit \FsUtil \Parser \IniParser ;
1818use Toolkit \FsUtil \Parser \JsonParser ;
19- use Toolkit \FsUtil \Parser \YamlParser ;
2019use Toolkit \FsUtil \Traits \FileOperateTrait ;
2120use Toolkit \FsUtil \Traits \FileSnippetReadTrait ;
2221use function dirname ;
@@ -83,11 +82,6 @@ public static function parse(string $src, string $format = self::FORMAT_PHP): ar
8382 {
8483 $ src = trim ($ src );
8584 switch ($ format ) {
86- case self ::FORMAT_YML :
87- case self ::FORMAT_YAML :
88- $ array = self ::parseYaml ($ src );
89- break ;
90-
9185 case self ::FORMAT_JSON :
9286 $ array = self ::parseJson ($ src );
9387 break ;
@@ -97,9 +91,10 @@ public static function parse(string $src, string $format = self::FORMAT_PHP): ar
9791 break ;
9892
9993 case self ::FORMAT_PHP :
100- default :
101- $ array = self ::loadPhp ($ src );
94+ $ array = self ::loadPhpFile ($ src );
10295 break ;
96+ default :
97+ throw new InvalidArgumentException ('unsupported format ' . $ format );
10398 }
10499
105100 return $ array ;
@@ -114,7 +109,7 @@ public static function parse(string $src, string $format = self::FORMAT_PHP): ar
114109 * @return array
115110 * @throws FileNotFoundException
116111 */
117- public static function loadPhp (string $ file , bool $ throwError = true ): array
112+ public static function loadPhpFile (string $ file , bool $ throwError = true ): array
118113 {
119114 $ ary = [];
120115
@@ -172,27 +167,6 @@ public static function loadIni(string $fileOrContents): array
172167 return IniParser::parse ($ fileOrContents );
173168 }
174169
175- /**
176- * @param string $fileOrContents 要解析的 yml 文件名 或 字符串内容。
177- *
178- * @return array
179- */
180- public static function parseYaml (string $ fileOrContents ): array
181- {
182- return YamlParser::parse ($ fileOrContents );
183- }
184-
185- /**
186- * @param string $fileOrContents 要解析的 yml 文件名 或 字符串内容。
187- *
188- * @return array
189- * @deprecated please use parseYaml()
190- */
191- public static function loadYaml (string $ fileOrContents ): array
192- {
193- return YamlParser::parse ($ fileOrContents );
194- }
195-
196170 /**********************************************************************************
197171 * php function wrapper, add error handle
198172 *********************************************************************************/
0 commit comments