Update phpunit and remove support for PHP 5.6 and 7.0

PHPUnit 6 introduced namespaces, so we cannot maintain a single testset that works both with PHPUnit 5 and PHPUnit 6+. Since both PHPUnit 5 and PHP 5 have now reached end-of-life, it's time to move on.

The sru-client library might still work on older PHP versions, but official support is removed since it cannot be automatically tested anymore.

Author: danmichaelo

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
+  - 7.2
+  - 7.3
 
 before_script:
  - echo 'date.timezone = "UTC"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

composer.json

@@ -5,7 +5,7 @@
     "homepage": "http://github.com/scriptotek/sru-client",
     "keywords": ["sru"],
     "require": {
-        "php" : "^5.6 || ^7.0",
+        "php" : "^7.1",
         "danmichaelo/quitesimplexmlelement": "^1.0",
         "php-http/client-implementation": "^1.0",
         "php-http/httplug": "^1.1",
@@ -14,7 +14,7 @@
         "php-http/client-common": "^1.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.5",
+        "phpunit/phpunit": "^7.0 || ^8.0",
         "sami/sami": "^3.3",
         "php-http/mock-client": "^1.0",
         "php-http/message": "^1.0",

tests/RecordsTest.php

@@ -32,9 +32,6 @@ public function testIterating()
         $this->assertEquals($n, $i);
     }
 
-    /**
-     * @expectedException Scriptotek\Sru\Exceptions\InvalidResponseException
-     */
     public function testRepeatSameResponse()
     {
         // Result set contains two records
@@ -51,9 +48,9 @@ public function testRepeatSameResponse()
         // Jumping to position 2 should call fetchMore() and throw
         // an InvalidResponseException on getting the same response
         // as we got for position 1
+        $this->expectException(\Scriptotek\Sru\Exceptions\InvalidResponseException::class);
         $rec->next();
     }
-    
 
     public function testMultipleRequests()
     {

tests/SearchRetrieveResponseTest.php

@@ -93,12 +93,11 @@ public function testMultipleRecordsResult()
         $this->assertEquals('Record 1', $res->records[0]->data);
     }
 
-    /**
-     * @expectedException         Scriptotek\Sru\Exceptions\SruErrorException
-     * @expectedExceptionMessage  Unknown schema for retrieval (Invalid parameter: 'marcxml' for service: 'biblio')
-     */
     public function testErrorWithDetails()
     {
+        $this->expectException(\Scriptotek\Sru\Exceptions\SruErrorException::class);
+        $this->expectExceptionMessage("Unknown schema for retrieval (Invalid parameter: 'marcxml' for service: 'biblio'");
+
         $res = new SearchRetrieveResponse('<srw:searchRetrieveResponse xmlns:srw="http://www.loc.gov/zing/srw/">
           <srw:version>1.1</srw:version>
           <srw:numberOfRecords>0</srw:numberOfRecords>
@@ -111,12 +110,11 @@ public function testErrorWithDetails()
         </srw:searchRetrieveResponse>');
     }
 
-    /**
-     * @expectedException         Scriptotek\Sru\Exceptions\SruErrorException
-     * @expectedExceptionMessage  General system error
-     */
     public function testErrorWithoutDetails()
     {
+        $this->expectException(\Scriptotek\Sru\Exceptions\SruErrorException::class);
+        $this->expectExceptionMessage("General system error");
+
         $res = new SearchRetrieveResponse('<srw:searchRetrieveResponse xmlns:srw="http://www.loc.gov/zing/srw/">
           <srw:version>1.1</srw:version>
           <srw:numberOfRecords>0</srw:numberOfRecords>
@@ -128,12 +126,11 @@ public function testErrorWithoutDetails()
         </srw:searchRetrieveResponse>');
     }
 
-    /**
-     * @expectedException         Scriptotek\Sru\Exceptions\SruErrorException
-     * @expectedExceptionMessage  Too many boolean operators, the maximum is 10. Please try a less complex query. (10)
-     */
     public function testErrorWithCustomMessage()
     {
+        $this->expectException(\Scriptotek\Sru\Exceptions\SruErrorException::class);
+        $this->expectExceptionMessage("Too many boolean operators, the maximum is 10. Please try a less complex query. (10)");
+
         $res = new SearchRetrieveResponse('<srw:searchRetrieveResponse xmlns:srw="http://www.loc.gov/zing/srw/">
           <srw:version>1.1</srw:version>
           <srw:numberOfRecords>0</srw:numberOfRecords>
@@ -156,6 +153,7 @@ public function testDiagnosticsWithoutError()
           <srw:diagnostics xmlns="http://www.loc.gov/zing/srw/diagnostic/">
           </srw:diagnostics>
         </srw:searchRetrieveResponse>');
+        $this->assertCount(0,  $res->records);
     }
 
     public function testCanBeInitializedWithoutAnyData()

tests/TestCase.php

@@ -4,7 +4,7 @@
 use function GuzzleHttp\Psr7\stream_for;
 use Http\Mock\Client as MockHttp;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected $recordTpl = '<srw:record>
             <srw:recordSchema>marcxchange</srw:recordSchema>