From 26ea6c2d45ecf219ad6fb7026797476a0a471b50 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 11 Mar 2019 09:56:13 -0400 Subject: [PATCH 1/2] Add new lines to end of header in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guzzle had a BC break between minor versions throwing an exception if a header wasn’t passed without ending delimiters. --- tests/unit/Handshake/ServerNegotiatorTest.php | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/tests/unit/Handshake/ServerNegotiatorTest.php b/tests/unit/Handshake/ServerNegotiatorTest.php index 1d97c3c..6fa8e64 100644 --- a/tests/unit/Handshake/ServerNegotiatorTest.php +++ b/tests/unit/Handshake/ServerNegotiatorTest.php @@ -19,7 +19,9 @@ Upgrade-Insecure-Requests: 1 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 Accept-Encoding: gzip, deflate, sdch, br -Accept-Language: en-US,en;q=0.8'; +Accept-Language: en-US,en;q=0.8 + +'; $request = \GuzzleHttp\Psr7\parse_request($requestText); @@ -46,7 +48,9 @@ Upgrade-Insecure-Requests: 1 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 Accept-Encoding: gzip, deflate, sdch, br -Accept-Language: en-US,en;q=0.8'; +Accept-Language: en-US,en;q=0.8 + +'; $request = \GuzzleHttp\Psr7\parse_request($requestText); @@ -71,7 +75,9 @@ Upgrade-Insecure-Requests: 1 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 Accept-Encoding: gzip, deflate, sdch, br -Accept-Language: en-US,en;q=0.8'; +Accept-Language: en-US,en;q=0.8 + +'; $request = \GuzzleHttp\Psr7\parse_request($requestText); @@ -96,7 +102,9 @@ Upgrade-Insecure-Requests: 1 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 Accept-Encoding: gzip, deflate, sdch, br -Accept-Language: en-US,en;q=0.8'; +Accept-Language: en-US,en;q=0.8 + +'; $request = \GuzzleHttp\Psr7\parse_request($requestText); @@ -128,7 +136,9 @@ Upgrade-Insecure-Requests: 1 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 Accept-Encoding: gzip, deflate, sdch, br -Accept-Language: en-US,en;q=0.8'; +Accept-Language: en-US,en;q=0.8 + +'; $request = \GuzzleHttp\Psr7\parse_request($requestText); @@ -160,7 +170,9 @@ Upgrade-Insecure-Requests: 1 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 Accept-Encoding: gzip, deflate, sdch, br -Accept-Language: en-US,en;q=0.8'; +Accept-Language: en-US,en;q=0.8 + +'; $request = \GuzzleHttp\Psr7\parse_request($requestText); @@ -202,4 +214,4 @@ Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits $this->assertEquals('websocket', $response->getHeaderLine('Upgrade')); $this->assertEquals('someproto', $response->getHeaderLine('Sec-WebSocket-Protocol')); } -} \ No newline at end of file +} From acc1d28f0ad32258b4374364d9c1df977f5687c0 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 11 Mar 2019 10:03:22 -0400 Subject: [PATCH 2/2] Remove hhvm from testing --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea480f5..09125d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ php: - 7.0 - 7.1 - 7.2 - - hhvm before_install: - export PATH=$HOME/.local/bin:$PATH