From da5b6aaf2b86ff8a4c6b2b39429cc2c759fd9e39 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 23 Sep 2025 15:46:07 +0800 Subject: [PATCH] * [misc] Add namespace by patch to avoid class conflict with the PclZip library. --- lib/composer.json | 6 +++++- lib/composer.lock | 2 +- lib/patches/pclzip-add-namespace.patch | 9 +++++++++ lib/pclzip/pclzip.class.php | 2 +- lib/vendor/composer/autoload_classmap.php | 2 +- lib/vendor/composer/autoload_psr4.php | 1 + lib/vendor/composer/autoload_static.php | 7 ++++++- lib/vendor/composer/installed.json | 5 +++++ lib/vendor/composer/installed.php | 4 ++-- lib/vendor/pclzip/pclzip/PATCHES.txt | 7 +++++++ lib/vendor/pclzip/pclzip/pclzip.lib.php | 2 ++ 11 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 lib/patches/pclzip-add-namespace.patch create mode 100644 lib/vendor/pclzip/pclzip/PATCHES.txt diff --git a/lib/composer.json b/lib/composer.json index bfb0554b5e..228e1441dd 100644 --- a/lib/composer.json +++ b/lib/composer.json @@ -40,12 +40,16 @@ }, "gorhill/php-fine-diff": { "Fix class reference to work with namespaces": "patches/finediff-fix-class-reference.patch" + }, + "pclzip/pclzip": { + "Add namespace to PclZip class": "patches/pclzip-add-namespace.patch" } } }, "autoload": { "psr-4": { - "Vendor\\Parsedown\\": "vendor/erusev/parsedown/" + "Vendor\\Parsedown\\": "vendor/erusev/parsedown/", + "Vendor\\PclZip\\": "vendor/pclzip/pclzip/" } } } diff --git a/lib/composer.lock b/lib/composer.lock index f4881ed84b..6c6a3c244c 100644 --- a/lib/composer.lock +++ b/lib/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "062e871a7ba56633ed9dffe989091156", + "content-hash": "83abc7ef74ef8728073b749391540ae6", "packages": [ { "name": "box/spout", diff --git a/lib/patches/pclzip-add-namespace.patch b/lib/patches/pclzip-add-namespace.patch new file mode 100644 index 0000000000..ea8981670e --- /dev/null +++ b/lib/patches/pclzip-add-namespace.patch @@ -0,0 +1,9 @@ +--- a/vendor/pclzip/pclzip/pclzip.lib.php ++++ b/vendor/pclzip/pclzip/pclzip.lib.php +@@ -1,4 +1,6 @@ + $vendorDir . '/composer/InstalledVersions.php', 'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', - 'PclZip' => $vendorDir . '/pclzip/pclzip/pclzip.lib.php', 'Requests' => $vendorDir . '/rmccue/requests/library/Requests.php', + 'Vendor\\PclZip\\PclZip' => $vendorDir . '/pclzip/pclzip/pclzip.lib.php', ); diff --git a/lib/vendor/composer/autoload_psr4.php b/lib/vendor/composer/autoload_psr4.php index 2daf1affa0..a23486866a 100644 --- a/lib/vendor/composer/autoload_psr4.php +++ b/lib/vendor/composer/autoload_psr4.php @@ -9,6 +9,7 @@ return array( 'phpseclib3\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'), 'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'), 'WpOrg\\Requests\\' => array($vendorDir . '/rmccue/requests/src'), + 'Vendor\\PclZip\\' => array($vendorDir . '/pclzip/pclzip'), 'Vendor\\Parsedown\\' => array($vendorDir . '/erusev/parsedown'), 'Symfony\\Component\\Finder\\' => array($vendorDir . '/symfony/finder'), 'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'), diff --git a/lib/vendor/composer/autoload_static.php b/lib/vendor/composer/autoload_static.php index 4c5050cea4..e659070a33 100644 --- a/lib/vendor/composer/autoload_static.php +++ b/lib/vendor/composer/autoload_static.php @@ -88,6 +88,7 @@ class ComposerStaticIniteb70fe9ec81c9f50588dedfb7a386792 ), 'V' => array ( + 'Vendor\\PclZip\\' => 14, 'Vendor\\Parsedown\\' => 17, ), 'S' => @@ -144,6 +145,10 @@ class ComposerStaticIniteb70fe9ec81c9f50588dedfb7a386792 array ( 0 => __DIR__ . '/..' . '/rmccue/requests/src', ), + 'Vendor\\PclZip\\' => + array ( + 0 => __DIR__ . '/..' . '/pclzip/pclzip', + ), 'Vendor\\Parsedown\\' => array ( 0 => __DIR__ . '/..' . '/erusev/parsedown', @@ -245,8 +250,8 @@ class ComposerStaticIniteb70fe9ec81c9f50588dedfb7a386792 public static $classMap = array ( 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', 'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', - 'PclZip' => __DIR__ . '/..' . '/pclzip/pclzip/pclzip.lib.php', 'Requests' => __DIR__ . '/..' . '/rmccue/requests/library/Requests.php', + 'Vendor\\PclZip\\PclZip' => __DIR__ . '/..' . '/pclzip/pclzip/pclzip.lib.php', ); public static function getInitializer(ClassLoader $loader) diff --git a/lib/vendor/composer/installed.json b/lib/vendor/composer/installed.json index 1552b4daf7..f0df600774 100644 --- a/lib/vendor/composer/installed.json +++ b/lib/vendor/composer/installed.json @@ -1105,6 +1105,11 @@ }, "time": "2014-06-05T11:42:24+00:00", "type": "library", + "extra": { + "patches_applied": { + "Add namespace to PclZip class": "patches/pclzip-add-namespace.patch" + } + }, "installation-source": "dist", "autoload": { "classmap": [ diff --git a/lib/vendor/composer/installed.php b/lib/vendor/composer/installed.php index 8a022fa5d4..d78ee95b47 100644 --- a/lib/vendor/composer/installed.php +++ b/lib/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'a25da45b71dd97cd376b604d92a798a231173c51', + 'reference' => '11f502ebbcf959c37faa8ad3fc93cc6326e60acd', 'name' => '__root__', 'dev' => true, ), @@ -16,7 +16,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'a25da45b71dd97cd376b604d92a798a231173c51', + 'reference' => '11f502ebbcf959c37faa8ad3fc93cc6326e60acd', 'dev_requirement' => false, ), 'box/spout' => array( diff --git a/lib/vendor/pclzip/pclzip/PATCHES.txt b/lib/vendor/pclzip/pclzip/PATCHES.txt new file mode 100644 index 0000000000..47741e5deb --- /dev/null +++ b/lib/vendor/pclzip/pclzip/PATCHES.txt @@ -0,0 +1,7 @@ +This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches) +Patches applied to this directory: + +Add namespace to PclZip class +Source: patches/pclzip-add-namespace.patch + + diff --git a/lib/vendor/pclzip/pclzip/pclzip.lib.php b/lib/vendor/pclzip/pclzip/pclzip.lib.php index 33be0d7869..c12ac44956 100644 --- a/lib/vendor/pclzip/pclzip/pclzip.lib.php +++ b/lib/vendor/pclzip/pclzip/pclzip.lib.php @@ -1,4 +1,6 @@