Skip to content

Commit 132445d

Browse files
Set PHP 8.2 as minimum, dropping 8.1
Also add 8.5 testing
1 parent 70ec348 commit 132445d

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

.github/jobs/baseinstall.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
export version="$1"
66
db=${2:-install}
7-
phpversion="${3:-8.1}"
7+
phpversion="${3:-8.2}"
88
# If this script is called from unit-tests.sh, we use the test environment
99
export APP_ENV="${4:-prod}"
1010

.github/jobs/unit-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DIR="$PWD"
88

99
export version=$1
1010
unittest=$2
11-
[ "$version" = "8.1" ] && CODECOVERAGE=1 || CODECOVERAGE=0
11+
[ "$version" = "8.2" ] && CODECOVERAGE=1 || CODECOVERAGE=0
1212

1313
# Set up
1414
export unit=1

.github/workflows/codestyle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
image: pipelinecomponents/php-codesniffer:latest
4747
strategy:
4848
matrix:
49-
PHPVERSION: ["8.1", "8.2", "8.3", "8.4"]
49+
PHPVERSION: ["8.2", "8.3", "8.4", "8.5"]
5050
steps:
5151
- run: apk add git
5252
- uses: actions/checkout@v4

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
4444
strategy:
4545
matrix:
46-
PHPVERSION: [8.1, 8.4]
46+
PHPVERSION: [8.2, 8.5]
4747
TEST: [Unit, E2E]
4848
steps:
4949
- uses: actions/checkout@v4

doc/manual/install-domserver.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ System requirements
2424

2525
Software requirements
2626
`````````````````````
27-
* A web server with support for PHP >= 8.1.0 and the ``mysqli``, ``curl``, ``gd``,
27+
* A web server with support for PHP >= 8.2.0 and the ``mysqli``, ``curl``, ``gd``,
2828
``mbstring``, ``intl``, ``zip``, ``xml`` and ``json`` extensions for PHP.
2929
* MySQL or MariaDB database. This can be on the same machine, but for
3030
advanced setups can also run on a dedicated machine.
@@ -109,7 +109,7 @@ with it. Refer to the documentation of your web server and PHP for
109109
details. In the examples below, replace |phpversion| with the PHP version
110110
you're installing.
111111

112-
To configure the nginx web server for DOMjudge, use the nginx configuration snippet in
112+
To configure the nginx web server for DOMjudge, use the nginx configuration snippet in
113113
``etc/nginx-conf``. You still need ``htpasswd`` from ``apache2-utils``
114114
though. To use this configuration, perform the following steps:
115115

doc/manual/overview.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ chapters for detailed software requirements.
4545

4646
* At least one machine to act as the *DOMjudge server* (or *domserver* for
4747
brevity). The machine needs to be running Linux (or possibly a Unix
48-
variant) and a webserver with PHP 8.1.0 or newer. A MySQL or MariaDB
48+
variant) and a webserver with PHP 8.2.0 or newer. A MySQL or MariaDB
4949
database is also needed.
5050

5151
* A number of machines to act as *judgehosts* (at least one). They need to run

webapp/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
}
4040
],
4141
"require": {
42-
"php": "^8.1.0",
42+
"php": "^8.2.0",
4343
"ext-bcmath": "*",
4444
"ext-ctype": "*",
4545
"ext-curl": "*",
@@ -136,7 +136,7 @@
136136
},
137137
"sort-packages": true,
138138
"platform": {
139-
"php": "8.1.0"
139+
"php": "8.2.0"
140140
},
141141
"allow-plugins": {
142142
"composer/package-versions-deprecated": true,

webapp/composer.lock

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

webapp/src/Service/CheckConfigService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function checkPhpVersion(): ConfigCheckItem
117117
{
118118
$this->stopwatch->start(__FUNCTION__);
119119
$my = PHP_VERSION;
120-
$req = '8.1.0';
120+
$req = '8.2.0';
121121
$result = version_compare($my, $req, '>=');
122122
$this->stopwatch->stop(__FUNCTION__);
123123
return new ConfigCheckItem(

0 commit comments

Comments
 (0)