diff options
author | Remi Collet <remi@remirepo.net> | 2023-11-27 07:23:29 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2023-11-27 07:23:29 +0100 |
commit | e7da80887e59308367d7bf6a102f88ffc0356967 (patch) | |
tree | 8fc88d989d529b66f508cc6ed08d92506b049c68 /pear-php82.patch | |
parent | 410352d8bda6cc88a9bc98719564d230cb10d3ac (diff) |
update to 1.10.14
drop patches merged upstream
Diffstat (limited to 'pear-php82.patch')
-rw-r--r-- | pear-php82.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/pear-php82.patch b/pear-php82.patch deleted file mode 100644 index b9f9ff8..0000000 --- a/pear-php82.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4217e3ea503ba6c0651ea2d182fb9cb88f21ce0b Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 20 Feb 2023 16:02:34 +0100 -Subject: [PATCH] Fix: Creation of dynamic property PEAR_Error::$callback is - deprecated - ---- - PEAR.php | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/PEAR.php b/PEAR.php -index fee6638f4..6dba3b010 100644 ---- a/PEAR.php -+++ b/PEAR.php -@@ -859,6 +859,7 @@ class PEAR_Error - var $message = ''; - var $userinfo = ''; - var $backtrace = null; -+ var $callback = null; - - /** - * PEAR_Error constructor -From 5a8e7eccdaa577af8ae816e60819c14669c33376 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 23 Nov 2023 10:46:14 +0100 -Subject: [PATCH] fix Using ${var} in strings is deprecated - ---- - PEAR/Installer.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/PEAR/Installer.php b/PEAR/Installer.php -index c6e4a99fc..e7f5ce107 100644 ---- a/PEAR/Installer.php -+++ b/PEAR/Installer.php -@@ -1271,7 +1271,7 @@ function install($pkgfile, $options = array()) - if (count($test)) { - $msg = "$channel/$pkgname: conflicting files found:\n"; - $longest = max(array_map("strlen", array_keys($test))); -- $fmt = "%${longest}s (%s)\n"; -+ $fmt = "%{$longest}s (%s)\n"; - foreach ($test as $file => $info) { - if (!is_array($info)) { - $info = array('pear.php.net', $info); |