Skip to content

Commit 21a5de3

Browse files
committed
Merge branch 'v8.x' of https://github.com/MyIntervals/PHP-CSS-Parser into fix/malformed-identifier
* 'v8.x' of https://github.com/MyIntervals/PHP-CSS-Parser: (46 commits) [CLEANUP] Autoformat the code (MyIntervals#749) [TASK] Prepare the 8.7.0 release (MyIntervals#742) [BUGFIX] Fix another implictly nullable parameter (MyIntervals#751) [CLEANUP] Autoformat the changelog (MyIntervals#750) [TASK] Configure PHPUnit to be more strict (MyIntervals#744) [BUGFIX] Avoid implicit nullable parameters (MyIntervals#746) [BUGFIX] Revert broken support for multiple comments (MyIntervals#741) [TASK] Add some more tests for parsing comments (MyIntervals#739) [TASK] Use fixed PHPUnit versions (MyIntervals#726) [TASK] Update PHPUnit (MyIntervals#725) [TASK] State since which version code is `@internal`/`@deprecated` (MyIntervals#723) [TASK] Deprecate the expansion of shorthand properties (MyIntervals#719) [TASK] Mark parsing-internal classes and methods as `@internal` (MyIntervals#711) [TASK] Deprecate `Parser::setCharset()` and `Parser::getCharset()` (MyIntervals#703) [FEATURE] Run the tests on CI with PHP 8.4 as well (MyIntervals#701) [TASK] Run the tests with PHP versions up to 8.3 (MyIntervals#697) [TASK] Also allow higher versions of PHPUnit (MyIntervals#682) [BUGFIX] Fix type errors in PHP strict mode (MyIntervals#695) [TASK] Block installations on unsupported higher PHP versions (MyIntervals#692) [BUGFIX] Avoid using `setUp()` in testcases (MyIntervals#683) ...
2 parents d57bdd2 + 6098bee commit 21a5de3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+846
-156
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
22

33
on:
4-
pull_request:
54
push:
5+
branches:
6+
- main
7+
pull_request:
68
schedule:
79
- cron: '3 3 * * 1'
810

@@ -14,11 +16,11 @@ jobs:
1416
runs-on: ubuntu-22.04
1517
strategy:
1618
matrix:
17-
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
19+
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
1820

1921
steps:
2022
- name: Checkout
21-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2224

2325
- name: Install PHP
2426
uses: shivammathur/setup-php@v2
@@ -39,29 +41,25 @@ jobs:
3941
strategy:
4042
fail-fast: false
4143
matrix:
42-
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3' ]
43-
coverage: [ 'none' ]
44-
include:
45-
- php-version: '7.4'
46-
coverage: xdebug
44+
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
4745

4846
steps:
4947
- name: Checkout
50-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
5149

5250
- name: Install PHP
5351
uses: shivammathur/setup-php@v2
5452
with:
5553
php-version: ${{ matrix.php-version }}
5654
ini-values: error_reporting=E_ALL
5755
tools: composer:v2
58-
coverage: "${{ matrix.coverage }}"
56+
coverage: none
5957

6058
- name: Show the Composer configuration
6159
run: composer config --global --list
6260

6361
- name: Cache dependencies installed with composer
64-
uses: actions/cache@v3
62+
uses: actions/cache@v4
6563
with:
6664
path: ~/.cache/composer
6765
key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -74,14 +72,7 @@ jobs:
7472
composer show;
7573
7674
- name: Run Tests
77-
run: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
78-
79-
- name: Upload coverage results to Codacy
80-
env:
81-
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
82-
if: "${{ matrix.coverage != 'none' && env.CODACY_PROJECT_TOKEN != '' }}"
83-
run: |
84-
./vendor/bin/codacycoverage clover build/coverage/xml
75+
run: ./vendor/bin/phpunit
8576

8677
static-analysis:
8778
name: Static Analysis
@@ -103,7 +94,7 @@ jobs:
10394

10495
steps:
10596
- name: Checkout
106-
uses: actions/checkout@v3
97+
uses: actions/checkout@v4
10798

10899
- name: Install PHP
109100
uses: shivammathur/setup-php@v2
@@ -116,7 +107,7 @@ jobs:
116107
run: composer config --global --list
117108

118109
- name: Cache dependencies installed with composer
119-
uses: actions/cache@v3
110+
uses: actions/cache@v4
120111
with:
121112
path: ~/.cache/composer
122113
key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/.phive/*
22
/.php-cs-fixer.cache
33
/.php_cs.cache
4+
/.phpunit.result.cache
45
/composer.lock
56
/phpstan.neon
67
/vendor/

0 commit comments

Comments
 (0)