Skip to content

Commit 6213545

Browse files
mathrocmathroc
authored
Merge branch 'MyIntervals:main' into master
2 parents b90d536 + 9ea4650 commit 6213545

Some content is hidden

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

54 files changed

+1149
-253
lines changed

‎.github/dependabot.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
3+
version: 2
4+
updates:
5+
- package-ecosystem: "github-actions"
6+
directory: "/"
7+
schedule:
8+
interval: "daily"
9+
10+
- package-ecosystem: "composer"
11+
directory: "/"
12+
schedule:
13+
interval: "daily"
14+
allow:
15+
- dependency-type: "development"
16+
versioning-strategy: "increase"

‎.github/workflows/ci.yml‎

Lines changed: 28 additions & 32 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

@@ -11,14 +13,14 @@ name: CI
1113
jobs:
1214
php-lint:
1315
name: PHP Lint
14-
runs-on: ubuntu-20.04
16+
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: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
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
@@ -32,32 +34,32 @@ jobs:
3234
unit-tests:
3335
name: Unit tests
3436

35-
runs-on: ubuntu-20.04
37+
runs-on: ubuntu-22.04
3638

3739
needs: [ php-lint ]
3840

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: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
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 }}
54+
ini-values: error_reporting=E_ALL
5655
tools: composer:v2
57-
coverage: "${{ matrix.coverage }}"
56+
coverage: none
57+
58+
- name: Show the Composer configuration
59+
run: composer config --global --list
5860

5961
- name: Cache dependencies installed with composer
60-
uses: actions/cache@v1
62+
uses: actions/cache@v4
6163
with:
6264
path: ~/.cache/composer
6365
key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -70,36 +72,27 @@ jobs:
7072
composer show;
7173
7274
- name: Run Tests
73-
run: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
74-
75-
- name: Upload coverage results to Codacy
76-
env:
77-
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
78-
if: "${{ matrix.coverage != 'none' && env.CODACY_PROJECT_TOKEN != '' }}"
79-
run: |
80-
./vendor/bin/codacycoverage clover build/coverage/xml
75+
run: ./vendor/bin/phpunit
8176

8277
static-analysis:
8378
name: Static Analysis
8479

85-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-22.04
8681

8782
needs: [ php-lint ]
8883

8984
strategy:
9085
fail-fast: false
9186
matrix:
92-
include:
93-
- command: sniffer
94-
php-version: 7.4
95-
- command: fixer
96-
php-version: 7.4
97-
- command: stan
98-
php-version: 7.4
87+
command:
88+
- fixer
89+
- stan
90+
php-version:
91+
- '8.3'
9992

10093
steps:
10194
- name: Checkout
102-
uses: actions/checkout@v3
95+
uses: actions/checkout@v4
10396

10497
- name: Install PHP
10598
uses: shivammathur/setup-php@v2
@@ -108,8 +101,11 @@ jobs:
108101
tools: "composer:v2, phive"
109102
coverage: none
110103

104+
- name: Show the Composer configuration
105+
run: composer config --global --list
106+
111107
- name: Cache dependencies installed with composer
112-
uses: actions/cache@v1
108+
uses: actions/cache@v4
113109
with:
114110
path: ~/.cache/composer
115111
key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -123,7 +119,7 @@ jobs:
123119
124120
- name: Install development tools
125121
run: |
126-
phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E,A972B9ABB95D0B760B51442231C7E470E2138192,D32680D5957DC7116BE29C14CF1A108D0E7AE720
122+
phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E
127123
128124
- name: Run Command
129125
run: composer ci:php:${{ matrix.command }}

‎.github/workflows/codecoverage.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
name: Code coverage
10+
11+
jobs:
12+
code-coverage:
13+
name: Code coverage
14+
15+
runs-on: ubuntu-22.04
16+
17+
strategy:
18+
matrix:
19+
php-version: [ '7.4' ]
20+
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
25+
- name: Install PHP
26+
uses: shivammathur/setup-php@v2
27+
with:
28+
php-version: ${{ matrix.php-version }}
29+
ini-values: error_reporting=E_ALL
30+
tools: composer:v2
31+
coverage: xdebug
32+
33+
- name: Show the Composer configuration
34+
run: composer config --global --list
35+
36+
- name: Cache dependencies installed with composer
37+
uses: actions/cache@v4
38+
with:
39+
path: ~/.cache/composer
40+
key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
41+
restore-keys: |
42+
php${{ matrix.php-version }}-composer-
43+
44+
- name: Install Composer dependencies
45+
run: |
46+
composer update --with-dependencies --no-progress;
47+
composer show;
48+
49+
- name: Run Tests
50+
run: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
51+
52+
- name: Upload coverage results to Codacy
53+
env:
54+
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
55+
if: "${{ env.CODACY_PROJECT_TOKEN != '' }}"
56+
run: |
57+
./vendor/bin/codacycoverage clover build/coverage/xml

‎.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/

‎.phive/phars.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="php-cs-fixer" version="^3.4.0" installed="3.4.0" location="./.phive/php-cs-fixer.phar" copy="false"/>
4-
<phar name="phpcbf" version="^3.6.2" location="./.phive/phpcbf.phar" copy="false" installed="3.6.2"/>
5-
<phar name="phpcs" version="^3.6.2" location="./.phive/phpcs.phar" copy="false" installed="3.6.2"/>
6-
<phar name="phpstan" version="^1.3.3" installed="1.3.3" location="./.phive/phpstan.phar" copy="false"/>
3+
<phar name="php-cs-fixer" version="^3.50.0" installed="3.50.0" location="./.phive/php-cs-fixer" copy="false"/>
74
</phive>

‎CHANGELOG.md‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,45 @@
1-
# Revision History
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
This project adheres to [Semantic Versioning](https://semver.org/).
5+
6+
## x.y.z
7+
8+
### Added
9+
10+
- Add support for the `dvh`, `lvh` and `svh` length units (#415)
11+
- Add more tests (#449)
12+
13+
### Changed
14+
15+
- Add visibility to all class/interface constants (#469)
16+
17+
### Deprecated
18+
19+
### Removed
20+
21+
- Drop support for PHP < 7.2 (#420)
22+
23+
### Fixed
24+
25+
- Fix PHP notice caused by parsing invalid color values having less than 6 characters (#485)
26+
- Fix (regression) failure to parse at-rules with strict parsing (#456)
27+
28+
## 8.5.0
29+
30+
### Added
31+
32+
- Add a method to get an import's media queries (#384)
33+
- Add more unit tests (#381, #382)
34+
35+
### Fixed
36+
37+
- Retain CSSList and Rule comments when rendering CSS (#351)
38+
- Replace invalid `turns` unit with `turn` (#350)
39+
- Also allow string values for rules (#348)
40+
- Fix invalid calc parsing (#169)
41+
- Handle scientific notation when parsing sizes (#179)
42+
- Fix PHP 8.1 compatibility in `ParserState::strsplit()` (#344)
243

344
## 8.4.0
445

0 commit comments

Comments
 (0)