Skip to content

Commit 8c3b1f2

Browse files
committed
Merge branch 'upstream_master' into testing-2022
2 parents 9310a87 + cc791ad commit 8c3b1f2

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,13 @@ jobs:
5353
uses: shivammathur/setup-php@v2
5454
with:
5555
php-version: ${{ matrix.php-version }}
56+
ini-values: error_reporting=E_ALL
5657
tools: composer:v2
5758
coverage: "${{ matrix.coverage }}"
5859

60+
- name: Show the Composer configuration
61+
run: composer config --global --list
62+
5963
- name: Cache dependencies installed with composer
6064
uses: actions/cache@v3
6165
with:
@@ -108,6 +112,9 @@ jobs:
108112
tools: "composer:v2, phive"
109113
coverage: none
110114

115+
- name: Show the Composer configuration
116+
run: composer config --global --list
117+
111118
- name: Cache dependencies installed with composer
112119
uses: actions/cache@v3
113120
with:

.phive/phars.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="php-cs-fixer" version="^3.9.4" installed="3.9.4" location="./.phive/php-cs-fixer.phar" copy="false"/>
3+
<phar name="php-cs-fixer" version="^3.13.2" installed="3.13.2" location="./.phive/php-cs-fixer.phar" copy="false"/>
44
<phar name="phpcbf" version="^3.7.1" installed="3.7.1" location="./.phive/phpcbf.phar" copy="false"/>
55
<phar name="phpcs" version="^3.7.1" installed="3.7.1" location="./.phive/phpcs.phar" copy="false"/>
6-
<phar name="phpstan" version="^1.8.1" installed="1.8.1" location="./.phive/phpstan.phar" copy="false"/>
6+
<phar name="phpstan" version="^1.9.14" installed="1.9.14" location="./.phive/phpstan.phar" copy="false"/>
77
</phive>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ $cssDocument = $parser->parse();
157157
foreach($cssDocument->getAllRuleSets() as $oRuleSet) {
158158
// Note that the added dash will make this remove all rules starting with
159159
// `font-` (like `font-size`, `font-weight`, etc.) as well as a potential
160-
// `font-rule`.
160+
// `font` rule.
161161
$oRuleSet->removeRule('font-');
162162
$oRuleSet->removeRule('cursor');
163163
}

0 commit comments

Comments
 (0)