Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 808760c

Browse files
committed
update some info
1 parent 6ea8ab1 commit 808760c

File tree

6 files changed

+56
-88
lines changed

6 files changed

+56
-88
lines changed

‎libs/autoload.php

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,35 @@
33
$lib = __DIR__;
44
$map = [
55
// arr-utils
6-
'Toolkit\ArrUtil\\' => $lib . '/arr-utils/src',
7-
'Toolkit\ArrUtil\Test\\' => $lib . '/arr-utils/test',
6+
'Toolkit\ArrUtil\\' => $lib . '/arr-utils/src',
7+
'Toolkit\ArrUtilTest\\' => $lib . '/arr-utils/test',
88
// cli-utils
9-
'Toolkit\Cli\\' => $lib . '/cli-utils/src',
10-
'Toolkit\Cli\Test\\' => $lib . '/cli-utils/test',
9+
'Toolkit\Cli\\' => $lib . '/cli-utils/src',
10+
'Toolkit\CliTest\\' => $lib . '/cli-utils/test',
11+
// di
12+
'Toolkit\DI\\' => $lib . '/di/src',
13+
'Toolkit\DITest\\' => $lib . '/di/test',
1114
// collection
12-
'Toolkit\Collection\Test\\' => $lib . '/collection/test',
13-
'Toolkit\Collection\\' => $lib . '/collection/src',
15+
'Toolkit\CollectionTest\\' => $lib . '/collection/test',
16+
'Toolkit\Collection\\' => $lib . '/collection/src',
1417
// file parse
15-
'Toolkit\File\Parse\\' => $lib . '/file-parse/src',
16-
'Toolkit\File\Parse\Test\\' => $lib . '/file-parse/test',
18+
'Toolkit\File\Parse\\' => $lib . '/file-parse/src',
19+
'Toolkit\File\ParseTest\\' => $lib . '/file-parse/test',
1720
// file utils
18-
'Toolkit\File\\' => $lib . '/file-utils/src',
19-
'Toolkit\File\Test\\' => $lib . '/file-utils/test',
21+
'Toolkit\File\\' => $lib . '/file-utils/src',
22+
'Toolkit\FileTest\\' => $lib . '/file-utils/test',
2023
// obj-utils
21-
'Toolkit\ObjUtil\\' => $lib . '/obj-utils/src',
22-
'Toolkit\ObjUtil\Test\\' => $lib . '/obj-utils/test',
24+
'Toolkit\ObjUtil\\' => $lib . '/obj-utils/src',
25+
'Toolkit\ObjUtilTest\\' => $lib . '/obj-utils/test',
2326
// php utils
24-
'Toolkit\PhpUtil\\' => $lib . '/php-utils/src',
25-
'Toolkit\PhpUtil\Test\\' => $lib . '/php-utils/test',
27+
'Toolkit\PhpUtil\\' => $lib . '/php-utils/src',
28+
'Toolkit\PhpUtilTest\\' => $lib . '/php-utils/test',
2629
// str utils
27-
'Toolkit\StrUtil\\' => $lib . '/str-utils/src',
28-
'Toolkit\StrUtil\Test\\' => $lib . '/str-utils/test',
30+
'Toolkit\StrUtil\\' => $lib . '/str-utils/src',
31+
'Toolkit\StrUtilTest\\' => $lib . '/str-utils/test',
2932
// sys utils
30-
'Toolkit\Sys\\' => $lib . '/sys-utils/src',
31-
'Toolkit\Sys\Test\\' => $lib . '/sys-utils/test',
33+
'Toolkit\Sys\\' => $lib . '/sys-utils/src',
34+
'Toolkit\SysTest\\' => $lib . '/sys-utils/test',
3235
];
3336

3437
spl_autoload_register(function ($class) use ($map) {
@@ -39,14 +42,9 @@
3942
$file = $dir . "/example/{$path}.php";
4043

4144
if ($file && is_file($file)) {
42-
include_file_toolkit($file);
45+
include$file;
4346
return;
4447
}
4548
}
4649
}
4750
});
48-
49-
function include_file_toolkit($file)
50-
{
51-
include $file;
52-
}

‎libs/cli-utils/src/ColorTag.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ class ColorTag
1717
// regex used for removing color tags
1818
private const STRIP_TAG = '/<[\/]?[a-zA-Z=;]+>/';
1919

20+
// Regex to match tags/
21+
private const COLOR_TAG = '/<([a-zA-Z=;]+)>(.*?)<\/\\1>/s';
22+
2023
/**
2124
* alias of the wrap()
2225
* @param string $text
@@ -42,6 +45,19 @@ public static function wrap(string $text, string $tag): string
4245
return "<$tag>$text</$tag>";
4346
}
4447

48+
/**
49+
* @param string $text
50+
* @return array
51+
*/
52+
public static function matchAll(string $text): array
53+
{
54+
if (!\preg_match_all(self::COLOR_TAG, $text, $matches)) {
55+
return [];
56+
}
57+
58+
return $matches;
59+
}
60+
4561
public static function parse(string $text): string
4662
{
4763

‎libs/cli-utils/test/ColorTagTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@
1717
*/
1818
class ColorTagTest extends TestCase
1919
{
20+
public function testMatchAll(): void
21+
{
22+
$ret = ColorTag::matchAll('<tag>text0</tag> or <info>text1</info>');
23+
24+
$this->assertCount(3, $ret);
25+
// tag
26+
$this->assertSame('tag', $ret[1][0]);
27+
$this->assertSame('info', $ret[1][1]);
28+
// content
29+
$this->assertSame('text0', $ret[2][0]);
30+
}
31+
2032
public function testStrip(): void
2133
{
2234
$text = ColorTag::strip('<tag>text</tag>');

‎libs/data-parser/test/SwooleParserTest.php

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎libs/file-parse/test/IniParserTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
* Time: 20:25
77
*/
88

9-
namespace Toolkit\File\Parse\Test;
9+
namespace Toolkit\File\ParseTest;
1010

1111
use PHPUnit\Framework\TestCase;
1212
use Toolkit\File\Parse\IniParser;
1313

1414
/**
1515
* Class IniParserTest
16-
* @package Toolkit\File\Parse\Test
16+
* @package Toolkit\File\ParseTest
1717
*/
1818
class IniParserTest extends TestCase
1919
{
2020
/**
2121
* simple parse
2222
*/
23-
public function testParse()
23+
public function testParse(): void
2424
{
2525
$ret = IniParser::parseFile(__DIR__ . '/data/test.ini');
2626

‎phpunit.xml.dist

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@
1010
stopOnFailure="false"
1111
>
1212
<testsuites>
13-
<testsuite name="Php Library Test Suite">
14-
<directory suffix="Test.php">libs/data-parser/test</directory>
15-
<directory suffix="Test.php">libs/di/test</directory>
13+
<testsuite name="Php Toolkit Test Suite">
14+
<directory suffix="Test.php">libs/*/test</directory>
1615
</testsuite>
1716
</testsuites>
1817

1918
<filter>
2019
<whitelist>
21-
<directory suffix=".php">libs/data-parser/src</directory>
22-
<directory suffix=".php">libs/di/src</directory>
20+
<directory suffix=".php">libs/*/src</directory>
2321
</whitelist>
2422
</filter>
2523
</phpunit>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /