Skip to content

Commit a10d650

Browse files
committed
update some methods and remove YamlParser
1 parent b4eea54 commit a10d650

File tree

3 files changed

+10
-147
lines changed

3 files changed

+10
-147
lines changed

src/File.php

+4-30
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Toolkit\FsUtil\Exception\IOException;
1717
use Toolkit\FsUtil\Parser\IniParser;
1818
use Toolkit\FsUtil\Parser\JsonParser;
19-
use Toolkit\FsUtil\Parser\YamlParser;
2019
use Toolkit\FsUtil\Traits\FileOperateTrait;
2120
use Toolkit\FsUtil\Traits\FileSnippetReadTrait;
2221
use 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
*********************************************************************************/

src/Parser/YamlParser.php

-116
This file was deleted.

src/Traits/FileOperateTrait.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use function pathinfo;
2424
use function preg_match;
2525
use function stat;
26+
use function str_contains;
2627
use function strrchr;
2728
use function strstr;
2829
use function trim;
@@ -48,7 +49,11 @@ trait FileOperateTrait
4849
*/
4950
public static function getName(string $file, bool $clearExt = false): string
5051
{
51-
$filename = basename(trim($file));
52+
if (!str_contains($file, '.')) {
53+
return basename($file);
54+
}
55+
56+
$filename = basename($file);
5257

5358
return $clearExt ? strstr($filename, '.', true) : $filename;
5459
}

0 commit comments

Comments
 (0)