From fa2ea6cde65892cc9c4b125679384182e515b305 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 28 Nov 2025 10:19:04 +0100 Subject: [PATCH] Change patch definition for zf1-future --- composer.json | 10 +++++++--- composer.lock | 2 +- patches.lock.json | 17 +++++++++++++++++ patches/shardj-zf1-future.patch | 10 +++++----- 4 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 patches.lock.json diff --git a/composer.json b/composer.json index de98ad4..7ecc98c 100644 --- a/composer.json +++ b/composer.json @@ -71,9 +71,13 @@ "extra": { "composer-exit-on-patch-failure": true, "patches": { - "shardj/zf1-future": { - "ZF1-Future: ZF backward compatibility": "patches/shardj-zf1-future.patch" - } + "shardj/zf1-future": [ + { + "description": "ZF1-Future: ZF backward compatibility", + "url": "patches/shardj-zf1-future.patch", + "depth": 1 + } + ] } } } diff --git a/composer.lock b/composer.lock index cce82da..1da82df 100644 --- a/composer.lock +++ b/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": "eccdf60fd94e31fe356a5f6a7167e0e6", + "content-hash": "c461062cba9de4558284ee19a1a5687e", "packages": [ { "name": "brick/math", diff --git a/patches.lock.json b/patches.lock.json new file mode 100644 index 0000000..f757916 --- /dev/null +++ b/patches.lock.json @@ -0,0 +1,17 @@ +{ + "_hash": "1713a694c4f5c9dd242a51c083b66c36b9b4c363ed31c195999e391455d68afc", + "patches": { + "shardj/zf1-future": [ + { + "package": "shardj/zf1-future", + "description": "ZF1-Future: ZF backward compatibility", + "url": "patches/shardj-zf1-future.patch", + "sha256": "6abbcff07f33570cae8e022eee2859b28ac053e0574c32a7a45c5ee34680a034", + "depth": 1, + "extra": { + "provenance": "root" + } + } + ] + } +} diff --git a/patches/shardj-zf1-future.patch b/patches/shardj-zf1-future.patch index 0c38514..c144fb8 100644 --- a/patches/shardj-zf1-future.patch +++ b/patches/shardj-zf1-future.patch @@ -1,6 +1,6 @@ ---- a/vendor/shardj/zf1-future/library/Zend/Form/Element.php -+++ b/vendor/shardj/zf1-future/library/Zend/Form/Element.php -@@ -595,7 +595,7 @@ class Zend_Form_Element implements Zend_Validate_Interface +--- a/library/Zend/Form/Element.php ++++ b/library/Zend/Form/Element.php +@@ -601,7 +601,7 @@ class Zend_Form_Element implements Zend_Validate_Interface * @param string $key * @return void */ @@ -9,9 +9,9 @@ { foreach ($this->getFilters() as $filter) { $value = $filter->filter($value); -@@ -612,7 +612,9 @@ class Zend_Form_Element implements Zend_Validate_Interface +@@ -618,7 +618,9 @@ class Zend_Form_Element implements Zend_Validate_Interface $valueFiltered = $this->_value; - + if ($this->isArray() && is_array($valueFiltered)) { - array_walk_recursive($valueFiltered, [$this, '_filterValue']); + array_walk_recursive($valueFiltered, function (&$val, $key) {