Skip to content

Commit 85ae2c1

Browse files
committedDec 8, 2021
Merge branch 'release/1.3.0'
2 parents 36d41df + 9398c3d commit 85ae2c1

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

+1481
-464
lines changed
 

‎.gitattributes

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
.gitattributes export-ignore
22
.github export-ignore
33
.gitignore export-ignore
4-
.php_cs export-ignore
4+
.php-cs-fixer.php export-ignore
55
.scrutinizer.yml export-ignore
66
.travis.yml export-ignore
77
logo.svg export-ignore
88
phpunit.xml.dist export-ignore
9-
examples export-ignore
109
tests export-ignore

‎.github/workflows/build.yml

+29-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
44

55
jobs:
66
tests:
7-
name: PHP ${{ matrix.php }} Test on ${{ matrix.os }}
7+
name: PHP ${{ matrix.php }} / Symfony ${{ matrix.symfony_version }} / ${{ matrix.os }}
88

99
env:
1010
extensions: mbstring
@@ -15,10 +15,23 @@ jobs:
1515
strategy:
1616
matrix:
1717
os:
18-
- ubuntu-latest
18+
- 'ubuntu-latest'
1919
php:
2020
- '7.4'
2121
- '8.0'
22+
- '8.1'
23+
symfony_version:
24+
- '5.1.*'
25+
- '5.2.*'
26+
- '5.3.*'
27+
- '5.4.*'
28+
exclude:
29+
- os: 'ubuntu-latest'
30+
symfony_version: '5.1.*'
31+
php: '8.1'
32+
- os: 'ubuntu-latest'
33+
symfony_version: '5.2.*'
34+
php: '8.1'
2235

2336
runs-on: ${{ matrix.os }}
2437

@@ -28,31 +41,31 @@ jobs:
2841
uses: actions/checkout@v2
2942

3043
-
31-
name: Install PHP with extensions
44+
name: Setup PHP
3245
uses: shivammathur/setup-php@v2
3346
with:
3447
php-version: ${{ matrix.php }}
3548
extensions: ${{ env.extensions }}
3649
coverage: pcov
3750
ini-values: ${{ env.PHP_INI }}
38-
tools: composer:v2
51+
tools: composer:v2, flex
3952

40-
-
41-
name: Determine composer cache directory
42-
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
53+
# -
54+
# name: Determine composer cache directory
55+
# run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
4356

4457
-
4558
name: Set coverage args
4659
if: matrix.php == '7.4'
4760
run: echo "PHPUNIT_COVERAGE=1" >> $GITHUB_ENV
4861

49-
-
50-
name: Cache composer dependencies
51-
uses: actions/cache@v2
52-
with:
53-
path: ${{ env.COMPOSER_CACHE_DIR }}
54-
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
55-
restore-keys: php${{ matrix.php }}-composer-
62+
# -
63+
# name: Cache composer dependencies
64+
# uses: actions/cache@v2
65+
# with:
66+
# path: ${{ env.COMPOSER_CACHE_DIR }}
67+
# key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
68+
# restore-keys: php${{ matrix.php }}-composer-
5669

5770
-
5871
name: Check PHP Version
@@ -72,6 +85,8 @@ jobs:
7285

7386
-
7487
name: Install dependencies with composer
88+
env:
89+
SYMFONY_REQUIRE: ${{ matrix.symfony_version }}
7590
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
7691

7792
-

0 commit comments

Comments
 (0)
Please sign in to comment.