This commit is contained in:
Remi Collet 2023-11-13 08:13:44 +01:00
parent a5b82734e3
commit 936dd38752
5 changed files with 7 additions and 73 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ clog
/apcu-5.1.20.tgz /apcu-5.1.20.tgz
/apcu-5.1.21.tgz /apcu-5.1.21.tgz
/apcu-5.1.22.tgz /apcu-5.1.22.tgz
/apcu-5.1.23.tgz

View File

@ -1,15 +0,0 @@
diff --git a/tests/typed_prop.phpt b/tests/typed_prop.phpt
index 80f0d3c..04e87c9 100644
--- a/tests/typed_prop.phpt
+++ b/tests/typed_prop.phpt
@@ -28,8 +28,8 @@ try {
var_dump($test->array);
?>
---EXPECT--
+--EXPECTF--
bool(true)
-Cannot assign bool to reference held by property Test::$array of type array
+Cannot assign %s to reference held by property Test::$array of type array
array(0) {
}

View File

@ -1,49 +0,0 @@
From 22a39fe4cb2db46aaf660ef2f724b4cd813d2481 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 6 Jun 2023 11:08:10 +0200
Subject: [PATCH] use TEST_PHP_ARGS if set
---
tests/server_test.inc | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/tests/server_test.inc b/tests/server_test.inc
index 88c7045..5e60f47 100644
--- a/tests/server_test.inc
+++ b/tests/server_test.inc
@@ -16,6 +16,7 @@ function server_start_one($host, $port, $code = 'echo "Hello world";', $php_opts
global $doc_root, $router, $handles, $ports;
$php_executable = getenv('TEST_PHP_EXECUTABLE');
+ $php_args = getenv('TEST_PHP_ARGS');
$descriptorspec = array(
0 => STDIN,
@@ -23,16 +24,18 @@ function server_start_one($host, $port, $code = 'echo "Hello world";', $php_opts
2 => STDERR,
);
- $ext = (substr(PHP_OS, 0, 3) == 'WIN') ? 'php_apcu.dll' : 'apcu.so';
- if (substr(PHP_OS, 0, 3) == 'WIN') {
- $part0 = 8 == PHP_INT_SIZE ? "x64" : "";
- $part1 = ZEND_DEBUG_BUILD ? "Debug" : "Release";
- $part1 = PHP_ZTS ? ($part1 . "_TS") : $part1;
- $php_args = "-d extension_dir=$doc_root/../$part0/$part1";
- } else {
- $php_args = "-d extension_dir=$doc_root/../modules";
+ if (!$php_args) {
+ $ext = (substr(PHP_OS, 0, 3) == 'WIN') ? 'php_apcu.dll' : 'apcu.so';
+ if (substr(PHP_OS, 0, 3) == 'WIN') {
+ $part0 = 8 == PHP_INT_SIZE ? "x64" : "";
+ $part1 = ZEND_DEBUG_BUILD ? "Debug" : "Release";
+ $part1 = PHP_ZTS ? ($part1 . "_TS") : $part1;
+ $php_args = "-d extension_dir=$doc_root/../$part0/$part1";
+ } else {
+ $php_args = "-d extension_dir=$doc_root/../modules";
+ }
+ $php_args = "$php_args -d extension=$ext";
}
- $php_args = "$php_args -d extension=$ext";
if ($php_opts) {
$php_args = "$php_args -d " . implode(' -d ', $php_opts);;

View File

@ -15,16 +15,13 @@
Name: php-pecl-apcu Name: php-pecl-apcu
Summary: APC User Cache Summary: APC User Cache
Version: 5.1.22 Version: 5.1.23
Release: 6%{?dist} Release: 1%{?dist}
Source0: https://pecl.php.net/get/%{sources}.tgz Source0: https://pecl.php.net/get/%{sources}.tgz
Source1: %{pecl_name}.ini Source1: %{pecl_name}.ini
Source2: %{pecl_name}-panel.conf Source2: %{pecl_name}-panel.conf
Source3: %{pecl_name}.conf.php Source3: %{pecl_name}.conf.php
Patch0: %{pecl_name}-php83.patch
Patch1: %{pecl_name}-tests.patch
License: PHP-3.01 License: PHP-3.01
URL: https://pecl.php.net/package/APCu URL: https://pecl.php.net/package/APCu
@ -85,9 +82,6 @@ configuration, available on http://localhost/apcu-panel/
sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
cd %{sources} cd %{sources}
%patch -P0 -p1 -b.php83
%patch -P1 -p1 -b.pr490
# Sanity check, really often broken # Sanity check, really often broken
extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h) extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h)
if test "x${extver}" != "x%{version}"; then if test "x${extver}" != "x%{version}"; then
@ -215,6 +209,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
%changelog %changelog
* Mon Nov 13 2023 Remi Collet <remi@remirepo.net> - 5.1.23-1
- update to 5.1.23
* Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 5.1.22-6 * Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 5.1.22-6
- rebuild for https://fedoraproject.org/wiki/Changes/php83 - rebuild for https://fedoraproject.org/wiki/Changes/php83
- build out of sources tree - build out of sources tree

View File

@ -1 +1 @@
SHA512 (apcu-5.1.22.tgz) = 8f2f4292679bc359ea680ecaf397d69de32bf67d57d719a4839a026ab1b96d5ec4725e92c5c0d1972a117a7cd3d3c456a1f4ec03192fda4657e685de60b9e93e SHA512 (apcu-5.1.23.tgz) = 89e9f10f5d8d1a9503132e80140680be2a10d96f957f69b2f77cc1c496d15cc26dfe4c0368ebe46c72c68d1b4a794d3ddc95942b02d3ba5e8c971b09969058d8