From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 12 Jul 2017 21:45:05 +0000 (+0300)
Subject: backports update
X-Git-Tag: auto/th/php-ZendFramework-2.4.11-4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=0f5b6b4505be4ab6deff52c85f5d81c3901d4d2a;p=packages%2Fphp-ZendFramework.git

backports update

- fix MessageId having double brackets
- skip lazy-load for array as well
---

diff --git a/php-ZendFramework.spec b/php-ZendFramework.spec
index af058e7..9155ab2 100644
--- a/php-ZendFramework.spec
+++ b/php-ZendFramework.spec
@@ -9,7 +9,7 @@
 Summary:	Zend Framework 2
 Name:		php-ZendFramework
 Version:	2.4.11
-Release:	3
+Release:	4
 License:	BSD
 Group:		Development/Languages/PHP
 Source0:	https://packages.zendframework.com/releases/ZendFramework-%{version}/ZendFramework-%{version}.tgz
diff --git a/zf-mail-2.4-fixes.patch b/zf-mail-2.4-fixes.patch
index 7c80a7d..410b138 100644
--- a/zf-mail-2.4-fixes.patch
+++ b/zf-mail-2.4-fixes.patch
@@ -535,3 +535,64 @@ index c05cde1b..eac2bf9f 100644
       * @param $index
       * @return mixed
       */
+
+commit c3ac503689ffd00ac51e43c97c311e8753ecd32c
+Author: Elan Ruusamäe <glen@delfi.ee>
+Date:   Tue Jun 13 00:54:18 2017 +0300
+
+    fix MessageId having double brackets
+    
+    this got broken from pull/86 when header lazyloading was omitted
+
+diff --git a/src/Header/MessageId.php b/src/Header/MessageId.php
+index 850757ea..03c52a75 100644
+--- a/src/Header/MessageId.php
++++ b/src/Header/MessageId.php
+@@ -27,7 +27,7 @@ class MessageId implements HeaderInterface
+         }
+ 
+         $header = new static();
+-        $header->setId($value);
++        $header->setId(trim($value, '<>'));
+ 
+         return $header;
+     }
+
+commit 63ac228e6f883ed8e26a7b8a02130348e2332edf
+Author: Elan Ruusamäe <glen@delfi.ee>
+Date:   Wed Jun 28 00:19:11 2017 +0300
+
+    skip lazy-load for array as well
+    
+    refs:
+    - a4a93ef0
+    - ddf2e8ec
+    
+    this should be sent upstream, but upstream doesn't seem to respond even
+    to trivial pull-requests.
+
+diff --git a/src/Headers.php b/src/Headers.php
+index eac2bf9f..d4f9a9e7 100644
+--- a/src/Headers.php
++++ b/src/Headers.php
+@@ -207,9 +207,6 @@ class Headers implements Countable, Iterator
+     /**
+      * Add a raw header line, either in name => value, or as a single string 'name: value'
+      *
+-     * This method allows for lazy-loading in that the parsing and instantiation of HeaderInterface object
+-     * will be delayed until they are retrieved by either get() or current()
+-     *
+      * @throws Exception\InvalidArgumentException
+      * @param  string $headerFieldNameOrLine
+      * @param  string $fieldValue optional
+@@ -238,7 +235,9 @@ class Headers implements Countable, Iterator
+                 $this->addHeader(Header\GenericMultiHeader::fromString($headerFieldNameOrLine . ':' . $i));
+             }
+         } else {
+-            $this->addHeader(Header\GenericHeader::fromString($headerFieldNameOrLine . ':' . $fieldValue));
++            $class = $this->getPluginClassLoader()->load($headerFieldNameOrLine) ?: Header\GenericHeader::class;
++            $header = $class::fromString($headerFieldNameOrLine . ':' . $fieldValue);
++            $this->addHeader($header);
+         }
+ 
+         return $this;