diff --git a/.github/jobs/baseinstall.sh b/.github/jobs/baseinstall.sh index 719f065608..143b94d5ad 100755 --- a/.github/jobs/baseinstall.sh +++ b/.github/jobs/baseinstall.sh @@ -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}" diff --git a/.github/jobs/unit-tests.sh b/.github/jobs/unit-tests.sh index 3357a7868b..dffb739915 100755 --- a/.github/jobs/unit-tests.sh +++ b/.github/jobs/unit-tests.sh @@ -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 diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index 0dbddf8f72..8bc9270043 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -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 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d6d53f8712..820ca6e106 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -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 diff --git a/doc/manual/install-domserver.rst b/doc/manual/install-domserver.rst index f6a4eb2e18..e9c4b30e1f 100644 --- a/doc/manual/install-domserver.rst +++ b/doc/manual/install-domserver.rst @@ -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. @@ -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: diff --git a/doc/manual/overview.rst b/doc/manual/overview.rst index 343f2c28f5..b542cd5500 100644 --- a/doc/manual/overview.rst +++ b/doc/manual/overview.rst @@ -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 diff --git a/webapp/composer.json b/webapp/composer.json index 3a41ef7621..1124ce50b3 100644 --- a/webapp/composer.json +++ b/webapp/composer.json @@ -39,7 +39,7 @@ } ], "require": { - "php": "^8.1.0", + "php": "^8.2.0", "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", @@ -136,7 +136,7 @@ }, "sort-packages": true, "platform": { - "php": "8.1.0" + "php": "8.2.0" }, "allow-plugins": { "composer/package-versions-deprecated": true, diff --git a/webapp/composer.lock b/webapp/composer.lock index 9b8a1d628a..9ee79dfdf1 100644 --- a/webapp/composer.lock +++ b/webapp/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "acf8aab5dc3598efb723d47096cbcf51", + "content-hash": "f6cb31a86755419ac8c647ffd164a973", "packages": [ { "name": "brick/math", @@ -12795,7 +12795,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^8.1.0", + "php": "^8.2.0", "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", @@ -12815,7 +12815,7 @@ "ext-dom": "*" }, "platform-overrides": { - "php": "8.1.0" + "php": "8.2.0" }, "plugin-api-version": "2.9.0" } diff --git a/webapp/src/Service/CheckConfigService.php b/webapp/src/Service/CheckConfigService.php index 5f1c76f4b3..a3e002073f 100644 --- a/webapp/src/Service/CheckConfigService.php +++ b/webapp/src/Service/CheckConfigService.php @@ -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(