From ee11a80488019a46fe80170fadc440c58b4f478c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 20 Jul 2022 11:41:16 +0200
Subject: update to 2.18.1

---
 php-laminas-inputfilter-upstream.patch | 60 ----------------------------------
 php-laminas-inputfilter.spec           | 12 +++----
 2 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100644 php-laminas-inputfilter-upstream.patch

diff --git a/php-laminas-inputfilter-upstream.patch b/php-laminas-inputfilter-upstream.patch
deleted file mode 100644
index 4372c4c..0000000
--- a/php-laminas-inputfilter-upstream.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From e9c3c54e894f623357fdf4a902250d2e86cf3def Mon Sep 17 00:00:00 2001
-From: Marco Pivetta <ocramius@gmail.com>
-Date: Wed, 20 Jul 2022 10:10:24 +0200
-Subject: [PATCH] Adjusted tests so that stubbed `ContainerInterface#has()`
- returns `bool` instead of `null`
-
-This is necessary, as `psr/container:^2` has a stricter return type declaration, and prophecy is
-not respecting the return types upfront (unless stubbed methods are explicitly configured).
-
-While this is an upstream BC break in `psr/container:^2`, this component is not really affected
-by the BC issue, other than some stubbing being broken in it.
-
-Fixes:
-
-```
-1) LaminasTest\InputFilter\InputFilterPluginManagerFactoryTest::testFactoryConfiguresPluginManagerUnderContainerInterop with data set "input" ('Laminas\InputFilter\InputInterface')
-TypeError: Double\ContainerInterface\P8::has(): Return value must be of type bool, null returned
-2) LaminasTest\InputFilter\InputFilterPluginManagerFactoryTest::testFactoryConfiguresPluginManagerUnderContainerInterop with data set "input-filter" ('Laminas\InputFilter\InputFilt...erface')
-TypeError: Double\ContainerInterface\P8::has(): Return value must be of type bool, null returned
-```
-
-Ref: https://github.com/laminas/laminas-servicemanager/issues/146#issue-1310587609
-Ref: https://github.com/laminas/laminas-servicemanager/issues/146#issuecomment-1189956888
----
- test/InputFilterPluginManagerFactoryTest.php | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/test/InputFilterPluginManagerFactoryTest.php b/test/InputFilterPluginManagerFactoryTest.php
-index a1f5203..afbfbe9 100644
---- a/test/InputFilterPluginManagerFactoryTest.php
-+++ b/test/InputFilterPluginManagerFactoryTest.php
-@@ -18,7 +18,7 @@ class InputFilterPluginManagerFactoryTest extends TestCase
- 
-     public function testFactoryReturnsPluginManager(): void
-     {
--        $container = $this->prophesize(ContainerInterface::class)->reveal();
-+        $container = $this->createMock(ContainerInterface::class);
-         $factory   = new InputFilterPluginManagerFactory();
- 
-         $filters = $factory($container, InputFilterPluginManagerFactory::class);
-@@ -46,8 +46,8 @@ public function pluginProvider(): array
-      */
-     public function testFactoryConfiguresPluginManagerUnderContainerInterop(string $pluginType): void
-     {
--        $container = $this->prophesize(ContainerInterface::class)->reveal();
--        $plugin    = $this->prophesize($pluginType)->reveal();
-+        $container = $this->createMock(ContainerInterface::class);
-+        $plugin    = $this->createMock($pluginType);
- 
-         $factory = new InputFilterPluginManagerFactory();
-         $filters = $factory($container, InputFilterPluginManagerFactory::class, [
-@@ -60,7 +60,7 @@ public function testFactoryConfiguresPluginManagerUnderContainerInterop(string $
- 
-     public function testConfiguresInputFilterServicesWhenFound(): void
-     {
--        $inputFilter = $this->prophesize(InputFilterInterface::class)->reveal();
-+        $inputFilter = $this->createMock(InputFilterInterface::class);
-         $config      = [
-             'input_filters' => [
-                 'aliases'   => [
diff --git a/php-laminas-inputfilter.spec b/php-laminas-inputfilter.spec
index 5e6399f..a83d200 100644
--- a/php-laminas-inputfilter.spec
+++ b/php-laminas-inputfilter.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    8c663d35926f8276b4bf1a2c571310eb285f80cb
+%global gh_commit    9b0c514b5807c964cd1121bb1f31bb894a923219
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-inputfilter
@@ -22,8 +22,8 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.18.0
-Release:        2%{?dist}
+Version:        2.18.1
+Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
 License:        BSD
@@ -31,8 +31,6 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-Patch0:         %{name}-upstream.patch
-
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -125,7 +123,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -209,6 +206,9 @@ exit $ret
 %{php_home}/%{namespace}/%{library}
 
 %changelog
+* Wed Jul 20 2022 Remi Collet <remi@remirepo.net> - 2.18.1-1
+- update to 2.18.1
+
 * Wed Jul 20 2022 Remi Collet <remi@remirepo.net> - 2.18.0-2
 - fix FTBFS, using upstream patch for test suite
 
-- 
cgit