Movatterモバイル変換

[0]ホーム
URL:

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

Commita316e3f

Browse files
authored
fix: Parse CSS with duplicate selectors (#201)
1 parent35d6c36 commita316e3f

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

‎.github/workflows/php.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
phpcs:
1111
runs-on:ubuntu-latest
1212
steps:
13-
-uses:actions/checkout@v2
13+
-uses:actions/checkout@v3
1414

1515
-name:Setup PHP and PHPCS
1616
uses:shivammathur/setup-php@v2
@@ -24,7 +24,7 @@ jobs:
2424

2525
-name:Get composer cache directory
2626
id:composer-cache
27-
run:echo "::set-output name=dir::$(composer config cache-files-dir)"
27+
run:echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
2828

2929
-name:Cache Composer packages
3030
uses:actions/cache@v3
@@ -45,7 +45,7 @@ jobs:
4545
matrix:
4646
php-versions:['7.3', '7.4', '8.0', '8.1', '8.2']
4747
steps:
48-
-uses:actions/checkout@v2
48+
-uses:actions/checkout@v3
4949

5050
-name:Setup PHP ${{ matrix.php-versions }}
5151
uses:shivammathur/setup-php@v2
@@ -56,7 +56,7 @@ jobs:
5656

5757
-name:Get composer cache directory
5858
id:composer-cache
59-
run:echo "::set-output name=dir::$(composer config cache-files-dir)"
59+
run:echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
6060

6161
-name:Cache Composer packages
6262
uses:actions/cache@v3
@@ -74,7 +74,7 @@ jobs:
7474
coverage:
7575
runs-on:ubuntu-latest
7676
steps:
77-
-uses:actions/checkout@v2
77+
-uses:actions/checkout@v3
7878

7979
-name:Setup PHP with tools
8080
uses:shivammathur/setup-php@v2
@@ -84,7 +84,7 @@ jobs:
8484

8585
-name:Get composer cache directory
8686
id:composer-cache
87-
run:echo "::set-output name=dir::$(composer config cache-files-dir)"
87+
run:echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
8888

8989
-name:Cache Composer packages
9090
uses:actions/cache@v3

‎src/Utilities/SVGStyleParser.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,15 @@ public static function parseCss(string $css): array
5353
preg_match_all('/(?ims)([a-z0-9\s\,\.\:#_\-@^*()\[\]\"\'=]+)\{([^\}]*)\}/',$css,$arr);
5454

5555
foreach ($arr[0]as$i =>$x) {
56-
$selectors =explode(',', Str::trim($arr[1][$i]));
56+
$selectors =array_map(function (string$selector) {
57+
return Str::trim($selector);
58+
},explode(',', Str::trim($arr[1][$i])));
5759
if (in_array($selectors[0], ['@font-face','@keyframes','@media'])) {
5860
continue;
5961
}
6062
$rules =self::parseStyles(Str::trim($arr[2][$i]));
6163
foreach ($selectorsas$selector) {
62-
$result[Str::trim($selector)] =$rules;
64+
$result[$selector] =array_merge($result[$selector] ?? [],$rules);
6365
}
6466
}
6567

‎tests/Utilities/SVGStyleParserTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,11 @@ public function testParseCssWithSkippedElement()
2929

3030
$this->assertCount(0,$result);
3131
}
32+
33+
publicfunctiontestParseDuplicateSelectors()
34+
{
35+
$result = SVGStyleParser::parseCss('svg {background-color: beige;}; svg {stroke: none;} svg { fill: blue }');
36+
37+
$this->assertSame(['svg' => ['background-color' =>'beige','stroke' =>'none','fill' =>'blue']],$result);
38+
}
3239
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp