Skip to content

Commit b0bf7a6

Browse files
tarlepptarlepp
authored
Merge branch 'master' into chore(ci)/github-actions-update
2 parents 4ce2dc3 + 1d7572d commit b0bf7a6

Some content is hidden

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

47 files changed

+2811
-2346
lines changed

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Setup PHP, with composer and extensions
3333
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
3434
with:
35-
php-version: '8.2'
35+
php-version: '8.3'
3636
tools: composer:v2
3737

3838
- name: Get composer cache directory
@@ -77,7 +77,7 @@ jobs:
7777
- name: Setup PHP, with composer and extensions
7878
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
7979
with:
80-
php-version: '8.2'
80+
php-version: '8.3'
8181
tools: composer:v2
8282

8383
- name: Get composer cache directory
@@ -128,7 +128,7 @@ jobs:
128128
- name: Setup PHP, with composer and extensions
129129
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
130130
with:
131-
php-version: '8.2'
131+
php-version: '8.3'
132132
tools: composer:v2
133133

134134
- name: Get composer cache directory
@@ -171,9 +171,8 @@ jobs:
171171
- name: Run PHPStan static analysis tool
172172
run: make phpstan-github
173173

174-
# Disabled this because of - https://github.com/nunomaduro/phpinsights/issues/622
175-
#- name: Run `phploc` to collect LOC stats
176-
# run: make phploc
174+
- name: Run `phploc` to collect LOC stats
175+
run: make phploc
177176

178177
- name: Run `PHP Insights` static analysis tool
179178
run: make phpinsights
@@ -217,7 +216,7 @@ jobs:
217216
- name: Setup PHP, with composer and extensions
218217
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
219218
with:
220-
php-version: '8.2'
219+
php-version: '8.3'
221220
extensions: pdo_mysql, mysql
222221
coverage: xdebug
223222
tools: composer:v2

‎.idea/php.xml‎

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

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2.12-fpm
1+
FROM php:8.3.0-fpm
22

33
ENV APP_ENV prod
44
ENV APP_DEBUG 0
@@ -18,7 +18,7 @@ RUN apt-get update \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
21-
COPY --from=mlocati/php-extension-installer:2.1.61 /usr/bin/install-php-extensions /usr/local/bin/
21+
COPY --from=mlocati/php-extension-installer:2.1.68 /usr/bin/install-php-extensions /usr/local/bin/
2222

2323
# Install and enable all necessary PHP extensions
2424
RUN install-php-extensions \

‎Dockerfile_dev‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2.12-fpm
1+
FROM php:8.3.0-fpm
22

33
# Let's use bash as a default shell with login each time
44
SHELL ["/bin/bash", "--login", "-c"]
@@ -10,7 +10,7 @@ ARG HOST_GID
1010
# Declare constants
1111
ENV PATH "$PATH:/home/dev/.composer/vendor/bin:/app/vendor/bin"
1212
ENV NVM_VERSION v0.39.5
13-
ENV NODE_VERSION 21.1.0
13+
ENV NODE_VERSION 21.3.0
1414

1515
# Update package list and install necessary libraries
1616
RUN apt-get update \
@@ -56,7 +56,7 @@ ENV LANGUAGE en_US:en
5656
ENV LC_ALL en_US.UTF-8
5757

5858
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
59-
COPY --from=mlocati/php-extension-installer:2.1.61 /usr/bin/install-php-extensions /usr/local/bin/
59+
COPY --from=mlocati/php-extension-installer:2.1.68 /usr/bin/install-php-extensions /usr/local/bin/
6060

6161
# Enable all necessary PHP packages
6262
RUN install-php-extensions \

‎composer.json‎

Lines changed: 31 additions & 31 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": "*",
@@ -30,36 +30,36 @@
3030
"doctrine/doctrine-migrations-bundle": "3.3.0",
3131
"doctrine/orm": "2.17.1",
3232
"friendsofphp/proxy-manager-lts": "1.0.16",
33-
"gedmo/doctrine-extensions": "3.13.0",
34-
"lexik/jwt-authentication-bundle": "2.19.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",
3838
"nelmio/api-doc-bundle": "4.12.0",
39-
"nelmio/cors-bundle": "2.3.1",
39+
"nelmio/cors-bundle": "2.4.0",
4040
"phpdocumentor/reflection-docblock": "5.3.0",
4141
"ramsey/uuid-doctrine": "2.0.0",
42-
"symfony/asset": "6.3.8",
43-
"symfony/config": "6.3.8",
44-
"symfony/console": "6.3.8",
45-
"symfony/dotenv": "6.3.7",
46-
"symfony/expression-language": "6.3.0",
47-
"symfony/flex": "2.4.1",
48-
"symfony/form": "6.3.8",
49-
"symfony/framework-bundle": "6.3.8",
42+
"symfony/asset": "6.4.0",
43+
"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.2",
48+
"symfony/form": "6.4.1",
49+
"symfony/framework-bundle": "6.4.1",
5050
"symfony/monolog-bundle": "3.10.0",
51-
"symfony/process": "6.3.4",
52-
"symfony/property-access": "6.3.2",
53-
"symfony/property-info": "6.3.0",
54-
"symfony/routing": "6.3.5",
55-
"symfony/runtime": "6.3.2",
56-
"symfony/security-bundle": "6.3.8",
57-
"symfony/serializer": "6.3.8",
58-
"symfony/string": "6.3.8",
59-
"symfony/translation": "6.3.7",
60-
"symfony/twig-bundle": "6.3.8",
61-
"symfony/validator": "6.3.8",
62-
"symfony/yaml": "6.3.8"
51+
"symfony/process": "6.4.0",
52+
"symfony/property-access": "6.4.0",
53+
"symfony/property-info": "6.4.0",
54+
"symfony/routing": "6.4.1",
55+
"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",
60+
"symfony/twig-bundle": "6.4.0",
61+
"symfony/validator": "6.4.0",
62+
"symfony/yaml": "6.4.0"
6363
},
6464
"conflict": {
6565
"symfony/debug": "<3.3",
@@ -70,13 +70,13 @@
7070
"bamarni/composer-bin-plugin": "1.8.2",
7171
"doctrine/doctrine-fixtures-bundle": "3.5.1",
7272
"roave/security-advisories": "dev-latest",
73-
"symfony/browser-kit": "6.3.8",
74-
"symfony/debug-bundle": "6.3.2",
75-
"symfony/maker-bundle": "1.51.1",
73+
"symfony/browser-kit": "6.4.0",
74+
"symfony/debug-bundle": "6.4.0",
75+
"symfony/maker-bundle": "1.52.0",
7676
"symfony/requirements-checker": "2.0.1",
77-
"symfony/stopwatch": "6.3.0",
78-
"symfony/var-dumper": "6.3.8",
79-
"symfony/web-profiler-bundle": "6.3.8"
77+
"symfony/stopwatch": "6.4.0",
78+
"symfony/var-dumper": "6.4.0",
79+
"symfony/web-profiler-bundle": "6.4.0"
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
},

0 commit comments

Comments
 (0)