Drop support for PHP 5.3 and 5.4

Author: danmichaelo

.travis.yml

@@ -1,16 +1,13 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
 
 before_script: 
  - echo 'date.timezone = "UTC"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - curl -sS https://getcomposer.org/installer | php
- - php composer.phar install --dev -o -n
+ - composer install -o -n
  - vendor/bin/phpunit --version
  - mkdir -p build/logs
 

composer.json

@@ -5,14 +5,15 @@
     "homepage": "http://github.com/scriptotek/sru-client",
     "keywords": ["sru"],
     "require": {
-        "danmichaelo/quitesimplexmlelement": ">=0.4.2",
-        "guzzle/guzzle": "~3.8"
+        "php" : "^5.5 || ^7.0",
+        "guzzlehttp/guzzle": "~6.0",
+        "danmichaelo/quitesimplexmlelement": ">=0.4.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*",
+        "phpunit/phpunit": "^4.8|^5.5",
         "satooshi/php-coveralls": "1.*",
-        "sami/sami": "1.4.*",
-        "mockery/mockery": "~0.9.4"
+        "sami/sami": "^3.3",
+        "mockery/mockery": "^0.9"
     },
     "license": "MIT",
     "authors": [
@@ -30,6 +31,5 @@
         "psr-4": {
             "Scriptotek\\Sru\\": "tests/"
         }
-    },
-    "minimum-stability": "dev"
+    }
 }

src/Client.php

@@ -1,6 +1,6 @@
 <?php namespace Scriptotek\Sru;
 
-use \Guzzle\Http\Client as HttpClient;
+use GuzzleHttp\Client as HttpClient;
 
 /**
  * SRU client
@@ -140,8 +140,8 @@ public function search($cql, $start = 1, $count = 10, $extraParams = array())
         $url = $this->urlTo($cql, $start, $count, $extraParams);
         $options = $this->getHttpOptions();
 
-        $res = $this->httpClient->get($url, $options)->send();
-        $body = $res->getBody(true);
+        $response = $this->httpClient->get($url, $options);
+        $body = (string) $response->getBody();
 
         return new SearchRetrieveResponse($body, $this);
     }
@@ -187,8 +187,8 @@ public function explain()
         ));
         $options = $this->getHttpOptions();
 
-        $res = $this->httpClient->get($url, $options)->send();
-        $body = $res->getBody(true);
+        $response = $this->httpClient->get($url, $options);
+        $body = (string) $response->getBody();
 
         return new ExplainResponse($body, $this);
     }

src/Records.php

@@ -70,8 +70,8 @@ private function fetchMore()
         $url = $this->client->urlTo($this->cql, $this->position, $this->count, $this->extraParams);
         $options = $this->client->getHttpOptions();
 
-        $res = $this->httpClient->get($url, $options)->send();
-        $body = $res->getBody(true);
+        $response = $this->httpClient->get($url, $options);
+        $body = (string) $response->getBody();
         $this->lastResponse = new SearchRetrieveResponse($body);
         $this->data = $this->lastResponse->records;
 

src/Response.php

@@ -127,11 +127,11 @@ protected function initializeFromText($text)
         $this->rawResponse = $text;
 
         // Throws Danmichaelo\QuiteSimpleXMLElement\InvalidXMLException on invalid xml
-        $this->response = QuiteSimpleXMLElement::make($text, [
+        $this->response = QuiteSimpleXMLElement::make($text, array(
             'srw' => 'http://www.loc.gov/zing/srw/',
             'exp' => 'http://explain.z3950.org/dtd/2.0/',
             'd' => 'http://www.loc.gov/zing/srw/diagnostic/',
-        ]);
+        ));
 
         $this->version = $this->response->text('/srw:*/srw:version');
 

src/SearchRetrieveResponse.php

@@ -6,7 +6,7 @@
 class SearchRetrieveResponse extends Response implements ResponseInterface
 {
     /** @var Record[] Array of records */
-    public $records = [];
+    public $records = array();
 
     /** @var int Total number of records in the result set */
     public $numberOfRecords = 0;

tests/ClientTest.php

@@ -1,6 +1,6 @@
 <?php namespace Scriptotek\Sru;
 
-use Guzzle\Http\Message\Response as HttpResponse;
+use GuzzleHttp\Psr7\Response as HttpResponse;
 use Mockery as m;
 
 class ClientTest extends TestCase
@@ -50,16 +50,11 @@ public function testSearchWithAuth()
     {
         $credentials = array('secretuser', 'secretpass');
 
-        $request = m::mock();
-        $request->shouldReceive('send')
-            ->once()
-            ->andReturn(new HttpResponse(200, array(), $this->simple_response));
-
         $http = m::mock();
         $http->shouldReceive('get')
             ->with(m::any(), m::subset(array('auth' => $credentials)))
             ->once()
-            ->andReturn($request);
+            ->andReturn(new HttpResponse(200, array(), $this->simple_response));
 
         $options = array(
             'credentials' => $credentials
@@ -74,10 +69,10 @@ public function testNext()
     {
         $cql = 'dc.title="Joda jada isjda"';
 
-        $request = m::mock();
-        $request->shouldReceive('send')
+        $http = m::mock();
+        $http->shouldReceive('get')
             ->once()
-            ->andReturn(new HttpResponse(200, null, '<?xml version="1.0" encoding="UTF-8" ?>
+            ->andReturn(new HttpResponse(200, array(), '<?xml version="1.0" encoding="UTF-8" ?>
               <srw:searchRetrieveResponse
                 xmlns:srw="http://www.loc.gov/zing/srw/"
                 xmlns:xcql="http://www.loc.gov/zing/cql/xcql/"
@@ -113,18 +108,13 @@ public function testNext()
               </srw:searchRetrieveResponse>
             '));
 
-        $http = m::mock();
-        $http->shouldReceive('get')
-            ->once()
-            ->andReturn($request);
-
         $sru = new Client($this->url, null, $http);
         $response = $sru->search($cql);
         $this->assertCount(2, $response->records);
 
-        $request->shouldReceive('send')
+        $http->shouldReceive('get')
             ->once()
-            ->andReturn(new HttpResponse(200, null, '<?xml version="1.0" encoding="UTF-8" ?>
+            ->andReturn(new HttpResponse(200, array(), '<?xml version="1.0" encoding="UTF-8" ?>
               <srw:searchRetrieveResponse
                 xmlns:srw="http://www.loc.gov/zing/srw/"
                 xmlns:xcql="http://www.loc.gov/zing/cql/xcql/"

tests/RecordTest.php

@@ -5,7 +5,7 @@ class RecordTest extends TestCase
 	public function testMake() {
 		$record = Record::make(29, 'Hello world');
 
-		$this->assertInstanceOf(Record::class, $record);
+		$this->assertInstanceOf('Scriptotek\Sru\Record', $record);
 		$this->assertEquals(29, $record->position);
 	}
 }

tests/TestCase.php

@@ -1,6 +1,6 @@
 <?php namespace Scriptotek\Sru;
 
-use Guzzle\Http\Message\Response as HttpResponse;
+use GuzzleHttp\Psr7\Response as HttpResponse;
 use Mockery as m;
 
 class TestCase extends \PHPUnit_Framework_TestCase
@@ -102,15 +102,10 @@ public function makeDummyResponse($numberOfRecords = 10, $options = array())
      */
     protected function httpMockSingleResponse($response)
     {
-        $request = m::mock();
-        $request->shouldReceive('send')
-            ->once()
-            ->andReturn(new HttpResponse(200, array(), $response));
-
         $http = m::mock();
         $http->shouldReceive('get')
             ->once()
-            ->andReturn($request);
+            ->andReturn(new HttpResponse(200, array(), $response));
 
         return $http;
     }
@@ -120,15 +115,11 @@ protected function httpMockSingleResponse($response)
      */
     protected function httpMockListResponse($responses)
     {
-        $request = m::mock();
-        $request->shouldReceive('send')
-            ->andReturnValues(array_map(function ($r) {
-                return new HttpResponse(200, null, $r);
-            }, $responses));
-
         $http = m::mock();
         $http->shouldReceive('get')
-            ->andReturn($request);
+            ->andReturnValues(array_map(function ($r) {
+                return new HttpResponse(200, array(), $r);
+            }, $responses));
 
         return $http;
     }