Skip to content

Commit 21f88d1

Browse files
authored
Merge pull request ppy#12058 from nanaya/php84
Update to php 8.4
2 parents 2a3e180 + d8fdd33 commit 21f88d1

File tree

8 files changed

+49
-50
lines changed

8 files changed

+49
-50
lines changed

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: shivammathur/setup-php@v2
2828
with:
2929
tools: composer:v2, cs2pr
30-
php-version: '8.3'
30+
php-version: '8.4'
3131
coverage: none
3232

3333
- name: Get composer cache directory

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
tests:
9696
strategy:
9797
matrix:
98-
php: ['8.3']
98+
php: ['8.4']
9999
name: Tests
100100
runs-on: ubuntu-latest
101101
steps:

Dockerfile.deployment

+28-28
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
1414
build-essential \
1515
git \
1616
nodejs \
17-
php8.3 \
18-
php8.3-common \
19-
php8.3-curl \
20-
php8.3-ds \
21-
php8.3-gd \
22-
php8.3-intl \
23-
php8.3-mbstring \
24-
php8.3-mysql \
25-
php8.3-redis \
26-
php8.3-sqlite3 \
27-
php8.3-swoole \
28-
php8.3-tokenizer \
29-
php8.3-xml \
30-
php8.3-zip \
17+
php8.4 \
18+
php8.4-common \
19+
php8.4-curl \
20+
php8.4-ds \
21+
php8.4-gd \
22+
php8.4-intl \
23+
php8.4-mbstring \
24+
php8.4-mysql \
25+
php8.4-redis \
26+
php8.4-sqlite3 \
27+
php8.4-swoole \
28+
php8.4-tokenizer \
29+
php8.4-xml \
30+
php8.4-zip \
3131
zip
3232

3333
RUN npm install -g yarn
@@ -55,20 +55,20 @@ RUN apt-get update
5555
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
5656
jhead \
5757
nginx \
58-
php8.3 \
59-
php8.3-common \
60-
php8.3-curl \
61-
php8.3-ds \
62-
php8.3-gd \
63-
php8.3-intl \
64-
php8.3-mbstring \
65-
php8.3-mysql \
66-
php8.3-redis \
67-
php8.3-sqlite3 \
68-
php8.3-swoole \
69-
php8.3-tokenizer \
70-
php8.3-xml \
71-
php8.3-zip
58+
php8.4 \
59+
php8.4-common \
60+
php8.4-curl \
61+
php8.4-ds \
62+
php8.4-gd \
63+
php8.4-intl \
64+
php8.4-mbstring \
65+
php8.4-mysql \
66+
php8.4-redis \
67+
php8.4-sqlite3 \
68+
php8.4-swoole \
69+
php8.4-tokenizer \
70+
php8.4-xml \
71+
php8.4-zip
7272

7373
RUN rm -f /var/log/nginx/access.log /var/log/nginx/error.log && \
7474
ln -s /dev/stdout /var/log/nginx/access.log && \

Dockerfile.development

+14-14
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
1919
gosu \
2020
jhead \
2121
nodejs \
22-
php8.3 \
23-
php8.3-common \
24-
php8.3-curl \
25-
php8.3-ds \
26-
php8.3-gd \
27-
php8.3-intl \
28-
php8.3-mbstring \
29-
php8.3-mysql \
30-
php8.3-redis \
31-
php8.3-sqlite3 \
32-
php8.3-swoole \
33-
php8.3-tokenizer \
34-
php8.3-xml \
35-
php8.3-zip \
22+
php8.4 \
23+
php8.4-common \
24+
php8.4-curl \
25+
php8.4-ds \
26+
php8.4-gd \
27+
php8.4-intl \
28+
php8.4-mbstring \
29+
php8.4-mysql \
30+
php8.4-redis \
31+
php8.4-sqlite3 \
32+
php8.4-swoole \
33+
php8.4-tokenizer \
34+
php8.4-xml \
35+
php8.4-zip \
3636
zip
3737

3838
RUN npm install -g yarn

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The browser-facing portion of [osu!](https://osu.ppy.sh/home).
99

1010
## Requirements
1111

12-
- A PHP 8.3 environment
12+
- A PHP 8.4 environment
1313
- MySQL 8.0+
1414
- Elasticsearch
1515

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"sort-packages": true,
8787
"optimize-autoloader": true,
8888
"platform": {
89-
"php": "8.3.0"
89+
"php": "8.4.0"
9090
},
9191
"allow-plugins": {
9292
"composer/package-versions-deprecated": true,

composer.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/sentry.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
| E_CORE_ERROR
2222
| E_CORE_WARNING
2323
| E_COMPILE_ERROR
24-
| E_COMPILE_WARNING
25-
| E_STRICT,
24+
| E_COMPILE_WARNING,
2625
];

0 commit comments

Comments
 (0)