Skip to content

Commit d454959

Browse files
ACQE-7352: Fix spomky-labs/otphp deprecation messages
Conflict fixed in file .github/workflows/main.yml
2 parents 82767d2 + 42dd3fc commit d454959

File tree

2 files changed

+336
-220
lines changed

2 files changed

+336
-220
lines changed

.github/workflows/main.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ jobs:
2323
extensions: curl, dom, intl, json, openssl
2424
coverage: xdebug
2525

26+
- name: Cache Composer packages
27+
id: composer-cache
28+
uses: actions/cache@v4
29+
with:
30+
path: vendor
31+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
32+
restore-keys: |
33+
${{ runner.os }}-php-
34+
2635
- name: Install dependencies
2736
if: steps.composer-cache.outputs.cache-hit != 'true'
2837
run: composer install --prefer-dist --no-progress --no-suggest
@@ -55,6 +64,15 @@ jobs:
5564
php-version: ${{ matrix.php-versions }}
5665
extensions: curl, dom, intl, json, openssl
5766

67+
- name: Cache Composer packages
68+
id: composer-cache
69+
uses: actions/cache@v4
70+
with:
71+
path: vendor
72+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
73+
restore-keys: |
74+
${{ runner.os }}-php-
75+
5876
- name: Install dependencies
5977
if: steps.composer-cache.outputs.cache-hit != 'true'
6078
run: composer install --prefer-dist --no-progress --no-suggest
@@ -78,6 +96,15 @@ jobs:
7896
php-version: ${{ matrix.php-versions }}
7997
extensions: curl, dom, intl, json, openssl
8098

99+
- name: Cache Composer packages
100+
id: composer-cache
101+
uses: actions/cache@v4
102+
with:
103+
path: vendor
104+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
105+
restore-keys: |
106+
${{ runner.os }}-php-
107+
81108
- name: Install dependencies
82109
if: steps.composer-cache.outputs.cache-hit != 'true'
83110
run: composer install --prefer-dist --no-progress --no-suggest
@@ -107,6 +134,15 @@ jobs:
107134
php-version: ${{ matrix.php-versions }}
108135
extensions: curl, dom, intl, json, openssl
109136

137+
- name: Cache Composer packages
138+
id: composer-cache
139+
uses: actions/cache@v4
140+
with:
141+
path: vendor
142+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
143+
restore-keys: |
144+
${{ runner.os }}-php-
145+
110146
- name: Install dependencies
111147
if: steps.composer-cache.outputs.cache-hit != 'true'
112148
run: composer install --prefer-dist --no-progress --no-suggest

0 commit comments

Comments
 (0)