Skip to content

Commit d860cb9

Browse files
endelwarendelwar
committed
Merge branch 'release/1.1.0'
2 parents 28a6047 + 4a45f88 commit d860cb9

File tree

17 files changed

+130
-282
lines changed

17 files changed

+130
-282
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 47 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,9 @@ on:
55
push:
66

77
jobs:
8-
php-74-symfony-44:
9-
name: PHP 7.4 / Symfony 4.4
10-
runs-on: ubuntu-latest
11-
steps:
12-
- name: "Checkout"
13-
uses: "actions/checkout@v2"
14-
with:
15-
fetch-depth: 2
16-
17-
- name: "Install PHP"
18-
uses: "shivammathur/setup-php@v2"
19-
with:
20-
php-version: "7.4"
218

22-
- name: "Cache composer packages"
23-
uses: "actions/cache@v2"
24-
with:
25-
path: "~/.composer/cache"
26-
key: "php-7.4-composer-locked-${{ hashFiles('composer.lock') }}"
27-
restore-keys: "php-7.4-composer-locked-"
28-
29-
- name: "Install Symfony 4.4"
30-
run: "composer require symfony/symfony:4.4.* --no-update"
31-
32-
- name: "Install dependencies with composer"
33-
run: "composer update --no-interaction"
34-
35-
- name: "Run PHPUnit Tests"
36-
run: "composer test"
37-
38-
php-74-symfony53:
39-
name: PHP 7.4 / Symfony 5.3
9+
php-74-symfony54:
10+
name: PHP 7.4 / Symfony 5.4
4011
runs-on: ubuntu-latest
4112
steps:
4213
- name: "Checkout"
@@ -56,17 +27,17 @@ jobs:
5627
key: "php-7.4-composer-locked-${{ hashFiles('composer.lock') }}"
5728
restore-keys: "php-7.4-composer-locked-"
5829

59-
- name: "Install Symfony 5.3"
60-
run: "composer require symfony/symfony:5.3.* --no-update"
30+
- name: "Install Symfony 5.4"
31+
run: "composer require symfony/symfony:5.4.* --no-update"
6132

6233
- name: "Install dependencies with composer"
6334
run: "composer update --no-interaction"
6435

6536
- name: "Run PHPUnit Tests"
6637
run: "composer test"
6738

68-
php-80-symfony44:
69-
name: PHP 8.0 / Symfony 4.4
39+
php-80-symfony54:
40+
name: PHP 8.0 / Symfony 5.4
7041
runs-on: ubuntu-latest
7142
steps:
7243
- name: "Checkout"
@@ -77,7 +48,7 @@ jobs:
7748
- name: "Install PHP 8"
7849
uses: "shivammathur/setup-php@v2"
7950
with:
80-
php-version: "8"
51+
php-version: "8.0"
8152

8253
- name: "Cache composer packages"
8354
uses: "actions/cache@v2"
@@ -86,70 +57,71 @@ jobs:
8657
key: "php-8.0-composer-locked-${{ hashFiles('composer.lock') }}"
8758
restore-keys: "php-8.0-composer-locked-"
8859

89-
- name: "Install Symfony 4.4"
90-
run: "composer require symfony/symfony:4.4.* --no-update"
91-
92-
- name: "Install dependencies with composer"
93-
run: "composer update --no-interaction"
94-
95-
- name: "Run PHPUnit Tests"
96-
run: "composer test"
97-
php-80-symfony53:
98-
name: PHP 8.0 / Symfony 5.3
99-
runs-on: ubuntu-latest
100-
steps:
101-
- name: "Checkout"
102-
uses: "actions/checkout@v2"
103-
with:
104-
fetch-depth: 2
105-
106-
- name: "Install PHP 8"
107-
uses: "shivammathur/setup-php@v2"
108-
with:
109-
php-version: "8"
110-
111-
- name: "Cache composer packages"
112-
uses: "actions/cache@v2"
113-
with:
114-
path: "~/.composer/cache"
115-
key: "php-8.0-composer-locked-${{ hashFiles('composer.lock') }}"
116-
restore-keys: "php-8.0-composer-locked-"
117-
118-
- name: "Install Symfony 5.3"
119-
run: "composer require symfony/symfony:5.3.* --no-update"
60+
- name: "Install Symfony 5.4"
61+
run: "composer require symfony/symfony:5.4.* --no-update"
12062

12163
- name: "Install dependencies with composer"
12264
run: "composer update --no-interaction"
12365

12466
- name: "Run PHPUnit Tests"
12567
run: "composer test"
12668

127-
php8:
128-
name: PHP 8 / Symfony 5.4@dev
69+
php-81-symfony54:
70+
name: PHP 8.1 / Symfony 5.4
12971
runs-on: ubuntu-latest
13072
steps:
13173
- name: "Checkout"
13274
uses: "actions/checkout@v2"
13375
with:
13476
fetch-depth: 2
13577

136-
- name: "Install PHP 8"
78+
- name: "Install PHP 8.1"
13779
uses: "shivammathur/setup-php@v2"
13880
with:
139-
php-version: "8"
81+
php-version: "8.1"
14082

14183
- name: "Cache composer packages"
14284
uses: "actions/cache@v2"
14385
with:
14486
path: "~/.composer/cache"
145-
key: "php-8-composer-locked-${{ hashFiles('composer.lock') }}"
146-
restore-keys: "php-8-composer-locked-"
87+
key: "php-8.1-composer-locked-${{ hashFiles('composer.lock') }}"
88+
restore-keys: "php-8.1-composer-locked-"
14789

14890
- name: "Install Symfony 5.4"
149-
run: "composer require symfony/symfony:5.4.*@dev --no-update"
91+
run: "composer require symfony/symfony:5.4.* --no-update"
15092

15193
- name: "Install dependencies with composer"
15294
run: "composer update --no-interaction"
15395

15496
- name: "Run PHPUnit Tests"
155-
run: "composer test"
97+
run: "composer test"
98+
99+
# php8:
100+
# name: PHP 8 / Symfony 6.0
101+
# runs-on: ubuntu-latest
102+
# steps:
103+
# - name: "Checkout"
104+
# uses: "actions/checkout@v2"
105+
# with:
106+
# fetch-depth: 2
107+
#
108+
# - name: "Install PHP 8"
109+
# uses: "shivammathur/setup-php@v2"
110+
# with:
111+
# php-version: "8"
112+
#
113+
# - name: "Cache composer packages"
114+
# uses: "actions/cache@v2"
115+
# with:
116+
# path: "~/.composer/cache"
117+
# key: "php-8-composer-locked-${{ hashFiles('composer.lock') }}"
118+
# restore-keys: "php-8-composer-locked-"
119+
#
120+
# - name: "Install Symfony 6.0"
121+
# run: "composer require symfony/symfony:6.0.* --no-update"
122+
#
123+
# - name: "Install dependencies with composer"
124+
# run: "composer update --no-interaction"
125+
#
126+
# - name: "Run PHPUnit Tests"
127+
# run: "composer test"

‎CHANGELOG.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased]
7+
## Unreleased
88

9-
## [1.0.0] - 2021-07-17
9+
## 1.1.0 - 2022-01-14
10+
### Changed
11+
- Drop Symfony 4.4 support
12+
- Add support for PHP 8.1, bump Symfony 5 support to 5.4
13+
14+
## 1.0.0 - 2021-07-17
1015
### Added
1116
- First public release

‎composer.json‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,23 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.4 || ^8.0",
20-
"pontedilana/php-weasyprint": "^0.9 || ^1.0",
21-
"symfony/framework-bundle": "^4.4 || ^5.3"
19+
"php": "7.4.* || 8.0.* || 8.1.*",
20+
"pontedilana/php-weasyprint": "^0.10 || ^1.0",
21+
"symfony/framework-bundle": "^5.4"
2222
},
2323
"require-dev": {
2424
"doctrine/annotations": "^1.11",
25-
"friendsofphp/php-cs-fixer": "^3.0",
26-
"phpstan/phpstan": "^0.12",
27-
"phpstan/phpstan-phpunit": "^0.12",
28-
"symfony/asset": "^4.4 || ^5.3",
29-
"symfony/finder": "^4.4 || ^5.3",
30-
"symfony/phpunit-bridge": "^4.4 || ^5.3",
31-
"symfony/security-csrf": "^4.4 || ^5.3",
32-
"symfony/templating": "^4.4 || ^5.3",
33-
"symfony/validator": "^4.4 || ^5.3",
34-
"symfony/yaml": "^4.4 || ^5.3"
25+
"friendsofphp/php-cs-fixer": "^3.4",
26+
"phpstan/phpstan": "^1.2",
27+
"phpstan/phpstan-phpunit": "^1.0",
28+
"phpstan/phpstan-symfony": "^1.0",
29+
"symfony/asset": "^5.4",
30+
"symfony/finder": "^5.4",
31+
"symfony/phpunit-bridge": "^5.4",
32+
"symfony/security-csrf": "^5.4",
33+
"symfony/templating": "^5.4",
34+
"symfony/validator": "^5.4",
35+
"symfony/yaml": "^5.4"
3536
},
3637
"autoload": {
3738
"psr-4": {

‎phpstan-baseline.neon‎

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

‎phpstan.neon‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
includes:
2-
- phpstan-baseline.neon
2+
- vendor/phpstan/phpstan-symfony/extension.neon
33
- vendor/phpstan/phpstan-phpunit/extension.neon
44

55
parameters:
6-
level: 8
6+
level: 9
77
paths:
88
- src/
99
- tests/
1010
inferPrivatePropertyTypeFromConstructor: true
11-
reportUnmatchedIgnoredErrors: false
12-
checkMissingIterableValueType: false
1311
bootstrapFiles:
1412
- vendor/bin/.phpunit/phpunit/vendor/autoload.php

0 commit comments

Comments
 (0)