crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix several patches & newer phpmicro support (#470)

Browse Source 
* use upstream phpmicro

* move src/global/tests to src/global/ext-tests

* move src/global/tests to src/global/ext-tests

* prevent file_get_contents memory insufficience

* update README

* fix libxml >= 2.12 with older PHP (<=8.1) build bug

* cleanup code, support newer phpmicro

* add --no-strip and --with-upx-pack tests

* fix windows sanity check for newer phpmicro

* fix windows sanity check for newer phpmicro

* test

* test

* test

* update deps for ci
This commit is contained in:
Jerry Ma 2024-06-03 23:16:15 +08:00 committed by GitHub
parent 3057d02e37
commit d258417afb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
36 changed files with 742 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/tests.yml vendored
View File

@ -147,7 +147,7 @@ jobs:
# Cache downloaded source
- id: cache-download
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: downloads
key: php-${{ matrix.php }}-dependencies
@ -158,6 +158,19 @@ jobs:
- name: "Run Build Tests (doctor)"
run: bin/spc doctor --auto-fix
- name: "Prepare UPX for Windows"
if: matrix.os == 'windows-latest'
run: |
bin/spc install-pkg upx
echo "UPX_CMD=$(php src/globals/test-extensions.php upx)" >> $env:GITHUB_ENV
- name: "Prepare UPX for Linux"
if: matrix.os == 'ubunut-latest'
run: |
bin/spc install-pkg upx
echo "UPX_CMD=$(php src/globals/test-extensions.php upx)" >> $GITHUB_ENV
- name: "Run Build Tests (download)"
uses: nick-fields/retry@v3
with:
@ -167,5 +180,10 @@ jobs:
command: |
bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug --retry=3
- name: "Run Build Tests (build)"
run: bin/spc build "$(php src/globals/test-extensions.php extensions)" $(php src/globals/test-extensions.php zts) --with-libs="$(php src/globals/test-extensions.php libs)" --build-cli --build-micro --build-fpm --debug
- name: "Run Build Tests (build, *nix)"
if: matrix.os != 'windows-latest'
run: bin/spc build "$(php src/globals/test-extensions.php extensions)" $(php src/globals/test-extensions.php zts) $(php src/globals/test-extensions.php no_strip) $UPX_CMD --with-libs="$(php src/globals/test-extensions.php libs)" --build-cli --build-micro --build-fpm --debug
- name: "Run Build Tests (build, windows)"
if: matrix.os == 'windows-latest'
run: bin/spc build "$(php src/globals/test-extensions.php extensions)" $(php src/globals/test-extensions.php zts) $(php src/globals/test-extensions.php no_strip) $env:UPX_CMD --with-libs="$(php src/globals/test-extensions.php libs)" --build-cli --build-micro --build-fpm --debug

4
README-zh.md
View File

@ -74,7 +74,7 @@ static-php-cli（简称 `spc`）有许多特性：
当前支持编译的 PHP 版本：
> :warning: 支持，但可能不再提供修复
> :warning: 支持，但 static-php-cli 作者可能不再提供补丁修复
>
> :heavy_check_mark: 支持
>
@ -86,7 +86,7 @@ static-php-cli（简称 `spc`）有许多特性：
| 7.3 | :warning: | phpmicro 和许多扩展不支持 7.3、7.4 版本 |
| 7.4 | :warning: | phpmicro 和许多扩展不支持 7.3、7.4 版本 |
| 8.0 | :heavy_check_mark: | PHP 官方已停止 8.0 的维护 |
| 8.1 | :heavy_check_mark: | |
| 8.1 | :heavy_check_mark: | PHP 官方仅对 8.1 提供安全更新 |
| 8.2 | :heavy_check_mark: | |
| 8.3 | :heavy_check_mark: | |

4
README.md
View File

@ -82,7 +82,7 @@ Here is the supported OS and arch, where :octocat: represents support for GitHub
Currently supported PHP versions for compilation:
> :warning: supported but not maintained
> :warning: supported but not maintained by static-php-cli authors
>
> :heavy_check_mark: supported
>
@ -94,7 +94,7 @@ Currently supported PHP versions for compilation:
| 7.3 | :warning: | phpmicro and some extensions not supported on 7.x |
| 7.4 | :warning: | phpmicro and some extensions not supported on 7.x |
| 8.0 | :heavy_check_mark: | PHP official has stopped maintenance of 8.0 |
| 8.1 | :heavy_check_mark: | |
| 8.1 | :heavy_check_mark: | PHP official has security fixes only |
| 8.2 | :heavy_check_mark: | |
| 8.3 | :heavy_check_mark: | |

2
config/source.json
View File

@ -463,7 +463,7 @@
"type": "git",
"path": "php-src/sapi/micro",
"rev": "master",
"url": "https://github.com/static-php/phpmicro",
"url": "https://github.com/easysoft/phpmicro",
"license": {
"type": "file",
"path": "LICENSE"

4
phpstan.neon
View File

@ -13,6 +13,6 @@ parameters:
- PHP_OS_FAMILY
excludePaths:
analyseAndScan:
- ./src/globals/tests/swoole.php
- ./src/globals/tests/swoole.phpt
- ./src/globals/ext-tests/swoole.php
- ./src/globals/ext-tests/swoole.phpt
- ./src/globals/test-extensions.php

41
src/SPC/builder/BuilderBase.php
View File

@ -9,6 +9,7 @@ use SPC\exception\FileSystemException;
use SPC\exception\RuntimeException;
use SPC\exception\WrongUsageException;
use SPC\store\Config;
use SPC\store\FileSystem;
use SPC\store\SourceManager;
use SPC\util\CustomExt;
@ -275,6 +276,24 @@ abstract class BuilderBase
return false;
}
public function getMicroVersion(): false|string
{
$file = FileSystem::convertPath(SOURCE_PATH . '/php-src/sapi/micro/php_micro.h');
if (!file_exists($file)) {
return false;
}
$content = file_get_contents($file);
$ver = '';
preg_match('/#define PHP_MICRO_VER_MAJ (\d)/m', $content, $match);
$ver .= $match[1] . '.';
preg_match('/#define PHP_MICRO_VER_MIN (\d)/m', $content, $match);
$ver .= $match[1] . '.';
preg_match('/#define PHP_MICRO_VER_PAT (\d)/m', $content, $match);
$ver .= $match[1];
return $ver;
}
/**
* Get build type name string to display.
*
@ -434,4 +453,26 @@ abstract class BuilderBase
$php .= "echo '[micro-test-end]';\n";
return $php;
}
protected function getMicroTestTasks(): array
{
return [
'micro_ext_test' => [
'content' => ($this->getOption('without-micro-ext-test') ? '<?php echo "[micro-test-start][micro-test-end]";' : $this->generateMicroExtTests()),
'conditions' => [
function ($ret) { return $ret === 0; },
function ($ret, $out) {
$raw_out = trim(implode('', $out));
return str_starts_with($raw_out, '[micro-test-start]') && str_ends_with($raw_out, '[micro-test-end]');
},
],
],
'micro_zend_bug_test' => [
'content' => ($this->getOption('without-micro-ext-test') ? '<?php echo "hello";' : file_get_contents(ROOT_DIR . '/src/globals/common-tests/micro_zend_mm_heap_corrupted.txt')),
'conditions' => [
function ($ret) { return $ret === 0; },
],
],
];
}
}

2
src/SPC/builder/BuilderProvider.php
View File

@ -27,6 +27,8 @@ class BuilderProvider
*/
public static function makeBuilderByInput(InputInterface $input): BuilderBase
{
ini_set('memory_limit', '2G');
self::$builder = match (PHP_OS_FAMILY) {
'Windows' => new WindowsBuilder($input->getOptions()),
'Darwin' => new MacOSBuilder($input->getOptions()),

12
src/SPC/builder/Extension.php
View File

@ -170,19 +170,19 @@ class Extension
public function runCliCheckUnix(): void
{
// Run compile check if build target is cli
// If you need to run some check, overwrite this or add your assert in src/globals/tests/{extension_name}.php
// If you need to run some check, overwrite this or add your assert in src/globals/ext-tests/{extension_name}.php
// If check failed, throw RuntimeException
[$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php --ri "' . $this->getDistName() . '"', false);
if ($ret !== 0) {
throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
}
if (file_exists(ROOT_DIR . '/src/globals/tests/' . $this->getName() . '.php')) {
if (file_exists(ROOT_DIR . '/src/globals/ext-tests/' . $this->getName() . '.php')) {
// Trim additional content & escape special characters to allow inline usage
$test = str_replace(
['<?php', 'declare(strict_types=1);', "\n", '"', '$'],
['', '', '', '\"', '\$'],
file_get_contents(ROOT_DIR . '/src/globals/tests/' . $this->getName() . '.php')
file_get_contents(ROOT_DIR . '/src/globals/ext-tests/' . $this->getName() . '.php')
);
[$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -r "' . trim($test) . '"');
@ -201,19 +201,19 @@ class Extension
public function runCliCheckWindows(): void
{
// Run compile check if build target is cli
// If you need to run some check, overwrite this or add your assert in src/globals/tests/{extension_name}.php
// If you need to run some check, overwrite this or add your assert in src/globals/ext-tests/{extension_name}.php
// If check failed, throw RuntimeException
[$ret] = cmd()->execWithResult(BUILD_ROOT_PATH . '/bin/php.exe --ri "' . $this->getDistName() . '"', false);
if ($ret !== 0) {
throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
}
if (file_exists(FileSystem::convertPath(ROOT_DIR . '/src/globals/tests/' . $this->getName() . '.php'))) {
if (file_exists(FileSystem::convertPath(ROOT_DIR . '/src/globals/ext-tests/' . $this->getName() . '.php'))) {
// Trim additional content & escape special characters to allow inline usage
$test = str_replace(
['<?php', 'declare(strict_types=1);', "\n", '"', '$'],
['', '', '', '\"', '$'],
file_get_contents(FileSystem::convertPath(ROOT_DIR . '/src/globals/tests/' . $this->getName() . '.php'))
file_get_contents(FileSystem::convertPath(ROOT_DIR . '/src/globals/ext-tests/' . $this->getName() . '.php'))
);
[$ret] = cmd()->execWithResult(BUILD_ROOT_PATH . '/bin/php.exe -r "' . trim($test) . '"');

4
src/SPC/builder/freebsd/BSDBuilder.php
View File

@ -181,7 +181,7 @@ class BSDBuilder extends UnixBuilderBase
}
if ($this->getExt('phar')) {
$this->phar_patched = true;
SourcePatcher::patchMicro(['phar']);
SourcePatcher::patchMicroPhar($this->getPHPVersionID());
}
$enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
@ -202,7 +202,7 @@ class BSDBuilder extends UnixBuilderBase
$this->deployBinary(BUILD_TARGET_MICRO);
if ($this->phar_patched) {
SourcePatcher::patchMicro(['phar'], true);
SourcePatcher::unpatchMicroPhar();
}
}

38
src/SPC/builder/linux/LinuxBuilder.php
View File

@ -149,7 +149,11 @@ class LinuxBuilder extends UnixBuilderBase
// process micro upx patch if micro sapi enabled
if ($enable_micro) {
$this->processMicroUPX();
if (version_compare($this->getMicroVersion(), '0.2.0') < 0) {
// for phpmicro 0.1.x
$this->processMicroUPXLegacy();
}
// micro latest needs do strip and upx pack later (strip, upx, cut binary manually supported)
}
shell()->cd(SOURCE_PATH . '/php-src')
@ -236,7 +240,7 @@ class LinuxBuilder extends UnixBuilderBase
}
if ($this->getExt('phar')) {
$this->phar_patched = true;
SourcePatcher::patchMicro(['phar']);
SourcePatcher::patchMicroPhar($this->getPHPVersionID());
}
$enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
@ -250,10 +254,12 @@ class LinuxBuilder extends UnixBuilderBase
->exec('sed -i "s|//lib|/lib|g" Makefile')
->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} micro");
$this->processMicroUPX();
$this->deployBinary(BUILD_TARGET_MICRO);
if ($this->phar_patched) {
SourcePatcher::patchMicro(['phar'], true);
SourcePatcher::unpatchMicroPhar();
}
}
@ -304,11 +310,11 @@ class LinuxBuilder extends UnixBuilderBase
}
/**
* Apply option --no-strip and --with-upx-pack for micro sapi.
* Apply option --no-strip and --with-upx-pack for micro sapi (only for phpmicro 0.1.x)
*
* @throws FileSystemException
*/
private function processMicroUPX(): void
private function processMicroUPXLegacy(): void
{
// upx pack and strip for micro
// but always restore Makefile.frag.bak first
@ -346,4 +352,26 @@ class LinuxBuilder extends UnixBuilderBase
);
}
}
private function processMicroUPX(): void
{
if (version_compare($this->getMicroVersion(), '0.2.0') >= 0 && !$this->getOption('no-strip', false)) {
shell()->exec('strip --strip-all ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx');
if ($this->getOption('with-upx-pack')) {
// strip first
shell()->exec(getenv('UPX_EXEC') . ' --best ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx');
// cut binary with readelf
[$ret, $out] = shell()->execWithResult('readelf -l ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx | awk \'/LOAD|GNU_STACK/ {getline; print $1, $2, $3, $4, $6, $7}\'');
$out[1] = explode(' ', $out[1]);
$offset = $out[1][0];
if ($ret !== 0 || !str_starts_with($offset, '0x')) {
throw new RuntimeException('Cannot find offset in readelf output');
}
$offset = hexdec($offset);
// remove upx extra wastes
file_put_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx', substr(file_get_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx'), 0, $offset));
}
}
}
}

4
src/SPC/builder/macos/MacOSBuilder.php
View File

@ -233,7 +233,7 @@ class MacOSBuilder extends UnixBuilderBase
}
if ($this->getExt('phar')) {
$this->phar_patched = true;
SourcePatcher::patchMicro(['phar']);
SourcePatcher::patchMicroPhar($this->getPHPVersionID());
}
$enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
@ -251,7 +251,7 @@ class MacOSBuilder extends UnixBuilderBase
$this->deployBinary(BUILD_TARGET_MICRO);
if ($this->phar_patched) {
SourcePatcher::patchMicro(['phar'], true);
SourcePatcher::unpatchMicroPhar();
}
}

30
src/SPC/builder/unix/UnixBuilderBase.php
View File

@ -162,22 +162,20 @@ abstract class UnixBuilderBase extends BuilderBase
// sanity check for phpmicro
if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
if (file_exists(SOURCE_PATH . '/hello.exe')) {
@unlink(SOURCE_PATH . '/hello.exe');
}
file_put_contents(
SOURCE_PATH . '/hello.exe',
file_get_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx') .
($this->getOption('without-micro-ext-test') ? '<?php echo "[micro-test-start][micro-test-end]";' : $this->generateMicroExtTests())
);
chmod(SOURCE_PATH . '/hello.exe', 0755);
[$ret, $output2] = shell()->execWithResult(SOURCE_PATH . '/hello.exe');
$raw_out = trim(implode('', $output2));
$condition[0] = $ret === 0;
$condition[1] = str_starts_with($raw_out, '[micro-test-start]') && str_ends_with($raw_out, '[micro-test-end]');
foreach ($condition as $k => $v) {
if (!$v) {
throw new RuntimeException("micro failed sanity check with condition[{$k}], ret[{$ret}], out[{$raw_out}]");
$test_task = $this->getMicroTestTasks();
foreach ($test_task as $task_name => $task) {
$test_file = SOURCE_PATH . '/' . $task_name . '.exe';
if (file_exists($test_file)) {
@unlink($test_file);
}
file_put_contents($test_file, file_get_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx') . $task['content']);
chmod($test_file, 0755);
[$ret, $out] = shell()->execWithResult($test_file);
foreach ($task['conditions'] as $condition => $closure) {
if (!$closure($ret, $out)) {
$raw_out = trim(implode('', $out));
throw new RuntimeException("micro failed sanity check: {$task_name}, condition [{$condition}], ret[{$ret}], out[{$raw_out}]");
}
}
}
}

62
src/SPC/builder/windows/WindowsBuilder.php
View File

@ -80,16 +80,18 @@ class WindowsBuilder extends BuilderBase
$zts = $this->zts ? '--enable-zts=yes ' : '--enable-zts=no ';
// with-upx-pack for phpmicro
$makefile = FileSystem::convertPath(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.w32');
if ($this->getOption('with-upx-pack', false)) {
if (!file_exists($makefile . '.originfile')) {
copy($makefile, $makefile . '.originfile');
FileSystem::replaceFileStr($makefile, '$(MICRO_SFX):', '_MICRO_UPX = ' . getenv('UPX_EXEC') . " --best $(MICRO_SFX)\n$(MICRO_SFX):");
FileSystem::replaceFileStr($makefile, '@$(_MICRO_MT)', "@$(_MICRO_MT)\n\t@$(_MICRO_UPX)");
if ($enableMicro && version_compare($this->getMicroVersion(), '0.2.0') < 0) {
$makefile = FileSystem::convertPath(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.w32');
if ($this->getOption('with-upx-pack', false)) {
if (!file_exists($makefile . '.originfile')) {
copy($makefile, $makefile . '.originfile');
FileSystem::replaceFileStr($makefile, '$(MICRO_SFX):', '_MICRO_UPX = ' . getenv('UPX_EXEC') . " --best $(MICRO_SFX)\n$(MICRO_SFX):");
FileSystem::replaceFileStr($makefile, '@$(_MICRO_MT)', "@$(_MICRO_MT)\n\t@$(_MICRO_UPX)");
}
} elseif (file_exists($makefile . '.originfile')) {
copy($makefile . '.originfile', $makefile);
unlink($makefile . '.originfile');
}
} elseif (file_exists($makefile . '.originfile')) {
copy($makefile . '.originfile', $makefile);
unlink($makefile . '.originfile');
}
if (($logo = $this->getOption('with-micro-logo')) !== null) {
@ -191,14 +193,14 @@ class WindowsBuilder extends BuilderBase
// phar patch for micro
if ($this->getExt('phar')) {
$this->phar_patched = true;
SourcePatcher::patchMicro(['phar']);
SourcePatcher::patchMicroPhar($this->getPHPVersionID());
}
try {
cmd()->cd(SOURCE_PATH . '\php-src')->exec("{$this->sdk_prefix} nmake_micro_wrapper.bat --task-args micro");
} finally {
if ($this->phar_patched) {
SourcePatcher::patchMicro(['phar'], true);
SourcePatcher::unpatchMicroPhar();
}
}
@ -283,22 +285,20 @@ class WindowsBuilder extends BuilderBase
// sanity check for phpmicro
if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
if (file_exists(SOURCE_PATH . '\hello.exe')) {
@unlink(SOURCE_PATH . '\hello.exe');
}
file_put_contents(
SOURCE_PATH . '\hello.exe',
file_get_contents(BUILD_ROOT_PATH . '\bin\micro.sfx') .
($this->getOption('without-micro-ext-test') ? '<?php echo "[micro-test-start][micro-test-end]";' : $this->generateMicroExtTests())
);
chmod(SOURCE_PATH . '\hello.exe', 0755);
[$ret, $output2] = cmd()->execWithResult(SOURCE_PATH . '\hello.exe');
$raw_out = trim(implode('', $output2));
$condition[0] = $ret === 0;
$condition[1] = str_starts_with($raw_out, '[micro-test-start]') && str_ends_with($raw_out, '[micro-test-end]');
foreach ($condition as $k => $v) {
if (!$v) {
throw new RuntimeException("micro failed sanity check with condition[{$k}], ret[{$ret}], out[{$raw_out}]");
$test_task = $this->getMicroTestTasks();
foreach ($test_task as $task_name => $task) {
$test_file = SOURCE_PATH . '/' . $task_name . '.exe';
if (file_exists($test_file)) {
@unlink($test_file);
}
file_put_contents($test_file, file_get_contents(BUILD_ROOT_PATH . '\bin\micro.sfx') . $task['content']);
chmod($test_file, 0755);
[$ret, $out] = cmd()->execWithResult($test_file);
foreach ($task['conditions'] as $condition => $closure) {
if (!$closure($ret, $out)) {
$raw_out = trim(implode('', $out));
throw new RuntimeException("micro failed sanity check: {$task_name}, condition [{$condition}], ret[{$ret}], out[{$raw_out}]");
}
}
}
}
@ -320,9 +320,11 @@ class WindowsBuilder extends BuilderBase
default => throw new RuntimeException('Deployment does not accept type ' . $type),
};
// with-upx-pack for cli
if ($this->getOption('with-upx-pack', false) && $type === BUILD_TARGET_CLI) {
cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src));
// with-upx-pack for cli and micro
if ($this->getOption('with-upx-pack', false)) {
if ($type === BUILD_TARGET_CLI || ($type === BUILD_TARGET_MICRO && version_compare($this->getMicroVersion(), '0.2.0') >= 0)) {
cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src));
}
}
logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');

2
src/SPC/command/BaseCommand.php
View File

@ -96,6 +96,8 @@ abstract class BaseCommand extends Command
});
if ($this->shouldExecute()) {
try {
// show raw argv list for logger()->debug
logger()->debug('argv: ' . implode(' ', $_SERVER['argv']));
return $this->handle();
} catch (WrongUsageException $e) {
$msg = explode("\n", $e->getMessage());

15
src/SPC/store/FileSystem.php
View File

@ -436,6 +436,21 @@ class FileSystem
return str_replace(array_keys($replacement), array_values($replacement), $path);
}
public static function backupFile(string $path): string
{
copy($path, $path . '.bak');
return $path . '.bak';
}
public static function restoreBackupFile(string $path): void
{
if (!file_exists($path . '.bak')) {
throw new RuntimeException('Cannot find bak file for ' . $path);
}
copy($path . '.bak', $path);
unlink($path . '.bak');
}
/**
* @throws RuntimeException
* @throws FileSystemException

54
src/SPC/store/SourcePatcher.php
View File

@ -18,6 +18,7 @@ class SourcePatcher
FileSystem::addSourceExtractHook('micro', [SourcePatcher::class, 'patchMicro']);
FileSystem::addSourceExtractHook('openssl', [SourcePatcher::class, 'patchOpenssl11Darwin']);
FileSystem::addSourceExtractHook('swoole', [SourcePatcher::class, 'patchSwoole']);
FileSystem::addSourceExtractHook('php-src', [SourcePatcher::class, 'patchPhpLibxml212']);
}
/**
@ -200,6 +201,11 @@ class SourcePatcher
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'install-micro', '');
}
// no asan
// if (strpos(file_get_contents(SOURCE_PATH . '/php-src/Makefile'), 'CFLAGS_CLEAN = -g') === false) {
// FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'CFLAGS_CLEAN = ', 'CFLAGS_CLEAN = -g -fsanitize=address ');
// }
// call extension patch before make
foreach ($builder->getExts() as $ext) {
if ($ext->patchBeforeMake() === true) {
@ -268,6 +274,36 @@ class SourcePatcher
return $result;
}
public static function patchMicroPhar(int $version_id): void
{
FileSystem::backupFile(SOURCE_PATH . '/php-src/ext/phar/phar.c');
FileSystem::replaceFileStr(
SOURCE_PATH . '/php-src/ext/phar/phar.c',
'static zend_op_array *phar_compile_file',
"char *micro_get_filename(void);\n\nstatic zend_op_array *phar_compile_file"
);
if ($version_id < 80100) {
// PHP 8.0.x
FileSystem::replaceFileStr(
SOURCE_PATH . '/php-src/ext/phar/phar.c',
'if (strstr(file_handle->filename, ".phar") && !strstr(file_handle->filename, "://")) {',
'if ((strstr(file_handle->filename, micro_get_filename()) || strstr(file_handle->filename, ".phar")) && !strstr(file_handle->filename, "://")) {'
);
} else {
// PHP >= 8.1
FileSystem::replaceFileStr(
SOURCE_PATH . '/php-src/ext/phar/phar.c',
'if (strstr(ZSTR_VAL(file_handle->filename), ".phar") && !strstr(ZSTR_VAL(file_handle->filename), "://")) {',
'if ((strstr(ZSTR_VAL(file_handle->filename), micro_get_filename()) || strstr(ZSTR_VAL(file_handle->filename), ".phar")) && !strstr(ZSTR_VAL(file_handle->filename), "://")) {'
);
}
}
public static function unpatchMicroPhar(): void
{
FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/ext/phar/phar.c');
}
/**
* Patch cli SAPI Makefile for Windows.
*
@ -296,6 +332,24 @@ class SourcePatcher
FileSystem::writeFile(SOURCE_PATH . '/php-src/Makefile', implode("\r\n", $lines));
}
public static function patchPhpLibxml212(): bool
{
$file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
if (preg_match('/PHP_VERSION_ID (\d+)/', $file, $match) !== 0) {
$ver_id = intval($match[1]);
if ($ver_id < 80100) {
self::patchFile('spc_fix_libxml2_12_php80.patch', SOURCE_PATH . '/php-src');
return true;
}
if ($ver_id < 80200) {
self::patchFile('spc_fix_libxml2_12_php81.patch', SOURCE_PATH . '/php-src');
return true;
}
return false;
}
return false;
}
/**
* Add additional `static-php-cli.version` ini value for PHP source.
*

361
src/globals/common-tests/micro_zend_mm_heap_corrupted.txt Normal file
View File

@ -0,0 +1,361 @@
<?php
define('K_SP', ' ');
define('K_exclam', '!');
define('K_quotedbl', '"');
define('K_numbersign', '#');
define('K_dollar', '$');
define('K_percent', '%');
define('K_ampersand', '&');
define('K_apostrophe', "'");
define('K_parentleft', '(');
define('K_parentright', ')');
define('K_asterisk', '*');
define('K_plus', '+');
define('K_comma', ',');
define('K_minus', '-');
define('K_period', '.');
define('K_slash', '/');
define('K_0', '0');
define('K_1', '1');
define('K_2', '2');
define('K_3', '3');
define('K_4', '4');
define('K_5', '5');
define('K_6', '6');
define('K_7', '7');
define('K_8', '8');
define('K_9', '9');
define('K_colon', ':');
define('K_semicolon', ';');
define('K_less', '<');
define('K_equal', '=');
define('K_greater', '>');
define('K_question', '?');
define('K_at', '@');
define('K_A', 'A');
define('K_B', 'B');
define('K_C', 'C');
define('K_D', 'D');
define('K_E', 'E');
define('K_F', 'F');
define('K_G', 'G');
define('K_H', 'H');
define('K_I', 'I');
define('K_J', 'J');
define('K_K', 'K');
define('K_L', 'L');
define('K_M', 'M');
define('K_N', 'N');
define('K_O', 'O');
define('K_P', 'P');
define('K_Q', 'Q');
define('K_R', 'R');
define('K_S', 'S');
define('K_T', 'T');
define('K_U', 'U');
define('K_V', 'V');
define('K_W', 'W');
define('K_X', 'X');
define('K_Y', 'Y');
define('K_Z', 'Z');
define('K_bracketleft', '[');
define('K_bracketright', ']');
define('K_circum', '^');
define('K_underscore', '_');
define('K_grave', '`');
define('K_a', 'a');
define('K_b', 'b');
define('K_c', 'c');
define('K_d', 'd');
define('K_e', 'e');
define('K_f', 'f');
define('K_g', 'g');
define('K_h', 'h');
define('K_i', 'i');
define('K_j', 'j');
define('K_k', 'k');
define('K_l', 'l');
define('K_m', 'm');
define('K_n', 'n');
define('K_o', 'o');
define('K_p', 'p');
define('K_q', 'q');
define('K_r', 'r');
define('K_s', 's');
define('K_t', 't');
define('K_u', 'u');
define('K_v', 'v');
define('K_w', 'w');
define('K_x', 'x');
define('K_y', 'y');
define('K_z', 'z');
define('K_braceleft', '{');
define('K_bar', '|');
define('K_braceright', '}');
define('K_tilde', '~');
define('K_BS', '\\b');
define('K_TAB', "\t");
define('K_LF', "\n");
define('K_CR', "\r");
define('K_quoteleft', '`');
define('K_quoteright', "'");
define('K_PAUSE', 65299);
define('K_ESC', 65307);
define('K_HOME', 65360);
define('K_LEFT', 65361);
define('K_UP', 65362);
define('K_RIGHT', 65363);
define('K_DOWN', 65364);
define('K_PGUP', 65365);
define('K_PGDN', 65366);
define('K_END', 65367);
define('K_MIDDLE', 65291);
define('K_Print', 65377);
define('K_INS', 65379);
define('K_Menu', 65383);
define('K_DEL', 65535);
define('K_F1', 65470);
define('K_F2', 65471);
define('K_F3', 65472);
define('K_F4', 65473);
define('K_F5', 65474);
define('K_F6', 65475);
define('K_F7', 65476);
define('K_F8', 65477);
define('K_F9', 65478);
define('K_F10', 65479);
define('K_F11', 65480);
define('K_F12', 65481);
define('K_F13', 65482);
define('K_F14', 65483);
define('K_F15', 65484);
define('K_F16', 65485);
define('K_F17', 65486);
define('K_F18', 65487);
define('K_F19', 65488);
define('K_F20', 65489);
define('K_LSHIFT', 65505);
define('K_RSHIFT', 65506);
define('K_LCTRL', 65507);
define('K_RCTRL', 65508);
define('K_LALT', 65513);
define('K_RALT', 65514);
define('K_NUM', 65407);
define('K_SCROLL', 65300);
define('K_CAPS', 65509);
define('K_CLEAR', 65490);
define('K_HELP', 65491);
define('K_ccedilla', 231);
define('K_Ccedilla', 199);
define('K_acute', 180);
define('K_diaeresis', 168);
define('IUP_RUN', 'RUN');
define('IUP_ENGLISH', 'ENGLISH');
define('IUP_PORTUGUESE', 'PORTUGUESE');
define('IUP_SBH', 'SBH');
define('IUP_SBV', 'SBV');
define('IUP_IDLE_ACTION', 'IDLE_ACTION');
define('IUP_ACTION', 'ACTION');
define('IUP_GETFOCUS_CB', 'GETFOCUS_CB');
define('IUP_KILLFOCUS_CB', 'KILLFOCUS_CB');
define('IUP_K_ANY', 'K_ANY');
define('IUP_KEYPRESS_CB', 'KEYPRESS_CB');
define('IUP_HELP_CB', 'HELP_CB');
define('IUP_SCROLL_CB', 'SCROLL_CB');
define('IUP_RESIZE_CB', 'RESIZE_CB');
define('IUP_MOTION_CB', 'MOTION_CB');
define('IUP_BUTTON_CB', 'BUTTON_CB');
define('IUP_ENTERWINDOW_CB', 'ENTERWINDOW_CB');
define('IUP_LEAVEWINDOW_CB', 'LEAVEWINDOW_CB');
define('IUP_WHEEL_CB', 'WHEEL_CB');
define('IUP_MASK_CB', 'MASK_CB');
define('IUP_OPEN_CB', 'OPEN_CB');
define('IUP_HIGHLIGHT_CB', 'HIGHLIGHT_CB');
define('IUP_MENUCLOSE_CB', 'MENUCLOSE_CB');
define('IUP_MAP_CB', 'MAP_CB');
define('IUP_CLOSE_CB', 'CLOSE_CB');
define('IUP_SHOW_CB', 'SHOW_CB');
define('IUP_DROPFILES_CB', 'DROPFILES_CB');
define('IUP_WOM_CB', 'WOM_CB');
define('IUP_DIRECTION', 'DIRECTION');
define('IUP_ACTIVE', 'ACTIVE');
define('IUP_BGCOLOR', 'BGCOLOR');
define('IUP_FRAMECOLOR', 'FRAMECOLOR');
define('IUP_FGCOLOR', 'FGCOLOR');
define('IUP_COLOR', 'COLOR');
define('IUP_WID', 'WID');
define('IUP_SIZE', 'SIZE');
define('IUP_RASTERSIZE', 'RASTERSIZE');
define('IUP_TITLE', 'TITLE');
define('IUP_VALUE', 'VALUE');
define('IUP_VISIBLE', 'VISIBLE');
define('IUP_FONT', 'FONT');
define('IUP_TIP', 'TIP');
define('IUP_EXPAND', 'EXPAND');
define('IUP_SEPARATOR', 'SEPARATOR');
define('IUP_HOTSPOT', 'HOTSPOT');
define('IUP_HEIGHT', 'HEIGHT');
define('IUP_WIDTH', 'WIDTH');
define('IUP_KEY', 'KEY');
define('IUP_MULTIPLE', 'MULTIPLE');
define('IUP_DROPDOWN', 'DROPDOWN');
define('IUP_VISIBLE_ITEMS', 'VISIBLE_ITEMS');
define('IUP_MARGIN', 'MARGIN');
define('IUP_GAP', 'GAP');
define('IUP_ALIGNMENT', 'ALIGNMENT');
define('IUP_IMAGE', 'IMAGE');
define('IUP_IMINACTIVE', 'IMINACTIVE');
define('IUP_IMPRESS', 'IMPRESS');
define('IUP_WIN_SAVEBITS', 'WIN_SAVEBITS');
define('IUP_NC', 'NC');
define('IUP_MASK', 'MASK');
define('IUP_APPEND', 'APPEND');
define('IUP_BORDER', 'BORDER');
define('IUP_CARET', 'CARET');
define('IUP_SELECTION', 'SELECTION');
define('IUP_SELECTEDTEXT', 'SELECTEDTEXT');
define('IUP_INSERT', 'INSERT');
define('IUP_CONID', 'CONID');
define('IUP_CURSOR', 'CURSOR');
define('IUP_ICON', 'ICON');
define('IUP_MENUBOX', 'MENUBOX');
define('IUP_MINBOX', 'MINBOX');
define('IUP_MAXBOX', 'MAXBOX');
define('IUP_RESIZE', 'RESIZE');
define('IUP_MENU', 'MENU');
define('IUP_STARTFOCUS', 'STARTFOCUS');
define('IUP_PARENTDIALOG', 'PARENTDIALOG');
define('IUP_SHRINK', 'SHRINK');
define('IUP_DEFAULTENTER', 'DEFAULTENTER');
define('IUP_DEFAULTESC', 'DEFAULTESC');
define('IUP_X', 'X');
define('IUP_Y', 'Y');
define('IUP_TOOLBOX', 'TOOLBOX');
define('IUP_CONTROL', 'CONTROL');
define('IUP_READONLY', 'READONLY');
define('IUP_SCROLLBAR', 'SCROLLBAR');
define('IUP_POSY', 'POSY');
define('IUP_POSX', 'POSX');
define('IUP_DX', 'DX');
define('IUP_DY', 'DY');
define('IUP_XMAX', 'XMAX');
define('IUP_XMIN', 'XMIN');
define('IUP_YMAX', 'YMAX');
define('IUP_YMIN', 'YMIN');
define('IUP_RED', '255 0 0');
define('IUP_GREEN', '0 255 0');
define('IUP_BLUE', '0 0 255');
define('IUP_MIN', 'MIN');
define('IUP_MAX', 'MAX');
define('IUP_TIME', 'TIME');
define('IUP_DRAG', 'DRAG');
define('IUP_DROP', 'DROP');
define('IUP_REPAINT', 'REPAINT');
define('IUP_TOPMOST', 'TOPMOST');
define('IUP_CLIPCHILDREN', 'CLIPCHILDREN');
define('IUP_DIALOGTYPE', 'DIALOGTYPE');
define('IUP_FILE', 'FILE');
define('IUP_MULTIPLEFILES', 'MULTIPLEFILES');
define('IUP_FILTER', 'FILTER');
define('IUP_FILTERUSED', 'FILTERUSED');
define('IUP_FILTERINFO', 'FILTERINFO');
define('IUP_EXTFILTER', 'EXTFILTER');
define('IUP_DIRECTORY', 'DIRECTORY');
define('IUP_ALLOWNEW', 'ALLOWNEW');
define('IUP_NOOVERWRITEPROMPT', 'NOOVERWRITEPROMPT');
define('IUP_NOCHANGEDIR', 'NOCHANGEDIR');
define('IUP_FILEEXIST', 'FILEEXIST');
define('IUP_STATUS', 'STATUS');
define('IUP_LOCKLOOP', 'LOCKLOOP');
define('IUP_SYSTEM', 'SYSTEM');
define('IUP_DRIVER', 'DRIVER');
define('IUP_SCREENSIZE', 'SCREENSIZE');
define('IUP_SYSTEMLANGUAGE', 'SYSTEMLANGUAGE');
define('IUP_COMPUTERNAME', 'COMPUTERNAME');
define('IUP_USERNAME', 'USERNAME');
define('IUP_OPEN', 'OPEN');
define('IUP_SAVE', 'SAVE');
define('IUP_DIR', 'DIR');
define('IUP_HORIZONTAL', 'HORIZONTAL');
define('IUP_VERTICAL', 'VERTICAL');
define('IUP_YES', 'YES');
define('IUP_NO', 'NO');
define('IUP_ON', 'ON');
define('IUP_OFF', 'OFF');
define('IUP_ACENTER', 'ACENTER');
define('IUP_ALEFT', 'ALEFT');
define('IUP_ARIGHT', 'ARIGHT');
define('IUP_ATOP', 'ATOP');
define('IUP_ABOTTOM', 'ABOTTOM');
define('IUP_NORTH', 'NORTH');
define('IUP_SOUTH', 'SOUTH');
define('IUP_WEST', 'WEST');
define('IUP_EAST', 'EAST');
define('IUP_NE', 'NE');
define('IUP_SE', 'SE');
define('IUP_NW', 'NW');
define('IUP_SW', 'SW');
define('IUP_FULLSCREEN', 'FULLSCREEN');
define('IUP_FULL', 'FULL');
define('IUP_HALF', 'HALF');
define('IUP_THIRD', 'THIRD');
define('IUP_QUARTER', 'QUARTER');
define('IUP_EIGHTH', 'EIGHTH');
define('IUP_ARROW', 'ARROW');
define('IUP_BUSY', 'BUSY');
define('IUP_RESIZE_N', 'RESIZE_N');
define('IUP_RESIZE_S', 'RESIZE_S');
define('IUP_RESIZE_E', 'RESIZE_E');
define('IUP_RESIZE_W', 'RESIZE_W');
define('IUP_RESIZE_NE', 'RESIZE_NE');
define('IUP_RESIZE_NW', 'RESIZE_NW');
define('IUP_RESIZE_SE', 'RESIZE_SE');
define('IUP_RESIZE_SW', 'RESIZE_SW');
define('IUP_MOVE', 'MOVE');
define('IUP_HAND', 'HAND');
define('IUP_NONE', 'NONE');
define('IUP_IUP', 'IUP');
define('IUP_CROSS', 'CROSS');
define('IUP_PEN', 'PEN');
define('IUP_TEXT', 'TEXT');
define('IUP_RESIZE_C', 'RESIZE_C');
define('IUP_OPENHAND', 'OPENHAND');
define('IUP_K_exclam', 'K_exclam');
define('IUP_K_quotedbl', 'K_quotedbl');
define('IUP_K_numbersign', 'K_numbersign');
define('IUP_K_dollar', 'K_dollar');
define('IUP_K_percent', 'K_percent');
define('IUP_K_ampersand', 'K_ampersand');
define('IUP_K_quoteright', 'K_quoteright');
define('IUP_K_parentleft', 'K_parentleft');
define('IUP_K_parentright', 'K_parentright');
define('IUP_K_asterisk', 'K_asterisk');
define('IUP_K_plus', 'K_plus');
define('IUP_K_comma', 'K_comma');
define('IUP_K_minus', 'K_minus');
define('IUP_K_period', 'K_period');
define('IUP_K_slash', 'K_slash');
define('IUP_K_0', 'K_0');
define('IUP_K_1', 'K_1');
define('IUP_K_2', 'K_2');
define('IUP_K_3', 'K_3');
define('IUP_K_4', 'K_4');
define('IUP_K_5', 'K_5');
define('IUP_K_6', 'K_6');
define('IUP_K_7', 'K_7');
define('IUP_K_8', 'K_8');
define('IUP_K_9', 'K_9');
define('IUP_K_colon', 'K_colon');
define('IUP_K_semicolon', 'K_semicolon ');
define('IUP_K_less', 'K_less');
define('IUP_K_equal', 'K_equal');
define('IUP_K_greater', 'K_greater');
define('IUP_K_question', 'K_question');
define('IUP_K_at', 'K_at');
define('IUP_K_A', 'K_A');
define('IUP_K_B', 'K_B');
define('IUP_K_C', 'K_C');
define('IUP_K_D', 'K_D');
define('IUP_K_E', 'K_E');
define('IUP_K_F', 'K_F');
define('IUP_K_G', 'K_G');

0
src/globals/tests/bcmath.php → src/globals/ext-tests/bcmath.php
View File

0
src/globals/tests/bz2.php → src/globals/ext-tests/bz2.php
View File

0
src/globals/tests/calendar.php → src/globals/ext-tests/calendar.php
View File

0
src/globals/tests/curl.php → src/globals/ext-tests/curl.php
View File

0
src/globals/tests/dom.php → src/globals/ext-tests/dom.php
View File

0
src/globals/tests/filter.php → src/globals/ext-tests/filter.php
View File

0
src/globals/tests/gd.php → src/globals/ext-tests/gd.php
View File

0
src/globals/tests/gettext.php → src/globals/ext-tests/gettext.php
View File

0
src/globals/tests/intl.php → src/globals/ext-tests/intl.php
View File

0
src/globals/tests/openssl.php → src/globals/ext-tests/openssl.php
View File

0
src/globals/tests/parallel.php → src/globals/ext-tests/parallel.php
View File

0
src/globals/tests/redis.php → src/globals/ext-tests/redis.php
View File

0
src/globals/tests/swoole.php → src/globals/ext-tests/swoole.php
View File

0
src/globals/tests/uuid.php → src/globals/ext-tests/uuid.php
View File

0
src/globals/tests/zip.php → src/globals/ext-tests/zip.php
View File

0
src/globals/tests/zlib.php → src/globals/ext-tests/zlib.php
View File

89
src/globals/patch/spc_fix_libxml2_12_php80.patch Normal file
View File

@ -0,0 +1,89 @@
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 02522b50..6d1b0740 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -23,6 +23,7 @@
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
#include "php_dom.h"
#include <libxml/SAX.h>
+#include <libxml/xmlsave.h>
#ifdef LIBXML_SCHEMAS_ENABLED
#include <libxml/relaxng.h>
#include <libxml/xmlschemas.h>
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 73486ae2..59bd3d20 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -382,7 +382,7 @@ php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
if (encoding) {
char *end;
-
+
encoding += sizeof("charset=")-1;
if (*encoding == '"') {
encoding++;
@@ -481,7 +481,11 @@ static void _php_libxml_free_error(void *ptr)
xmlResetError((xmlErrorPtr) ptr);
}
-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
+#if LIBXML_VERSION >= 21200
+static void _php_list_set_error_structure(const xmlError *error, const char *msg)
+#else
+static void _php_list_set_error_structure(xmlError *error, const char *msg)
+#endif
{
xmlError error_copy;
int ret;
@@ -732,7 +736,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
va_end(args);
}
+#if LIBXML_VERSION >= 21200
+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error)
+#else
PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error)
+#endif
{
_php_list_set_error_structure(error, NULL);
@@ -1035,11 +1043,9 @@ PHP_FUNCTION(libxml_use_internal_errors)
/* {{{ Retrieve last error from libxml */
PHP_FUNCTION(libxml_get_last_error)
{
- xmlErrorPtr error;
-
ZEND_PARSE_PARAMETERS_NONE();
- error = xmlGetLastError();
+ const xmlError *error = xmlGetLastError();
if (error) {
object_init_ex(return_value, libxmlerror_class_entry);
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index d0ce7cec..02717417 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry;
#include "zend_smart_str.h"
#include <libxml/tree.h>
+#include <libxml/parser.h>
#define LIBXML_SAVE_NOEMPTYTAG 1<<2
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index e5e7f2f9..00b58b87 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -331,8 +331,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include)
sdl_restore_uri_credentials(ctx);
if (!wsdl) {
- xmlErrorPtr xmlErrorPtr = xmlGetLastError();
-
+ const xmlError *xmlErrorPtr = xmlGetLastError();
if (xmlErrorPtr) {
soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message);
} else {

55
src/globals/patch/spc_fix_libxml2_12_php81.patch Normal file
View File

@ -0,0 +1,55 @@
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 3959b362..6cdfbd39 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -483,7 +483,11 @@ static void _php_libxml_free_error(void *ptr)
xmlResetError((xmlErrorPtr) ptr);
}
-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
+#if LIBXML_VERSION >= 21200
+static void _php_list_set_error_structure(const xmlError *error, const char *msg)
+#else
+static void _php_list_set_error_structure(xmlError *error, const char *msg)
+#endif
{
xmlError error_copy;
int ret;
@@ -736,7 +740,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
va_end(args);
}
+#if LIBXML_VERSION >= 21200
+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error)
+#else
PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error)
+#endif
{
_php_list_set_error_structure(error, NULL);
@@ -1009,11 +1017,9 @@ PHP_FUNCTION(libxml_use_internal_errors)
/* {{{ Retrieve last error from libxml */
PHP_FUNCTION(libxml_get_last_error)
{
- xmlErrorPtr error;
-
ZEND_PARSE_PARAMETERS_NONE();
- error = xmlGetLastError();
+ const xmlError *error = xmlGetLastError();
if (error) {
object_init_ex(return_value, libxmlerror_class_entry);
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 651eab23..7a7ce304 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -332,7 +332,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include)
sdl_restore_uri_credentials(ctx);
if (!wsdl) {
- xmlErrorPtr xmlErrorPtr = xmlGetLastError();
+ const xmlError *xmlErrorPtr = xmlGetLastError();
if (xmlErrorPtr) {
soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message);

6
src/globals/test-extensions.php
View File

@ -13,6 +13,10 @@ declare(strict_types=1);
$zts = false;
$no_strip = false;
$upx = true;
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
$extensions = match (PHP_OS_FAMILY) {
'Linux', 'Darwin' => 'libxml',
@ -74,5 +78,7 @@ echo match ($argv[1]) {
'libs_cmd' => ($final_libs === '' ? '' : (' --with-libs=' . $final_libs)),
'cmd' => $final_extensions_cmd . ($final_libs === '' ? '' : (' --with-libs=' . $final_libs)),
'zts' => $zts ? '--enable-zts' : '',
'no_strip' => $no_strip ? '--no-strip' : '',
'upx' => $upx ? '--with-upx-pack' : '',
default => '',
};