Skip to content

Commit 085abd6

Browse files
crazywhalecccrazywhalecc
authored
Merge pull request #819 from crazywhalecc/php-85
Add PHP 8.5 initial support
2 parents 0bb8e83 + 3789c7c commit 085abd6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+716
-453
lines changed

‎.github/workflows/ext-matrix-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- zlib
8383
- zstd
8484
php-version:
85-
- "8.4"
85+
- "git"
8686
operating-system:
8787
- "ubuntu-latest"
8888
#- "macos-13"

‎.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ jobs:
145145
os: ${{ fromJSON(needs.define-matrix.outputs.os) }}
146146
fail-fast: false
147147
steps:
148+
- name: "Update runner packages"
149+
if: ${{ startsWith(matrix.os, 'ubuntu-') }}
150+
run: sudo apt-get update && sudo apt-get install -y ca-certificates
151+
148152
- name: "Checkout"
149153
uses: actions/checkout@v4
150154

‎README-zh.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,23 @@ static-php-cli（简称 `spc`）有许多特性：
7676

7777
当前支持编译的 PHP 版本：
7878

79-
> :warning: 支持，但 static-php-cli 作者可能不再提供补丁修复
79+
> :warning: 部分支持，对于新的测试版和旧版本可能存在问题。
8080
>
8181
> :heavy_check_mark: 支持
8282
>
8383
> :x: 不支持
8484
85-
| PHP Version | Status | Comment |
86-
|-------------|--------------------|----------------------------------------------|
87-
| 7.2 | :x: | |
88-
| 7.3 | :x: | phpmicro 和许多扩展不支持 7.3、7.4 版本 |
89-
| 7.4 | :x: | phpmicro 和许多扩展不支持 7.3、7.4 版本 |
90-
| 8.0 | :warning: | PHP 官方已停止 8.0 的维护，我们不再处理 8.0 相关的 backport 支持 |
91-
| 8.1 | :heavy_check_mark: | PHP 官方仅对 8.1 提供安全更新 |
92-
| 8.2 | :heavy_check_mark: | |
93-
| 8.3 | :heavy_check_mark: | |
94-
| 8.4 | :heavy_check_mark: | |
85+
| PHP Version | Status | Comment |
86+
|-------------|--------------------|---------------------------------------------------------|
87+
| 7.2 | :x: | |
88+
| 7.3 | :x: | phpmicro 和许多扩展不支持 7.3、7.4 版本 |
89+
| 7.4 | :x: | phpmicro 和许多扩展不支持 7.3、7.4 版本 |
90+
| 8.0 | :warning: | PHP 官方已停止 8.0 的维护，我们不再处理 8.0 相关的 backport 支持 |
91+
| 8.1 | :heavy_check_mark: | PHP 官方仅对 8.1 提供安全更新，在 8.5 发布后我们不再处理 8.1 相关的 backport 支持 |
92+
| 8.2 | :heavy_check_mark: | |
93+
| 8.3 | :heavy_check_mark: | |
94+
| 8.4 | :heavy_check_mark: | |
95+
| 8.5 (alpha) | :warning: | PHP 8.5 目前处于 alpha 阶段 |
9596

9697
> 这个表格的支持状态是 static-php-cli 对构建对应版本的支持情况，不是 PHP 官方对该版本的支持情况。
9798

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Here is the supported OS and arch, where :octocat: represents support for GitHub
8383

8484
Currently supported PHP versions for compilation:
8585

86-
> :warning: supported but not maintained by static-php-cli authors
86+
> :warning: Partial support, there may be issues with newer test versions or older versions.
8787
>
8888
> :heavy_check_mark: supported
8989
>
@@ -95,10 +95,11 @@ Currently supported PHP versions for compilation:
9595
| 7.3 | :x: | phpmicro and some extensions not supported on 7.x |
9696
| 7.4 | :x: | phpmicro and some extensions not supported on 7.x |
9797
| 8.0 | :warning: | PHP official has stopped maintenance of 8.0, we no longer provide backport support for version 8.0 |
98-
| 8.1 | :heavy_check_mark: | PHP official has security fixes only |
98+
| 8.1 | :heavy_check_mark: | PHP official has security fixes only, we no longer provide backport support when 8.5 released |
9999
| 8.2 | :heavy_check_mark: | |
100100
| 8.3 | :heavy_check_mark: | |
101101
| 8.4 | :heavy_check_mark: | |
102+
| 8.5 (alpha) | :warning: | PHP 8.5 is in alpha |
102103

103104
> This table shows the support status for static-php-cli in building the corresponding version,
104105
> not the official PHP support status for that version.

‎bin/spc-alpine-docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ RUN apk update; \
104104
m4 \
105105
make \
106106
pkgconfig \
107+
re2c \
107108
wget \
108109
xz \
109110
gettext-dev \

‎bin/spc-gnu-docker

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
# This file is using docker to run commands
6-
SPC_DOCKER_VERSION=v4
6+
SPC_DOCKER_VERSION=v5
77

88
# Detect docker can run
99
if ! which docker >/dev/null; then
@@ -102,17 +102,20 @@ RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v
102102
tar -xzf cmake.tgz -C /cmake --strip-components 1
103103
104104
WORKDIR /app
105-
ADD ./src /app/src
106105
COPY ./composer.* /app/
107106
ADD ./bin/setup-runtime /app/bin/setup-runtime
108107
ADD ./bin/spc /app/bin/spc
109108
RUN /app/bin/setup-runtime
109+
ADD ./src /app/src
110110
RUN /app/bin/php /app/bin/composer install --no-dev
111111
ENV SPC_LIBC=glibc
112112
ENV PATH="/app/bin:/cmake/bin:/opt/rh/devtoolset-10/root/usr/bin:\$PATH"
113113
114-
ADD ./config/env.ini /app/config/env.ini
114+
ADD ./config /app/config
115115
RUN CC=gcc bin/spc doctor --auto-fix --debug
116+
RUN if [ -f /app/buildroot/bin/re2c ]; then \
117+
cp /app/buildroot/bin/re2c /usr/local/bin/re2c ;\
118+
fi
116119
117120
RUN curl -o make.tgz -fsSL https://ftp.gnu.org/gnu/make/make-4.4.tar.gz && \
118121
tar -zxvf make.tgz && \

‎composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"captainhook/hook-installer": "^1.0",
2424
"friendsofphp/php-cs-fixer": "^3.60",
2525
"humbug/box": "^4.5.0 || ^4.6.0",
26-
"nunomaduro/collision": "^7.8",
2726
"phpstan/phpstan": "^1.10",
2827
"phpunit/phpunit": "^10.3 || ^9.5"
2928
},

0 commit comments

Comments
 (0)