summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-04 14:43:32 +0200
committerRemi Collet <remi@remirepo.net>2019-10-04 14:43:32 +0200
commit05d5fd11c0a828280fa0eb979472f3d617be712d (patch)
tree8775ee36481f0f22e9c2251f7235ebd9d3158979
parent7bb5e342325bdc63f2535fddcf0bce9d825f77e0 (diff)
- update to 2.14.3HEADmaster
- drop patch merged upstream
-rw-r--r--235.patch22
-rw-r--r--php-zendframework-zend-form.spec9
2 files changed, 5 insertions, 26 deletions
diff --git a/235.patch b/235.patch
deleted file mode 100644
index 1926da6..0000000
--- a/235.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 19d1ed9c335a1d9ea1ccf718f420444acb4ec277 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 4 Oct 2019 09:30:17 +0200
-Subject: [PATCH] fix Trying to access array offset on value of type null (7.4)
-
----
- src/Form.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Form.php b/src/Form.php
-index 035cd85b..3ee441c2 100644
---- a/src/Form.php
-+++ b/src/Form.php
-@@ -364,7 +364,7 @@ public function bindValues(array $values = [], array $validationGroup = null)
- $data = array_key_exists($this->baseFieldset->getName(), $data)
- ? $data[$this->baseFieldset->getName()]
- : [];
-- $this->object = $this->baseFieldset->bindValues($data, $validationGroup[$this->baseFieldset->getName()]);
-+ $this->object = $this->baseFieldset->bindValues($data, $validationGroup ? $validationGroup[$this->baseFieldset->getName()] : null);
- } else {
- $this->object = parent::bindValues($data, $validationGroup);
- }
diff --git a/php-zendframework-zend-form.spec b/php-zendframework-zend-form.spec
index 50ca144..3082e02 100644
--- a/php-zendframework-zend-form.spec
+++ b/php-zendframework-zend-form.spec
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.14.2
+Version: 2.14.3
Release: 1%{?dist}
Summary: Zend Framework %{library} component
@@ -29,8 +29,6 @@ URL: https://zendframework.github.io/%{gh_project}/
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
-Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-form/pull/235.patch
-
BuildArch: noarch
# Tests
%if %{with_tests}
@@ -178,7 +176,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
mv LICENSE.md LICENSE
@@ -257,6 +254,10 @@ exit $ret
%changelog
+* Fri Oct 4 2019 Remi Collet <remi@remirepo.net> - 2.14.3-1
+- update to 2.14.3
+- drop patch merged upstream
+
* Fri Oct 4 2019 Remi Collet <remi@remirepo.net> - 2.14.2-1
- update to 2.14.2
- add patch for PHP 7.4 from