Skip to content

Commit 27b5f5f

Browse files
authored
Merge branch 'master' into sa/fix-some-issues
2 parents 027017d + 7275393 commit 27b5f5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2993
-3362
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: '0'
3131

3232
- name: Setup PHP, with composer and extensions
33-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
33+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
3434
with:
3535
php-version: '8.3'
3636
tools: composer:v2
@@ -75,7 +75,7 @@ jobs:
7575
fetch-depth: '0'
7676

7777
- name: Setup PHP, with composer and extensions
78-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
78+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
7979
with:
8080
php-version: '8.3'
8181
tools: composer:v2
@@ -126,7 +126,7 @@ jobs:
126126
fetch-depth: '0'
127127

128128
- name: Setup PHP, with composer and extensions
129-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
129+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
130130
with:
131131
php-version: '8.3'
132132
tools: composer:v2
@@ -214,7 +214,7 @@ jobs:
214214
fetch-depth: '0'
215215

216216
- name: Setup PHP, with composer and extensions
217-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
217+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
218218
with:
219219
php-version: '8.3'
220220
extensions: pdo_mysql, mysql

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.5
72+
uses: github/codeql-action/upload-sarif@v2.22.8
7373
with:
7474
sarif_file: results.sarif

.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.

composer.json

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
],
2121
"require": {
22-
"php": "^8.2.0",
22+
"php": "^8.3.0",
2323
"ext-apcu": "*",
2424
"ext-iconv": "*",
2525
"ext-json": "*",
@@ -28,37 +28,37 @@
2828
"ext-random": "*",
2929
"doctrine/doctrine-bundle": "2.11.1",
3030
"doctrine/doctrine-migrations-bundle": "3.3.0",
31-
"doctrine/orm": "2.17.1",
31+
"doctrine/orm": "2.17.2",
3232
"friendsofphp/proxy-manager-lts": "1.0.16",
33-
"gedmo/doctrine-extensions": "3.13.0",
34-
"lexik/jwt-authentication-bundle": "2.20.1",
33+
"gedmo/doctrine-extensions": "3.14.0",
34+
"lexik/jwt-authentication-bundle": "2.20.3",
3535
"mark-gerarts/automapper-plus-bundle": "1.4.1",
3636
"matomo/device-detector": "6.2.0",
3737
"matthiasnoback/symfony-console-form": "5.3.2",
38-
"nelmio/api-doc-bundle": "4.12.0",
38+
"nelmio/api-doc-bundle": "4.15.1",
3939
"nelmio/cors-bundle": "2.4.0",
4040
"phpdocumentor/reflection-docblock": "5.3.0",
4141
"ramsey/uuid-doctrine": "2.0.0",
4242
"symfony/asset": "6.4.0",
4343
"symfony/config": "6.4.0",
44-
"symfony/console": "6.4.1",
45-
"symfony/dotenv": "6.4.0",
46-
"symfony/expression-language": "6.4.0",
47-
"symfony/flex": "2.4.1",
44+
"symfony/console": "6.4.2",
45+
"symfony/dotenv": "6.4.2",
46+
"symfony/expression-language": "6.4.2",
47+
"symfony/flex": "2.4.2",
4848
"symfony/form": "6.4.1",
49-
"symfony/framework-bundle": "6.4.1",
49+
"symfony/framework-bundle": "6.4.2",
5050
"symfony/monolog-bundle": "3.10.0",
51-
"symfony/process": "6.4.0",
51+
"symfony/process": "6.4.2",
5252
"symfony/property-access": "6.4.0",
5353
"symfony/property-info": "6.4.0",
54-
"symfony/routing": "6.4.1",
54+
"symfony/routing": "6.4.2",
5555
"symfony/runtime": "6.4.0",
56-
"symfony/security-bundle": "6.4.0",
57-
"symfony/serializer": "6.4.1",
58-
"symfony/string": "6.4.0",
59-
"symfony/translation": "6.4.0",
56+
"symfony/security-bundle": "6.4.2",
57+
"symfony/serializer": "6.4.2",
58+
"symfony/string": "6.4.2",
59+
"symfony/translation": "6.4.2",
6060
"symfony/twig-bundle": "6.4.0",
61-
"symfony/validator": "6.4.0",
61+
"symfony/validator": "6.4.2",
6262
"symfony/yaml": "6.4.0"
6363
},
6464
"conflict": {
@@ -75,8 +75,8 @@
7575
"symfony/maker-bundle": "1.52.0",
7676
"symfony/requirements-checker": "2.0.1",
7777
"symfony/stopwatch": "6.4.0",
78-
"symfony/var-dumper": "6.4.0",
79-
"symfony/web-profiler-bundle": "6.4.0"
78+
"symfony/var-dumper": "6.4.2",
79+
"symfony/web-profiler-bundle": "6.4.2"
8080
},
8181
"replace": {
8282
"symfony/polyfill-ctype": "*",
@@ -88,7 +88,7 @@
8888
"config": {
8989
"allow-plugins": true,
9090
"platform": {
91-
"php": "8.2.0"
91+
"php": "8.3.0"
9292
},
9393
"sort-packages": true
9494
},
@@ -101,7 +101,8 @@
101101
},
102102
"projectTitle": "Symfony Flex Backend",
103103
"symfony": {
104-
"allow-contrib": true
104+
"allow-contrib": true,
105+
"require": "6.4.*"
105106
}
106107
},
107108
"autoload": {

0 commit comments

Comments
 (0)