From bfd0d7015e91bb84b54655ef5f44bb0216103703 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 18 Nov 2025 14:20:49 +0800 Subject: [PATCH] * [misc] Fix non-numeric value encountered error by patch of the PclZip library. --- lib/composer.json | 3 ++- lib/patches/pclzip-memory-limit-fix.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lib/patches/pclzip-memory-limit-fix.patch diff --git a/lib/composer.json b/lib/composer.json index cd8bd10fd4..015dbfa579 100644 --- a/lib/composer.json +++ b/lib/composer.json @@ -54,7 +54,8 @@ "Add namespace to Spyc class": "patches/spyc-add-namespace.patch" }, "pclzip/pclzip": { - "Add namespace to PclZip class": "patches/pclzip-add-namespace.patch" + "Add namespace to PclZip class": "patches/pclzip-add-namespace.patch", + "Fix memory limit calculation in privOptionDefaultThreshold method": "patches/pclzip-memory-limit-fix.patch" }, "phpoffice/phpspreadsheet": { "Add timezone helper methods to Date class": "patches/phpspreadsheet-add-timezone-helpers.patch", diff --git a/lib/patches/pclzip-memory-limit-fix.patch b/lib/patches/pclzip-memory-limit-fix.patch new file mode 100644 index 0000000000..24ce2cdbfa --- /dev/null +++ b/lib/patches/pclzip-memory-limit-fix.patch @@ -0,0 +1,12 @@ +diff --git a/vendor/pclzip/pclzip/pclzip.lib.php b/vendor/pclzip/pclzip/pclzip.lib.php +index 11b7e552199..37f19d23b9d 100644 +--- a/vendor/pclzip/pclzip/pclzip.lib.php ++++ b/vendor/pclzip/pclzip/pclzip.lib.php +@@ -1789,6 +1789,7 @@ class PclZip + $v_memory_limit = ini_get('memory_limit'); + $v_memory_limit = trim($v_memory_limit); + $last = strtolower(substr($v_memory_limit, -1)); ++ $v_memory_limit = (float)$v_memory_limit; + + if ($last == 'g') { + //$v_memory_limit = $v_memory_limit*1024*1024*1024;