summaryrefslogtreecommitdiffstats
path: root/134.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-01-26 18:02:43 +0100
committerRemi Collet <remi@remirepo.net>2021-01-26 18:02:43 +0100
commit74c0cdd49966c8f333dce9cf62db0fef60f23ca4 (patch)
tree1230aaec25a8d16f1f10aa5a67b037405f7f8eb5 /134.patch
parent555f5288c5bf58492e4b0d244852ae1fa096cc67 (diff)
update to 2.13.0
raise dependency on PHP 7.3 add patch for PHP 8 from https://github.com/laminas/laminas-mail/pull/134 switch to phpunit9
Diffstat (limited to '134.patch')
-rw-r--r--134.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/134.patch b/134.patch
new file mode 100644
index 0000000..db8475d
--- /dev/null
+++ b/134.patch
@@ -0,0 +1,51 @@
+From b5e38613811824a6d1b3d1993f37de422087ac6f Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 26 Jan 2021 17:42:09 +0100
+Subject: [PATCH 1/2] fix TypeError: fclose(): supplied resource is not a valid
+ stream resource
+
+---
+ src/Storage/Mbox.php | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Storage/Mbox.php b/src/Storage/Mbox.php
+index 3e48a6c6..52f6bcfe 100644
+--- a/src/Storage/Mbox.php
++++ b/src/Storage/Mbox.php
+@@ -308,7 +308,9 @@ protected function openMboxFile($filename)
+ public function close()
+ {
+ ErrorHandler::start(E_WARNING);
+- fclose($this->fh);
++ if (is_resource($this->fh)) {
++ fclose($this->fh);
++ }
+ ErrorHandler::stop();
+ $this->positions = [];
+ }
+
+From fd62569b1065b85eadad627e0556376e1696da97 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 26 Jan 2021 17:54:35 +0100
+Subject: [PATCH 2/2] clean uneeded stuff
+
+---
+ src/Storage/Mbox.php | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/Storage/Mbox.php b/src/Storage/Mbox.php
+index 52f6bcfe..c8f16d6e 100644
+--- a/src/Storage/Mbox.php
++++ b/src/Storage/Mbox.php
+@@ -307,11 +307,9 @@ protected function openMboxFile($filename)
+ */
+ public function close()
+ {
+- ErrorHandler::start(E_WARNING);
+ if (is_resource($this->fh)) {
+ fclose($this->fh);
+ }
+- ErrorHandler::stop();
+ $this->positions = [];
+ }
+