Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/jobs/baseinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

Expand Down
2 changes: 1 addition & 1 deletion .github/jobs/unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DIR="$PWD"

export version=$1
unittest=$2
[ "$version" = "8.1" ] && CODECOVERAGE=1 || CODECOVERAGE=0
[ "$version" = "8.2" ] && CODECOVERAGE=1 || CODECOVERAGE=0

# Set up
export unit=1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
image: pipelinecomponents/php-codesniffer:latest
strategy:
matrix:
PHPVERSION: ["8.1", "8.2", "8.3", "8.4"]
PHPVERSION: ["8.2", "8.3", "8.4", "8.5"]
steps:
- run: apk add git
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
PHPVERSION: [8.1, 8.4]
PHPVERSION: [8.2, 8.5]
TEST: [Unit, E2E]
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions doc/manual/install-domserver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ System requirements

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

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

Expand Down
2 changes: 1 addition & 1 deletion doc/manual/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ chapters for detailed software requirements.

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

* A number of machines to act as *judgehosts* (at least one). They need to run
Expand Down
4 changes: 2 additions & 2 deletions webapp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
],
"require": {
"php": "^8.1.0",
"php": "^8.2.0",
"ext-bcmath": "*",
"ext-ctype": "*",
"ext-curl": "*",
Expand Down Expand Up @@ -136,7 +136,7 @@
},
"sort-packages": true,
"platform": {
"php": "8.1.0"
"php": "8.2.0"
},
"allow-plugins": {
"composer/package-versions-deprecated": true,
Expand Down
6 changes: 3 additions & 3 deletions webapp/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webapp/src/Service/CheckConfigService.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function checkPhpVersion(): ConfigCheckItem
{
$this->stopwatch->start(__FUNCTION__);
$my = PHP_VERSION;
$req = '8.1.0';
$req = '8.2.0';
$result = version_compare($my, $req, '>=');
$this->stopwatch->stop(__FUNCTION__);
return new ConfigCheckItem(
Expand Down
Loading