Skip to content

Commit d74706b

Browse files
tarlepptarlepp
authored
Merge branch 'master' into chore(env)/php-update
2 parents 467ffb0 + 52e1795 commit d74706b

File tree

20 files changed

+452
-418
lines changed

20 files changed

+452
-418
lines changed

‎.github/workflows/main.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
fail-fast: false
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v4.1.1
28+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2929
with:
3030
fetch-depth: '0'
3131

3232
- name: Setup PHP, with composer and extensions
33-
uses: shivammathur/setup-php@v2 # https://github.com/shivammathur/setup-php
33+
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
3434
with:
3535
php-version: '8.2'
3636
tools: composer:v2
@@ -40,7 +40,7 @@ jobs:
4040
run: echo "CACHE_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
4141

4242
- name: Cache composer dependencies
43-
uses: actions/cache@v3
43+
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
4444
with:
4545
path: ${{ steps.composer-cache.outputs.CACHE_DIR }}
4646
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -58,7 +58,7 @@ jobs:
5858
composer --version
5959
6060
- name: PHP Security Checker
61-
uses: symfonycorp/security-checker-action@v5
61+
uses: symfonycorp/security-checker-action@258311ef7ac571f1310780ef3d79fc5abef642b5 # v5
6262

6363
- name: Check that application doesn't have installed dependencies with known security vulnerabilities
6464
run: make check-security
@@ -70,12 +70,12 @@ jobs:
7070
fail-fast: false
7171
steps:
7272
- name: Checkout
73-
uses: actions/checkout@v4.1.1
73+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
7474
with:
7575
fetch-depth: '0'
7676

7777
- name: Setup PHP, with composer and extensions
78-
uses: shivammathur/setup-php@v2 # https://github.com/shivammathur/setup-php
78+
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
7979
with:
8080
php-version: '8.2'
8181
tools: composer:v2
@@ -85,7 +85,7 @@ jobs:
8585
run: echo "CACHE_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
8686

8787
- name: Cache composer dependencies
88-
uses: actions/cache@v3
88+
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
8989
with:
9090
path: ${{ steps.composer-cache.outputs.CACHE_DIR }}
9191
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -121,12 +121,12 @@ jobs:
121121
fail-fast: false
122122
steps:
123123
- name: Checkout
124-
uses: actions/checkout@v4.1.1
124+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
125125
with:
126126
fetch-depth: '0'
127127

128128
- name: Setup PHP, with composer and extensions
129-
uses: shivammathur/setup-php@v2 # https://github.com/shivammathur/setup-php
129+
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
130130
with:
131131
php-version: '8.2'
132132
tools: composer:v2
@@ -136,7 +136,7 @@ jobs:
136136
run: echo "CACHE_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
137137

138138
- name: Cache composer dependencies
139-
uses: actions/cache@v3
139+
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
140140
with:
141141
path: ${{ steps.composer-cache.outputs.CACHE_DIR }}
142142
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -179,13 +179,13 @@ jobs:
179179
run: make phpinsights
180180

181181
- name: Archive Psalm results (psalm.json)
182-
uses: actions/upload-artifact@v3
182+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
183183
with:
184184
name: psalm.json
185185
path: ./build/psalm.json
186186

187187
- name: Archive `phploc` results (phploc.json)
188-
uses: actions/upload-artifact@v3
188+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
189189
with:
190190
name: phploc.json
191191
path: ./build/phploc.json
@@ -210,12 +210,12 @@ jobs:
210210
fail-fast: false
211211
steps:
212212
- name: Checkout
213-
uses: actions/checkout@v4.1.1
213+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
214214
with:
215215
fetch-depth: '0'
216216

217217
- name: Setup PHP, with composer and extensions
218-
uses: shivammathur/setup-php@v2 # https://github.com/shivammathur/setup-php
218+
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
219219
with:
220220
php-version: '8.2'
221221
extensions: pdo_mysql, mysql
@@ -227,7 +227,7 @@ jobs:
227227
run: echo "CACHE_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
228228

229229
- name: Cache composer dependencies
230-
uses: actions/cache@v3
230+
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
231231
with:
232232
path: ${{ steps.composer-cache.outputs.CACHE_DIR }}
233233
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -291,25 +291,25 @@ jobs:
291291
run: make phpmetrics
292292

293293
- name: Archive code coverage results (clover.xml)
294-
uses: actions/upload-artifact@v3
294+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
295295
with:
296296
name: clover.xml
297297
path: ./build/logs/clover.xml
298298

299299
- name: Archive code coverage results (junit.xml)
300-
uses: actions/upload-artifact@v3
300+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
301301
with:
302302
name: junit.xml
303303
path: ./build/logs/junit.xml
304304

305305
- name: Archive Code Coverage
306-
uses: actions/upload-artifact@v3
306+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
307307
with:
308308
name: PhpMetrics
309309
path: ./build/report
310310

311311
- name: Archive PhpMetrics results
312-
uses: actions/upload-artifact@v3
312+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
313313
with:
314314
name: PhpMetrics
315315
path: ./build/phpmetrics
@@ -320,28 +320,28 @@ jobs:
320320

321321
steps:
322322
- name: Make checkout
323-
uses: actions/checkout@v4.1.1
323+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
324324

325325
- name: Lint `./README.md`
326-
uses: avto-dev/markdown-lint@v1
326+
uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0
327327
with:
328328
config: './markdown-lint.yml'
329329
args: './README.md'
330330

331331
- name: Lint all the resource docs under `./doc/` directory
332-
uses: avto-dev/markdown-lint@v1
332+
uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0
333333
with:
334334
config: './markdown-lint.yml'
335335
args: './doc/*.md'
336336

337337
- name: Lint all the docs under `./docker/` directory
338-
uses: avto-dev/markdown-lint@v1
338+
uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0
339339
with:
340340
config: './markdown-lint.yml'
341341
args: './docker/*.md'
342342

343343
- name: Lint all the docs under `./secrets/` directory
344-
uses: avto-dev/markdown-lint@v1
344+
uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0
345345
with:
346346
config: './markdown-lint.yml'
347347
args: './secrets/*.md'
@@ -353,7 +353,7 @@ jobs:
353353
- test
354354

355355
steps:
356-
- uses: actions/checkout@v4.1.1
356+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
357357

358358
- name: Set tag var
359359
id: vars

‎.github/workflows/scorecard.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@v4.1.1
37+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3838
with:
3939
persist-credentials: false
4040

4141
- name: "Run analysis"
42-
uses: ossf/scorecard-action@v2.3.1
42+
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # vv2.3.1
4343
with:
4444
results_file: results.sarif
4545
results_format: sarif
@@ -61,14 +61,14 @@ jobs:
6161
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6262
# format to the repository Actions tab.
6363
- name: "Upload artifact"
64-
uses: actions/upload-artifact@v3.1.0
64+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
6565
with:
6666
name: SARIF file
6767
path: results.sarif
6868
retention-days: 5
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@v2.22.4
72+
uses: github/codeql-action/upload-sarif@v2.22.5
7373
with:
7474
sarif_file: results.sarif

‎.github/workflows/vulnerability-scan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4.1.1
17+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
1818

1919
- name: Build the Docker image
2020
run: docker build . --file Dockerfile --tag symfony-flex-backend:master
2121

2222
- name: Scan image with trivy
23-
uses: lazy-actions/gitrivy@v3
23+
uses: lazy-actions/gitrivy@sha356:6edf95fdc8b1fb841a974536316b209cd16f9000 # v3
2424
with:
2525
image-ref: symfony-flex-backend:master
2626
format: 'table'

‎composer.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@
4242
"symfony/asset": "6.3.0",
4343
"symfony/config": "6.3.2",
4444
"symfony/console": "6.3.4",
45-
"symfony/dotenv": "6.3.0",
45+
"symfony/dotenv": "6.3.7",
4646
"symfony/expression-language": "6.3.0",
47-
"symfony/flex": "2.4.0",
48-
"symfony/form": "6.3.6",
49-
"symfony/framework-bundle": "6.3.6",
47+
"symfony/flex": "2.4.1",
48+
"symfony/form": "6.3.7",
49+
"symfony/framework-bundle": "6.3.7",
5050
"symfony/monolog-bundle": "3.8.0",
5151
"symfony/process": "6.3.4",
5252
"symfony/property-access": "6.3.2",
5353
"symfony/property-info": "6.3.0",
5454
"symfony/routing": "6.3.5",
5555
"symfony/runtime": "6.3.2",
56-
"symfony/security-bundle": "6.3.6",
57-
"symfony/serializer": "6.3.6",
56+
"symfony/security-bundle": "6.3.7",
57+
"symfony/serializer": "6.3.7",
5858
"symfony/string": "6.3.5",
59-
"symfony/translation": "6.3.6",
59+
"symfony/translation": "6.3.7",
6060
"symfony/twig-bundle": "6.3.0",
61-
"symfony/validator": "6.3.6",
62-
"symfony/yaml": "6.3.3"
61+
"symfony/validator": "6.3.7",
62+
"symfony/yaml": "6.3.7"
6363
},
6464
"conflict": {
6565
"symfony/debug": "<3.3",

0 commit comments

Comments
 (0)