[php-guzzlehttp-guzzle] Upstream patch for PHP behavior change, thanks Koschei

[Remi Collet]

commit 2ebfdff8bf87ed14ffcaadd237f4ff94b94d04ac
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Jan 12 07:55:37 2015 +0100

    Upstream patch for PHP behavior change, thanks Koschei

 php-guzzlehttp-guzzle-upstream.patch |   21 +++++++++++++++++++++
 php-guzzlehttp-guzzle.spec           |    7 +++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/php-guzzlehttp-guzzle-upstream.patch b/php-guzzlehttp-guzzle-upstream.patch
new file mode 100644
index 0000000..efbbdd7
--- /dev/null
+++ b/php-guzzlehttp-guzzle-upstream.patch
@@ -0,0 +1,21 @@
+From d86e62bee6d245e6acebbd7d162247a7f8e04d52 Mon Sep 17 00:00:00 2001
+From: Michael Dowling <mtdowling at gmail.com>
+Date: Sun, 11 Jan 2015 14:23:16 -0800
+Subject: [PATCH] Removing extra check because PHP is broken
+
+---
+ tests/Post/PostBodyTest.php | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/Post/PostBodyTest.php b/tests/Post/PostBodyTest.php
+index 308f5e0..0283a5e 100644
+--- a/tests/Post/PostBodyTest.php
++++ b/tests/Post/PostBodyTest.php
+@@ -130,7 +130,6 @@ public function testConvertsFieldsToQueryStyleBody()
+         $b->seek(0);
+         $this->assertEquals('foo=bar&baz=123', $b->read(1000));
+         $this->assertEquals(15, $b->tell());
+-        $this->assertTrue($b->eof());
+     }
+ 
+     public function testCanSpecifyQueryAggregator()
diff --git a/php-guzzlehttp-guzzle.spec b/php-guzzlehttp-guzzle.spec
index 21ef725..ead53fb 100644
--- a/php-guzzlehttp-guzzle.spec
+++ b/php-guzzlehttp-guzzle.spec
@@ -39,6 +39,8 @@ License:       MIT
 URL:           http://guzzlephp.org
 Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
 
+Patch0:        %{name}-upstream.patch
+
 BuildArch:     noarch
 %if %{with_tests}
 # For tests
@@ -99,6 +101,8 @@ the pain out of consuming web services.
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
+%patch0 -p1
+
 # Remove bundled cert
 rm -f src/cacert.pem
 sed "s#__DIR__ . '/cacert.pem'#'%{_sysconfdir}/pki/tls/cert.pem'#" \
@@ -159,6 +163,9 @@ sed 's/colors\s*=\s*"true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
 
 %changelog
+* Mon Jan 12 2015 Remi Collet <remi at fedoraproject.org> - 4.1.8-3
+- Upstream patch for PHP behavior change, thanks Koschei
+
 * Tue Aug 26 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 4.1.8-2
 - Fix test suite when previous version installed