Upgrade PHPUnit to latest.

composer.json

@@ -10,7 +10,7 @@
     "license": "GPL-2.0",
     "config": {
         "platform": {
-            "php": "7.0.0"
+            "php": "7.0.8"
         }
     },
     "require": {
@@ -77,7 +77,7 @@
         "friendsofphp/php-cs-fixer": "2.10.3",
         "phploc/phploc": "4.0.1",
         "phpmd/phpmd": "2.6.0",
-        "phpunit/phpunit": "5.7.27",
+        "phpunit/phpunit": "6.5.7",
         "sebastian/phpcpd": "3.0.1",
         "squizlabs/php_codesniffer": "3.2.3"
     },

module/VuFind/src/VuFindTest/Unit/TestCase.php

@@ -37,7 +37,7 @@ namespace VuFindTest\Unit;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
     /**
      * The service manager instance

module/VuFind/tests/unit-tests/src/VuFindTest/Cache/Storage/Adapter/NoCacheAdapterTest.php

@@ -28,7 +28,7 @@
  */
 namespace VuFindTest\Cache\Storage\Adapter;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 use VuFind\Cache\Storage\Adapter\NoCacheAdapter;
 
@@ -41,7 +41,7 @@ use VuFind\Cache\Storage\Adapter\NoCacheAdapter;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class NoCacheAdapterTest extends PHPUnit_Framework_TestCase
+class NoCacheAdapterTest extends TestCase
 {
     /**
      * Test that an item is not stored.

module/VuFind/tests/unit-tests/src/VuFindTest/CartTest.php

@@ -38,7 +38,7 @@ use VuFind\Cookie\CookieManager;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class CartTest extends \PHPUnit_Framework_TestCase
+class CartTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Mock record loader

module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php

@@ -39,7 +39,7 @@ use VuFind\Config\Reader\CacheDecorator;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class CacheDecoratorTest extends \PHPUnit_Framework_TestCase
+class CacheDecoratorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Read config from while, new file.

module/VuFind/tests/unit-tests/src/VuFindTest/Connection/WikipediaTest.php

@@ -42,7 +42,7 @@ use Zend\Http\Client as HttpClient;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class WikipediaTest extends \PHPUnit_Framework_TestCase
+class WikipediaTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test processing of English-language Jane Austen entry.

module/VuFind/tests/unit-tests/src/VuFindTest/Connection/WorldCatUtilsTest.php

@@ -42,7 +42,7 @@ use Zend\Http\Client as HttpClient;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class WorldCatUtilsTest extends \PHPUnit_Framework_TestCase
+class WorldCatUtilsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test related identities

module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/AmazonTest.php

@@ -39,7 +39,7 @@ use VuFindCode\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class AmazonTest extends \PHPUnit_Framework_TestCase
+class AmazonTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Amazon parameters

module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/BooksiteTest.php

@@ -40,7 +40,7 @@ use VuFindCode\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class BooksiteTest extends \PHPUnit_Framework_TestCase
+class BooksiteTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test cover loading

module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/BuchhandelTest.php

@@ -42,7 +42,7 @@ use VuFindCode\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class BuchhandelTest extends \PHPUnit_Framework_TestCase
+class BuchhandelTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test cover loading

module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/ContentCafeTest.php

@@ -41,7 +41,7 @@ use Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class ContentCafeTest extends \PHPUnit_Framework_TestCase
+class ContentCafeTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test cover loading

module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/LibraryThingTest.php

@@ -40,7 +40,7 @@ use VuFindCode\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class LibraryThingTest extends \PHPUnit_Framework_TestCase
+class LibraryThingTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test cover loading

module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/OpenLibraryTest.php

@@ -40,7 +40,7 @@ use VuFindCode\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class OpenLibraryTest extends \PHPUnit_Framework_TestCase
+class OpenLibraryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test cover loading

module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/SummonTest.php

@@ -40,7 +40,7 @@ use VuFindCode\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org
  */
-class SummonTest extends \PHPUnit_Framework_TestCase
+class SummonTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test cover loading

module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php

@@ -39,7 +39,7 @@ use Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class ExportTest extends \PHPUnit_Framework_TestCase
+class ExportTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test bulk options using legacy (deprecated) configuration.

module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php

@@ -28,6 +28,7 @@
  */
 namespace VuFindTest\Recommend;
 
+use PHPUnit\Framework\Assert;
 use VuFind\Recommend\RandomRecommend as Random;
 use VuFindTest\Unit\TestCase as TestCase;
 
@@ -65,31 +66,21 @@ class RandomRecommendTest extends TestCase
         //[backend]:[limit]:[display mode]:[random mode]:[minimumset]:[facet1]:[facetvalue1]
         $this->recommend->setConfig("SolrWeb:5:mixed:disregard:20:facet1:value1:facet2:value2");
         $this->assertEquals(
-            "SolrWeb", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'backend'
-            )
+            "SolrWeb", Assert::readAttribute($this->recommend, 'backend')
         );
         $this->assertEquals(
-            "5", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'limit'
-            )
+            "5", Assert::readAttribute($this->recommend, 'limit')
         );
         $this->assertEquals(
-            "mixed", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'displayMode'
-            )
+            "mixed", Assert::readAttribute($this->recommend, 'displayMode')
         );
         $this->assertEquals(
-            "disregard", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'mode'
-            )
+            "disregard", Assert::readAttribute($this->recommend, 'mode')
         );
         $this->assertEquals(
-            "20", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'minimum'
-            )
+            "20", Assert::readAttribute($this->recommend, 'minimum')
         );
-        $filters = \PHPUnit_Framework_Assert::readAttribute($this->recommend, 'filters');
+        $filters = Assert::readAttribute($this->recommend, 'filters');
         $this->assertInternalType("array", $filters);
         $this->assertCount(2, $filters);
         $this->assertEquals("facet1:value1", $filters[0]);
@@ -106,34 +97,22 @@ class RandomRecommendTest extends TestCase
         //[backend]:[limit]:[display mode]:[random mode]:[minimumset]:[facet1]:[facetvalue1]
         $this->recommend->setConfig('');
         $this->assertEquals(
-            "Solr", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'backend'
-            )
+            "Solr", Assert::readAttribute($this->recommend, 'backend')
         );
         $this->assertEquals(
-            "10", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'limit'
-            )
+            "10", Assert::readAttribute($this->recommend, 'limit')
         );
         $this->assertEquals(
-            "standard", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'displayMode'
-            )
+            "standard", Assert::readAttribute($this->recommend, 'displayMode')
         );
         $this->assertEquals(
-            "retain", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'mode'
-            )
+            "retain", Assert::readAttribute($this->recommend, 'mode')
         );
         $this->assertEquals(
-            "0", \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'minimum'
-            )
+            "0", Assert::readAttribute($this->recommend, 'minimum')
         );
         $this->assertEquals(
-            [], \PHPUnit_Framework_Assert::readAttribute(
-                $this->recommend, 'filters'
-            )
+            [], Assert::readAttribute($this->recommend, 'filters')
         );
     }
 

module/VuFind/tests/unit-tests/src/VuFindTest/Record/CacheTest.php

@@ -230,7 +230,7 @@ class CacheTest extends TestCase
     /**
      * Create Record Table
      *
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRecordTable()
     {
@@ -281,7 +281,7 @@ class CacheTest extends TestCase
     /**
      * Create a Record Factory Manager
      *
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRecordFactoryManager()
     {
@@ -321,7 +321,7 @@ class CacheTest extends TestCase
      * @param string $id     id
      * @param string $source source
      *
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return PHPUnit\Framework\MockObject\MockObject
      */
     protected function getDriver($id = 'test', $source = 'Solr')
     {

module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/V3/ErrorListenerTest.php

@@ -28,7 +28,7 @@
  */
 namespace VuFindTest\Search\Solr\V3;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 use RuntimeException;
 

module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/V4/ErrorListenerTest.php

@@ -28,7 +28,7 @@
  */
 namespace VuFindTest\Search\Solr\V4;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 use RuntimeException;