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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
php-version: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
php-version: [8.1, 8.2, 8.3, 8.4, 8.5]
fail-fast: false
steps:
- uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
# Lowest supported PHP version
php-version: "7.1"
php-version: "8.1"
extensions: mbstring, xml, curl, pcntl

- uses: actions/setup-python@v6
Expand Down
4 changes: 2 additions & 2 deletions build/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Open a command prompt in the image:

## Core Tool Versions per Dockerfile ##

Last updated: March 5, 2024
Last updated: May 2, 2026

| Tool | ubuntu-focal | ubuntu-jammy | ubuntu-noble | Notes |
| :-------- | :------------ | :------------ | :------------ | :---- |
Expand Down Expand Up @@ -192,7 +192,7 @@ Last updated: March 5, 2024
| nodejs | 16.20.2 | 16.20.2 | | |
| ocaml | 4.08.1 | 4.13.1 | | |
| perl | 5.30.0 | 5.34.0 | | |
| php | 7.4.3 | 8.1.2 | 8.3 | |
| php | 8.1 (ondrej) | 8.1.2 | 8.3 | focal pulls 8.1 from ppa:ondrej/php |
| python2 | 2.7.18 | | | |
| python3 | 3.8.10 | 3.10.12 | | |
| ruby | 2.7.0p0 | 3.0.2p107 | | |
Expand Down
18 changes: 11 additions & 7 deletions build/docker/ubuntu-focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,19 @@ RUN apt-get install -y --no-install-recommends \
libnet-ssleay-perl \
libtest-exception-perl

# PHP via Ondřej Surý PPA (focal default is 7.4 which is below our 8.1 floor)
RUN add-apt-repository -y ppa:ondrej/php && \
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to myself: Ondřej Surý is the maintainer of the PHP packages for Debian and Ubuntu (both the official ones and the ones you are using via the PPA).

apt-get update -yq

RUN apt-get install -y --no-install-recommends \
`# Php dependencies` \
php7.4 \
php7.4-cli \
php7.4-dev \
php7.4-mbstring \
php7.4-xml \
php7.4-curl \
php7.4-xdebug \
php8.1 \
php8.1-cli \
php8.1-dev \
php8.1-mbstring \
php8.1-xml \
php8.1-curl \
php8.1-xdebug \
php-pear \
re2c

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"issues": "https://issues.apache.org/jira/browse/THRIFT"
},
"require": {
"php": "^7.1 || ^8.0"
"php": "^8.1"
},
"require-dev": {
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"squizlabs/php_codesniffer": "3.*",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.10",
"php-mock/php-mock-phpunit": "^2.10",
"ext-json": "*",
"ext-xml": "*",
Expand Down
2 changes: 1 addition & 1 deletion lib/php/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
stopOnWarning="true"
stopOnFailure="true"
processIsolation="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd">
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./lib</directory>
Expand Down
Loading