php-guzzlehttp-guzzle6: pull Fedora changes

2 files changed, 81 insertions, 1 deletions

diff --git a/php-guzzlehttp-guzzle6-0d082d5714082d5c9e414e076507e883ccbf9f96.patch b/php-guzzlehttp-guzzle6-0d082d5714082d5c9e414e076507e883ccbf9f96.patch
new file mode 100644
index 0000000..30483b1
--- /dev/null
+++ b/php-guzzlehttp-guzzle6-0d082d5714082d5c9e414e076507e883ccbf9f96.patch
@@ -0,0 +1,69 @@
+From 0d082d5714082d5c9e414e076507e883ccbf9f96 Mon Sep 17 00:00:00 2001
+From: Michael Dowling <mtdowling@gmail.com>
+Date: Sun, 8 May 2016 12:28:38 -0700
+Subject: [PATCH] Fixing broken test. Closes #1470
+
+---
+ src/Client.php                    |  8 ++++++++
+ tests/ClientTest.php              |  9 +++++++++
+ tests/Handler/CurlFactoryTest.php | 10 ----------
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/src/Client.php b/src/Client.php
+index 9f7b0cf..2c62438 100644
+--- a/src/Client.php
++++ b/src/Client.php
+@@ -363,6 +363,14 @@ private function applyOptions(RequestInterface $request, array &$options)
+             unset($options['json']);
+         }
+ 
++        // Ensure that sink is not an invalid value.
++        if (isset($options['sink'])) {
++            // TODO: Add more sink validation?
++            if (is_bool($options['sink'])) {
++                throw new \InvalidArgumentException('sink must not be a boolean');
++            }
++        }
++
+         $request = Psr7\modify_request($request, $modify);
+         if ($request->getBody() instanceof Psr7\MultipartStream) {
+             // Use a multipart/form-data POST if a Content-Type is not set.
+diff --git a/tests/ClientTest.php b/tests/ClientTest.php
+index afcad08..ac12f65 100644
+--- a/tests/ClientTest.php
++++ b/tests/ClientTest.php
+@@ -615,4 +615,13 @@ public function testSendSendsWithDomainAndHostHeaderInRequestTheHostShouldBePres
+         $this->assertEquals('foo.com', $mockHandler->getLastRequest()->getHeader('Host')[0]);
+     }
+ 
++    /**
++     * @expectedException \InvalidArgumentException
++     */
++    public function testValidatesSink()
++    {
++        $mockHandler = new MockHandler([new Response(200)]);
++        $client = new Client(['handler' => $mockHandler]);
++        $client->get('http://test.com', ['sink' => true]);
++    }
+ }
+diff --git a/tests/Handler/CurlFactoryTest.php b/tests/Handler/CurlFactoryTest.php
+index a3baaba..eb59848 100644
+--- a/tests/Handler/CurlFactoryTest.php
++++ b/tests/Handler/CurlFactoryTest.php
+@@ -355,16 +355,6 @@ public function testProtocolVersion()
+         $this->assertEquals(CURL_HTTP_VERSION_1_0, $_SERVER['_curl'][CURLOPT_HTTP_VERSION]);
+     }
+ 
+-    /**
+-     * @expectedException \InvalidArgumentException
+-     */
+-    public function testValidatesSink()
+-    {
+-        $handler = new Handler\CurlMultiHandler();
+-        $request = new Psr7\Request('GET', Server::$url);
+-        $handler($request, ['sink' => true]);
+-    }
+-
+     public function testSavesToStream()
+     {
+         $stream = fopen('php://memory', 'r+');
diff --git a/php-guzzlehttp-guzzle6.spec b/php-guzzlehttp-guzzle6.spec
index 445dc3b..3aa5070 100644
--- a/php-guzzlehttp-guzzle6.spec
+++ b/php-guzzlehttp-guzzle6.spec
@@ -44,7 +44,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}6
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}.1
+Release:       3%{?github_release}%{?dist}
 Summary:       PHP HTTP client library
 
 Group:         Development/Libraries
@@ -56,6 +56,11 @@ URL:           http://guzzlephp.org
 Source0:       %{name}-%{github_version}-%{github_commit}.tar.gz
 Source1:       %{name}-get-source.sh
 
+# Fixing failing test
+# https://github.com/guzzle/guzzle/issues/1470
+# https://github.com/guzzle/guzzle/commit/0d082d5714082d5c9e414e076507e883ccbf9f96
+Patch0:        %{name}-0d082d5714082d5c9e414e076507e883ccbf9f96.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 # Tests
@@ -131,6 +136,9 @@ Autoloader: %{phpdir}/GuzzleHttp6/autoload.php
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
+: Fix failing test
+%patch0 -p1
+
 
 %build
 : Create common autoloader
@@ -210,6 +218,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun May 29 2016 Shawn Iwinski <shawn@iwin.ski> - 6.2.0-3
+- Fix failing test
+
 * Fri Apr 15 2016 Remi Collet <remi@remirepo.net> - 6.2.0-2.1
 - fix dep. on EL-5