Skip to content

Commit 14d5e9a

Browse files
gechetsprgechetspr
authored
Merge pull request #100 from spryker/feature/frw-11483/master-update-phpunit-12
FRW-11483: Update phpunit
2 parents dcfa538 + cac9044 commit 14d5e9a

File tree

2 files changed

+118
-121
lines changed

2 files changed

+118
-121
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 117 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
APPLICATION_ENV: 'development'
55
APPLICATION_STORE: 'DE'
66
PROJECT: 'EventBehavior '
7-
DATABASE_VERSION: 10.2
7+
DATABASE_VERSION: mariadb-10.11
88
DATABASE_HOST: 127.0.0.1
99
DATABASE_PORT: 3306
1010
DATABASE_NAME: eu-docker
@@ -16,124 +16,121 @@ env:
1616
DATABASE_COLLATE: utf8_general_ci
1717

1818
on:
19-
pull_request:
20-
push:
21-
branches:
22-
- master
23-
workflow_dispatch:
19+
pull_request:
20+
push:
21+
branches:
22+
- master
23+
workflow_dispatch:
2424

2525
jobs:
26-
validation:
27-
runs-on: ubuntu-latest
28-
strategy:
29-
fail-fast: false
30-
matrix:
31-
php-version: [
32-
'8.3',
33-
'8.4'
34-
]
35-
36-
steps:
37-
- uses: actions/checkout@v2
38-
39-
- uses: getong/mariadb-action@v1.1
40-
with:
41-
host port: ${{ env.DATABASE_PORT }}
42-
container port: ${{ env.DATABASE_PORT }}
43-
character set server: ${{ env.DATABASE_CHARACTER_SET }}
44-
collation server: ${{ env.DATABASE_COLLATE }}
45-
mariadb version: ${{ env.DATABASE_VERSION }}
46-
mysql database: ${{ env.DATABASE_NAME }}
47-
mysql root password: ${{ env.DATABASE_ROOT_PASSWORD }}
48-
mysql user: ${{ env.DATABASE_USERNAME }}
49-
mysql password: ${{ env.DATABASE_PASSWORD }}
50-
51-
- name: Setup PHP
52-
uses: shivammathur/setup-php@v2
53-
with:
54-
php-version: ${{ matrix.php-version }}
55-
extensions: mbstring, intl, pdo_mysql
56-
57-
- name: Validate composer.json and composer.lock
58-
run: composer validate
59-
60-
- name: Get Composer Cache Directory
61-
id: composer-cache
62-
run: |
63-
echo "::set-output name=dir::$(composer config cache-files-dir)"
64-
65-
- uses: actions/cache@v3
66-
with:
67-
path: ${{ steps.composer-cache.outputs.dir }}
68-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
69-
restore-keys: |
70-
${{ runner.os }}-composer-
71-
72-
- name: Composer install
73-
run: |
74-
composer --version
75-
composer install --optimize-autoloader
76-
77-
- name: Run tests (failing right now)
78-
run: composer test || true
79-
80-
- name: PHPStan checks
81-
run: |
82-
composer stan-setup
83-
composer stan
84-
85-
- name: CodeStyle checks
86-
run: composer cs-check
87-
88-
prefer-lowest:
89-
runs-on: ubuntu-latest
90-
strategy:
91-
fail-fast: false
92-
matrix:
93-
php-version: [
94-
'8.3'
95-
]
96-
97-
steps:
98-
- uses: actions/checkout@v2
99-
100-
- uses: getong/mariadb-action@v1.1
101-
with:
102-
host port: ${{ env.DATABASE_PORT }}
103-
container port: ${{ env.DATABASE_PORT }}
104-
character set server: ${{ env.DATABASE_CHARACTER_SET }}
105-
collation server: ${{ env.DATABASE_COLLATE }}
106-
mariadb version: ${{ env.DATABASE_VERSION }}
107-
mysql database: ${{ env.DATABASE_NAME }}
108-
mysql root password: ${{ env.DATABASE_ROOT_PASSWORD }}
109-
mysql user: ${{ env.DATABASE_USERNAME }}
110-
mysql password: ${{ env.DATABASE_PASSWORD }}
111-
112-
- name: Setup PHP
113-
uses: shivammathur/setup-php@v2
114-
with:
115-
php-version: ${{ matrix.php-version }}
116-
extensions: mbstring, intl, pdo_mysql
117-
118-
- name: Get Composer Cache Directory
119-
id: composer-cache
120-
run: |
121-
echo "::set-output name=dir::$(composer config cache-files-dir)"
122-
123-
- uses: actions/cache@v3
124-
with:
125-
path: ${{ steps.composer-cache.outputs.dir }}
126-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
127-
restore-keys: |
128-
${{ runner.os }}-composer-
129-
130-
- name: Composer prefer-lowest
131-
run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o
132-
133-
- name: Run tests (failing right now)
134-
run: composer test || true
135-
136-
- name: PHPStan checks (failing right now due to failing tests)
137-
run: |
138-
composer stan-setup
139-
composer stan || true
26+
validation:
27+
runs-on: ubuntu-latest
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
php-version: [
32+
'8.3',
33+
'8.4'
34+
]
35+
36+
steps:
37+
- uses: actions/checkout@v4
38+
39+
- uses: shogo82148/actions-setup-mysql@v1
40+
with:
41+
mysql-version: ${{ env.DATABASE_VERSION }}
42+
root-password: ${{ env.DATABASE_ROOT_PASSWORD }}
43+
user: ${{ env.DATABASE_USERNAME }}
44+
password: ${{ env.DATABASE_PASSWORD }}
45+
46+
- name: Create database
47+
run: mysql -h ${{ env.DATABASE_HOST }} -u root -p${{ env.DATABASE_ROOT_PASSWORD }} -e 'CREATE DATABASE IF NOT EXISTS `${{ env.DATABASE_NAME }}` CHARACTER SET ${{ env.DATABASE_CHARACTER_SET }} COLLATE ${{ env.DATABASE_COLLATE }};'
48+
49+
- name: Setup PHP
50+
uses: shivammathur/setup-php@v2
51+
with:
52+
php-version: ${{ matrix.php-version }}
53+
extensions: mbstring, intl, pdo_mysql
54+
55+
- name: Validate composer.json and composer.lock
56+
run: composer validate
57+
58+
- name: Get Composer Cache Directory
59+
id: composer-cache
60+
run: |
61+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
62+
63+
- uses: actions/cache@v3
64+
with:
65+
path: ${{ steps.composer-cache.outputs.dir }}
66+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
67+
restore-keys: |
68+
${{ runner.os }}-composer-
69+
70+
- name: Composer install
71+
run: |
72+
composer --version
73+
composer install --optimize-autoloader
74+
75+
- name: Run tests (failing right now)
76+
run: composer test || true
77+
78+
- name: PHPStan checks
79+
run: |
80+
composer stan-setup
81+
composer stan
82+
83+
- name: CodeStyle checks
84+
run: composer cs-check
85+
86+
prefer-lowest:
87+
runs-on: ubuntu-latest
88+
strategy:
89+
fail-fast: false
90+
matrix:
91+
php-version: [
92+
'8.3'
93+
]
94+
95+
steps:
96+
- uses: actions/checkout@v4
97+
98+
- uses: shogo82148/actions-setup-mysql@v1
99+
with:
100+
mysql-version: ${{ env.DATABASE_VERSION }}
101+
root-password: ${{ env.DATABASE_ROOT_PASSWORD }}
102+
user: ${{ env.DATABASE_USERNAME }}
103+
password: ${{ env.DATABASE_PASSWORD }}
104+
105+
- name: Create database
106+
run: mysql -h ${{ env.DATABASE_HOST }} -u root -p${{ env.DATABASE_ROOT_PASSWORD }} -e 'CREATE DATABASE IF NOT EXISTS `${{ env.DATABASE_NAME }}` CHARACTER SET ${{ env.DATABASE_CHARACTER_SET }} COLLATE ${{ env.DATABASE_COLLATE }};'
107+
108+
109+
- name: Setup PHP
110+
uses: shivammathur/setup-php@v2
111+
with:
112+
php-version: ${{ matrix.php-version }}
113+
extensions: mbstring, intl, pdo_mysql
114+
115+
- name: Get Composer Cache Directory
116+
id: composer-cache
117+
run: |
118+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
119+
120+
- uses: actions/cache@v3
121+
with:
122+
path: ${{ steps.composer-cache.outputs.dir }}
123+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
124+
restore-keys: |
125+
${{ runner.os }}-composer-
126+
127+
- name: Composer prefer-lowest
128+
run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o
129+
130+
- name: Run tests (failing right now)
131+
run: composer test || true
132+
133+
- name: PHPStan checks (failing right now due to failing tests)
134+
run: |
135+
composer stan-setup
136+
composer stan || true

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"require-dev": {
1919
"codeception/module-asserts": "^3.0.0",
20-
"phpunit/phpunit": "^9.0.0",
20+
"phpunit/phpunit": "^12.1.0",
2121
"spryker/application": "*",
2222
"spryker/code-sniffer": "^0.17.1",
2323
"spryker/config": "^3.5.0",

0 commit comments

Comments
 (0)