Skip to content

Commit 1c20279

Browse files
authored
Merge branch 'master' into chore(ci)/concurrency-rules
2 parents a79a5a5 + 8bf3264 commit 1c20279

File tree

28 files changed

+1739
-695
lines changed

28 files changed

+1739
-695
lines changed

.github/workflows/main.yml

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

@@ -70,7 +70,7 @@ jobs:
7070
fail-fast: false
7171
steps:
7272
- name: Checkout
73-
uses: actions/checkout@v4.1.0
73+
uses: actions/checkout@v4.1.1
7474
with:
7575
fetch-depth: '0'
7676

@@ -121,7 +121,7 @@ jobs:
121121
fail-fast: false
122122
steps:
123123
- name: Checkout
124-
uses: actions/checkout@v4.1.0
124+
uses: actions/checkout@v4.1.1
125125
with:
126126
fetch-depth: '0'
127127

@@ -210,7 +210,7 @@ jobs:
210210
fail-fast: false
211211
steps:
212212
- name: Checkout
213-
uses: actions/checkout@v4.1.0
213+
uses: actions/checkout@v4.1.1
214214
with:
215215
fetch-depth: '0'
216216

@@ -320,7 +320,7 @@ jobs:
320320

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

325325
- name: Lint `./README.md`
326326
uses: avto-dev/markdown-lint@v1
@@ -353,7 +353,7 @@ jobs:
353353
- test
354354

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

358358
- name: Set tag var
359359
id: vars

.github/workflows/scorecard.yml

Lines changed: 3 additions & 3 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.0
37+
uses: actions/checkout@v4.1.1
3838
with:
3939
persist-credentials: false
4040

4141
- name: "Run analysis"
42-
uses: ossf/scorecard-action@v2.3.0
42+
uses: ossf/scorecard-action@v2.3.1
4343
with:
4444
results_file: results.sarif
4545
results_format: sarif
@@ -69,6 +69,6 @@ jobs:
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.3
72+
uses: github/codeql-action/upload-sarif@v2.22.4
7373
with:
7474
sarif_file: results.sarif

.github/workflows/vulnerability-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

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

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

.idea/symfony-flex-backend.iml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ WORKDIR /app
4040

4141
COPY . /app
4242
COPY ./docker/php/php.ini /usr/local/etc/php/php.ini
43+
COPY ./docker/php/www.conf /usr/local/etc/php-fpm.d/www.conf
4344

4445
RUN chmod +x /app/bin/console
4546
RUN chmod +x /app/docker-entrypoint.sh

Dockerfile_dev

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,13 @@ COPY --from=composer:2.6.4 /usr/bin/composer /usr/bin/composer
7575
# Enable Composer autocompletion
7676
RUN composer completion bash > /etc/bash_completion.d/composer
7777

78-
# Copy development `php.ini` configuration to container
78+
# Copy development `php.ini` and PHP-FPM pool configuration to container
7979
#
80-
# Also note that this is mounted within `docker-compose.yml` file, so
80+
# Also note that these files mounted within `docker-compose.yml` file, so
8181
# you don't need to build containers again if you change something just
8282
# restart containers and you're good
8383
COPY ./docker/php/php-dev.ini /usr/local/etc/php/php.ini
84+
COPY ./docker/php/www-dev.conf /usr/local/etc/php-fpm.d/www.conf
8485

8586
# Define used work directory
8687
WORKDIR /app
@@ -95,9 +96,6 @@ RUN chmod +x /app/bin/console \
9596

9697
RUN chmod -R o+s+w /usr/local/etc/php
9798

98-
# Enable PHP-FPM status page
99-
RUN echo 'pm.status_path = /status' >> /usr/local/etc/php-fpm.d/www.conf
100-
10199
RUN curl -s https://api.github.com/repos/fabpot/local-php-security-checker/releases/latest | \
102100
grep -E "browser_download_url(.+)linux_amd64" | \
103101
cut -d : -f 2,3 | \

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@
4545
"symfony/dotenv": "6.3.0",
4646
"symfony/expression-language": "6.3.0",
4747
"symfony/flex": "2.3.3",
48-
"symfony/form": "6.3.5",
49-
"symfony/framework-bundle": "6.3.5",
48+
"symfony/form": "6.3.6",
49+
"symfony/framework-bundle": "6.3.6",
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.5",
57-
"symfony/serializer": "6.3.5",
56+
"symfony/security-bundle": "6.3.6",
57+
"symfony/serializer": "6.3.6",
5858
"symfony/string": "6.3.5",
59-
"symfony/translation": "6.3.3",
59+
"symfony/translation": "6.3.6",
6060
"symfony/twig-bundle": "6.3.0",
61-
"symfony/validator": "6.3.5",
61+
"symfony/validator": "6.3.6",
6262
"symfony/yaml": "6.3.3"
6363
},
6464
"conflict": {
@@ -75,8 +75,8 @@
7575
"symfony/maker-bundle": "1.51.1",
7676
"symfony/requirements-checker": "2.0.1",
7777
"symfony/stopwatch": "6.3.0",
78-
"symfony/var-dumper": "6.3.5",
79-
"symfony/web-profiler-bundle": "6.3.2"
78+
"symfony/var-dumper": "6.3.6",
79+
"symfony/web-profiler-bundle": "6.3.6"
8080
},
8181
"replace": {
8282
"symfony/polyfill-ctype": "*",

0 commit comments

Comments
 (0)