Skip to content

Commit 33e397b

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents 8222962 + fad72c6 commit 33e397b

12 files changed

+329
-119
lines changed

.github/workflows/branch-validations.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v3
19-
- uses: symfonycorp/security-checker-action@v2
19+
- uses: symfonycorp/security-checker-action@v3
2020

2121
composer:
2222
runs-on: ubuntu-latest
@@ -27,16 +27,19 @@ jobs:
2727
with:
2828
php-version: '8.1'
2929
tools: composer:v2
30+
3031
- name: Composer cache
3132
uses: actions/cache@v2
3233
with:
3334
key: composer-${{ hashFiles('**/composer.lock') }}
3435
path: ${{ github.workspace }}/.cache
36+
3537
- name: Vendor cache
3638
uses: actions/cache@v2
3739
with:
3840
key: vendor-${{ hashFiles('**/composer.lock') }}
3941
path: ${{ github.workspace }}/vendor
42+
4043
- name: Tools cache
4144
uses: actions/cache@v2
4245
with:
@@ -68,16 +71,19 @@ jobs:
6871
with:
6972
php-version: '8.1'
7073
tools: composer:v2
74+
7175
- name: Composer cache
7276
uses: actions/cache@v2
7377
with:
7478
key: composer-${{ hashFiles('**/composer.lock') }}
7579
path: ${{ github.workspace }}/.cache
80+
7681
- name: Vendor cache
7782
uses: actions/cache@v2
7883
with:
7984
key: vendor-${{ hashFiles('**/composer.lock') }}
8085
path: ${{ github.workspace }}/vendor
86+
8187
- name: Tools cache
8288
uses: actions/cache@v2
8389
with:

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
],
1313
"require": {
1414
"php": "^8.0",
15-
"ext-mbstring": "*"
15+
"ext-mbstring": "^8.0",
16+
"psr/log": "^2.0 || ^3.0"
1617
},
1718
"require-dev": {
1819
"ergebnis/composer-normalize": "^2.15",

0 commit comments

Comments
 (0)