Skip to content
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ jobs:
strategy:
matrix:
cfg:
- { os: 'ubuntu-22.04', php: '8.1' }
- { os: 'ubuntu-24.04', php: '8.3' }
- { os: 'ubuntu-24.04', php: '8.4' }
runs-on: ${{ matrix.cfg.os }}
steps:
- name: Checkout Code
Expand Down Expand Up @@ -38,8 +38,8 @@ jobs:
strategy:
matrix:
cfg:
- { os: 'ubuntu-22.04', php: '8.1' }
- { os: 'ubuntu-24.04', php: '8.3' }
- { os: 'ubuntu-24.04', php: '8.4' }
runs-on: ${{ matrix.cfg.os }}
steps:
- name: Checkout Code
Expand Down Expand Up @@ -104,8 +104,8 @@ jobs:
strategy:
matrix:
cfg:
- { os: 'ubuntu-22.04', php: '8.1' }
- { os: 'ubuntu-24.04', php: '8.3' }
- { os: 'ubuntu-24.04', php: '8.4' }
runs-on: ${{ matrix.cfg.os }}
steps:
- name: Checkout Code
Expand Down
6 changes: 6 additions & 0 deletions SETUP/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ see the git history.
[R202009](https://github.com/DistributedProofreaders/dproofreaders/releases/tag/R202009)
first before upgrading to R202102 or later releases.**

## R??????

### Notices & Deprecations

This release requires PHP 8.3 or later.

## R202603
Scripts supporting this upgrade are in `SETUP/upgrade/24`

Expand Down
11 changes: 5 additions & 6 deletions SETUP/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ The following lists supported versions for the four primary middleware
components.

### PHP
PHP version 8.1 is the minimum supported version although limited testing has been done
on PHP versions < 8.3.
PHP version 8.3 is the minimum supported version.

The following PHP extensions are required. They are listed below with their
Ubuntu system package names.
Expand Down Expand Up @@ -58,11 +57,11 @@ change `core.disable_super_globals` to `false`, and flush the phpbb cache.

## Distro support
These middleware components match the following major distribution releases:
* Ubuntu 20.04, Focal (with PHP 8.1 upgrade)
* Ubuntu 22.04, Jammy
* Ubuntu 20.04, Focal (with PHP 8.3 upgrade)
* Ubuntu 22.04, Jammy (with PHP 8.3 upgrade)
* Ubuntu 24.04, Noble
* RHEL / CentOS 8.x family (with PHP 8.1 upgrade)
* RHEL / CentOS 9.x family
* RHEL / CentOS 8.x family (with PHP 8.3 upgrade)
* RHEL / CentOS 9.x family (with PHP 8.3 upgrade)

## Browser support
The following are the lowest known supported browser versions for the code:
Expand Down
2 changes: 1 addition & 1 deletion SETUP/devex/dpdev-docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-apache
FROM php:8.3-apache

# Set apt to noninteractive mode for the build.
ARG DEBIAN_FRONTEND=noninteractive
Expand Down
7 changes: 3 additions & 4 deletions SETUP/tests/unittests/PageCompareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
$relPath = '../../../pinc/';
include_once($relPath."PageUnformatter.inc"); // PageUnformatter()

use PHPUnit\Framework\Attributes\DataProvider;

class PageCompareTest extends PHPUnit\Framework\TestCase
{
/**
* @dataProvider textProvider
*/

#[DataProvider('textProvider')]
public function testRemoveFormatting($formatted_file, $expected_result_file): void
{
$un_formatter = new PageUnformatter();
Expand Down
21 changes: 11 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@
"minimum-stability": "stable",
"require": {
"ezyang/htmlpurifier" : "v4.*",
"erusev/parsedown": "1.8.0-beta-7",
"erusev/parsedown-extra": "0.8.0",
"voku/portable-utf8": "^6.0",
"phpmailer/phpmailer": "^6.8",
"erusev/parsedown": "1.8.0",
"erusev/parsedown-extra": "0.9.0",
"voku/portable-utf8": "dev-master#c4b3774",
"phpmailer/phpmailer": "^7.0",
"vertilia/text": "^1.5",
"nikic/php-parser": "^5.0",
"symfony/process": "^6.0",
"symfony/polyfill-php82": "^1.31",
"symfony/polyfill-php83": "^1.31",
"symfony/polyfill-php84": "^1.31"
"symfony/process": "^7.0",
"symfony/polyfill-php84": "^1.31",
"symfony/polyfill-php85": "^1.33"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.57",
"phpunit/phpunit": "^10.0",
"phpunit/phpunit": "^12.0",
"phpstan/phpstan": "^2.1.31"
},
"replace": {
Expand All @@ -33,14 +32,16 @@
"symfony/polyfill-php74": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*",
"symfony/polyfill-php82": "*",
"symfony/polyfill-php83": "*",
"symfony/polyfill-iconv": "*",
"symfony/polyfill-intl-grapheme": "*",
"symfony/polyfill-intl-normalizer": "*",
"symfony/polyfill-mbstring": "*"
},
"config": {
"platform": {
"php": "8.1"
"php": "8.3"
}
}
}
Loading
Loading