Skip to content

Commit b0a2d39

Browse files
authored
Start with version 6 #291
Start with version 6
2 parents c568af5 + 5120124 commit b0a2d39

File tree

410 files changed

+25296
-20235
lines changed

Some content is hidden

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

410 files changed

+25296
-20235
lines changed

.github/workflows/test.yaml

+22-11
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: ["**"]
66
pull_request:
7-
branches: [master, release-*]
7+
types: [opened, synchronize, reopened, closed]
88

99
jobs:
1010
basic-tests:
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-versions: ["8.1", "8.2"]
16+
php-versions: ["8.2", "8.3"]
1717

1818
steps:
1919
- name: Setup PHP, with composer and extensions
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/cache@v4
4646
with:
4747
path: $COMPOSER_CACHE
48-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
48+
key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}"
4949
restore-keys: ${{ runner.os }}-composer-
5050

5151
- name: Validate composer.json and composer.lock
@@ -55,7 +55,7 @@ jobs:
5555
run: composer install --no-progress --prefer-dist --optimize-autoloader
5656

5757
- name: Decide whether to run code coverage or not
58-
if: ${{ matrix.php-versions != '8.1' }}
58+
if: ${{ matrix.php-versions != '8.2' }}
5959
run: |
6060
echo "NO_COVERAGE=--no-coverage" >> $GITHUB_ENV
6161
@@ -64,8 +64,19 @@ jobs:
6464
echo $NO_COVERAGE
6565
./vendor/bin/phpunit $NO_COVERAGE
6666
67+
- name: Run integration tests
68+
run: |
69+
echo $NO_COVERAGE
70+
./vendor/bin/phpunit $NO_COVERAGE --no-configuration -c phpunit.integration.xml
71+
72+
- name: Merge coverage data
73+
if: ${{ matrix.php-versions == '8.2' }}
74+
run: |
75+
./vendor/bin/phpunit-merger log build/logs/partial_junit/ build/logs/junit.xml
76+
./vendor/bin/phpunit-merger coverage build/logs/partial_clover/ build/logs/clover.xml
77+
6778
- name: Save coverage data
68-
if: ${{ matrix.php-versions == '8.1' }}
79+
if: ${{ matrix.php-versions == '8.2' }}
6980
uses: actions/upload-artifact@v4
7081
with:
7182
name: build-data
@@ -78,7 +89,7 @@ jobs:
7889
- name: Setup PHP, with composer and extensions
7990
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
8091
with:
81-
php-version: "8.1"
92+
php-version: "8.2"
8293
extensions: mbstring, xml
8394
tools: composer:v2
8495
coverage: none
@@ -96,7 +107,7 @@ jobs:
96107
uses: actions/cache@v4
97108
with:
98109
path: $COMPOSER_CACHE
99-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
110+
key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}"
100111
restore-keys: ${{ runner.os }}-composer-
101112

102113
- name: Install Composer dependencies
@@ -119,7 +130,7 @@ jobs:
119130
- name: Setup PHP, with composer and extensions
120131
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
121132
with:
122-
php-version: "8.1"
133+
php-version: "8.2"
123134
extensions: mbstring, xml
124135
tools: composer:v2
125136
coverage: none
@@ -137,7 +148,7 @@ jobs:
137148
uses: actions/cache@v4
138149
with:
139150
path: $COMPOSER_CACHE
140-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
151+
key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}"
141152
restore-keys: ${{ runner.os }}-composer-
142153

143154
- name: Install Composer dependencies
@@ -152,7 +163,7 @@ jobs:
152163
- name: Setup PHP, with composer and extensions
153164
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
154165
with:
155-
php-version: "8.1"
166+
php-version: "8.2"
156167
tools: composer:v2
157168
extensions: mbstring, xml
158169

@@ -169,7 +180,7 @@ jobs:
169180
uses: actions/cache@v4
170181
with:
171182
path: $COMPOSER_CACHE
172-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
183+
key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}"
173184
restore-keys: ${{ runner.os }}-composer-
174185

175186
- name: Install Composer dependencies

0 commit comments

Comments
 (0)