Update to phpunit v6.5 (solariumphp#557)

* Require phpunit v6.5 and PHP v7

* Update tests to use TestCase

* Fix ClientTest tests

* Updated tests for phpunit v6.5

* Updated assertSame and removed copyright info from tests

* Fixed CS

* Removed php 5.6 from travis tests

* Added php 7.2 to travis

* Removed commented code

* Updated Readme

* Updated CHANGELOG

* Updated CS

* Updated tests and phpunit.dist{,.travis} (bootstrap.php is not needed anymore)

* Updated tests, removed unused coverage

Author: thePanz

.travis.yml

@@ -3,15 +3,14 @@ language: php
 dist: trusty
 
 php:
+  - 7.2
   - 7.1
   - 7.0
-  - 5.6
-  - hhvm
+  # hhvm removed as it is not fully compatible with php7
+  # - hhvm
   - nightly
 
 env:
-#  - SYMFONY_VERSION=2.3.* SOLR_VERSION=6.6.1
-#  - SYMFONY_VERSION=2.7.* SOLR_VERSION=6.6.1
   - SYMFONY_VERSION=2.8.* SOLR_VERSION=6.6.2
   - SYMFONY_VERSION=3.0.* SOLR_VERSION=6.6.2
   - SYMFONY_VERSION=4.0.* SOLR_VERSION=6.6.2
@@ -42,10 +41,6 @@ matrix:
         env: SYMFONY_VERSION=4.0.* SOLR_VERSION=6.6.2
       - php: 7.0
         env: SYMFONY_VERSION=4.0.* SOLR_VERSION=7.2.0
-      - php: 5.6
-        env: SYMFONY_VERSION=4.0.* SOLR_VERSION=6.6.2
-      - php: 5.6
-        env: SYMFONY_VERSION=4.0.* SOLR_VERSION=7.2.0
       - php: hhvm
         env: SYMFONY_VERSION=4.0.* SOLR_VERSION=6.6.2
       - php: hhvm

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## Unreleased
+### Changed
+- Updated PHPUnit to v6.5
+- Updated required PHP version to >= v7.0
+
 ## 3.8.1 - 2017-02-02
 
 - bugfix: restore PHP 5.3 compatibility (remove short array syntax)

README.md

@@ -11,7 +11,8 @@ Please see the docs for a more detailed description.
 
 ## Requirements
 
-Solarium only supports PHP 5.6 and up.
+Solarium only supports PHP 7.0 and up.
+
 It's highly recommended to have Curl enabled in your PHP environment. However if you don't have Curl available you can
 switch from using Curl (the default) to another client adapter. The other adapters don't support all the features of the
 Curl adapter.
@@ -20,6 +21,11 @@ Curl adapter.
 
 The preferred way to install Solarium is by using Composer. Solarium is available on Packagist.
 
+Example:
+```
+ composer require solarium/solarium
+```
+
 ## More information
 
 * Docs

composer.json

@@ -12,11 +12,11 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": "^7.0",
         "symfony/event-dispatcher": "^2.7 || ^3.0 || ^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^3.7",
+        "phpunit/phpunit": "^6.5",
         "squizlabs/php_codesniffer": "^1.4",
         "zendframework/zendframework1": "^1.12",
         "satooshi/php-coveralls": "^1.0",

library/Component/ResponseParser/Spellcheck.php

@@ -73,8 +73,8 @@ public function parse($query, $spellcheck, $data)
             }
 
             $suggestions = array();
-            $correctlySpelled = null;
             $collations = array();
+            $correctlySpelled = false;
 
             foreach ($spellcheckResults as $key => $value) {
                 switch ($key) {

library/Component/Result/Spellcheck/Result.php

@@ -69,11 +69,11 @@ class Result implements \IteratorAggregate, \Countable
     /**
      * Constructor.
      *
-     * @param array   $suggestions
-     * @param array   $collations
-     * @param boolean $correctlySpelled
+     * @param Suggestion[] $suggestions
+     * @param Collation[]  $collations
+     * @param boolean      $correctlySpelled
      */
-    public function __construct($suggestions, $collations, $correctlySpelled)
+    public function __construct(array $suggestions, array $collations, bool $correctlySpelled)
     {
         $this->suggestions = $suggestions;
         $this->collations = $collations;

phpunit.xml.dist

@@ -3,7 +3,6 @@
     backupGlobals="false"
     backupStaticAttributes="false"
     syntaxCheck="false"
-    bootstrap="tests/bootstrap.php"
     colors="true"
 >
 

phpunit.xml.travis

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false" backupStaticAttributes="false" syntaxCheck="false" bootstrap="tests/bootstrap.php">
-
+<phpunit 
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    syntaxCheck="false"
+>
     <testsuites>
        <testsuite name="Solarium">
          <directory suffix="Test.php">tests</directory>

tests/ClientTest.php

@@ -1,39 +1,11 @@
 <?php
-/**
- * Copyright 2011 Bas de Nooijer. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this listof conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the copyright holder.
- */
 
 namespace Solarium\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Solarium\Client;
 
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {
     public function testVersion()
     {

tests/Component/ComponentTest.php

@@ -1,40 +1,12 @@
 <?php
-/**
- * Copyright 2011 Bas de Nooijer. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this listof conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the copyright holder.
- */
 
 namespace Solarium\Tests\Component;
 
+use PHPUnit\Framework\TestCase;
 use Solarium\Component\AbstractComponent;
 use Solarium\QueryType\Select\Query\Query;
 
-class ComponentTest extends \PHPUnit_Framework_TestCase
+class ComponentTest extends TestCase
 {
     public function testGetType()
     {
@@ -44,7 +16,7 @@ public function testGetType()
 
     public function testSetAndGetQueryInstance()
     {
-        $query = new Query;
+        $query = new Query();
         $component = new TestComponent();
         $component->setQueryInstance($query);
         $this->assertEquals($query, $component->getQueryInstance());

tests/Component/DebugTest.php

@@ -1,40 +1,14 @@
 <?php
-/**
- * Copyright 2011 Bas de Nooijer. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this listof conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the copyright holder.
- */
 
 namespace Solarium\Tests\Component;
 
+use PHPUnit\Framework\TestCase;
 use Solarium\Component\ComponentAwareQueryInterface;
 use Solarium\Component\Debug;
+use Solarium\Component\RequestBuilder\Debug as DebugBuilder;
+use Solarium\Component\ResponseParser\Debug as DebugParser;
 
-class DebugTest extends \PHPUnit_Framework_TestCase
+class DebugTest extends TestCase
 {
     /**
      * @var Debug
@@ -43,7 +17,7 @@ class DebugTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->debug = new Debug;
+        $this->debug = new Debug();
     }
 
     public function testConfigMode()
@@ -67,18 +41,12 @@ public function testGetType()
 
     public function testGetResponseParser()
     {
-        $this->assertInstanceOf(
-            'Solarium\Component\ResponseParser\Debug',
-            $this->debug->getResponseParser()
-        );
+        $this->assertInstanceOf(DebugParser::class, $this->debug->getResponseParser());
     }
 
     public function testGetRequestBuilder()
     {
-        $this->assertInstanceOf(
-            'Solarium\Component\RequestBuilder\Debug',
-            $this->debug->getRequestBuilder()
-        );
+        $this->assertInstanceOf(DebugBuilder::class, $this->debug->getRequestBuilder());
     }
 
     public function testSetAndGetExplainOther()

tests/Component/MoreLikeThisTest.php

@@ -1,40 +1,12 @@
 <?php
-/**
- * Copyright 2011 Bas de Nooijer. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this listof conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the copyright holder.
- */
 
 namespace Solarium\Tests\Component;
 
+use PHPUnit\Framework\TestCase;
 use Solarium\Component\ComponentAwareQueryInterface;
 use Solarium\Component\MoreLikeThis;
 
-class MoreLikeThisTest extends \PHPUnit_Framework_TestCase
+class MoreLikeThisTest extends TestCase
 {
     /**
      * @var MoreLikeThis
@@ -43,7 +15,7 @@ class MoreLikeThisTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->mlt = new MoreLikeThis;
+        $this->mlt = new MoreLikeThis();
     }
 
     public function testConfigMode()

tests/Component/RequestBuilder/DebugTest.php

@@ -1,41 +1,13 @@
 <?php
-/**
- * Copyright 2011 Bas de Nooijer. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this listof conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the copyright holder.
- */
 
 namespace Solarium\Tests\Component\RequestBuilder;
 
-use Solarium\Component\RequestBuilder\Debug as RequestBuilder;
+use PHPUnit\Framework\TestCase;
 use Solarium\Component\Debug as Component;
+use Solarium\Component\RequestBuilder\Debug as RequestBuilder;
 use Solarium\Core\Client\Request;
 
-class DebugTest extends \PHPUnit_Framework_TestCase
+class DebugTest extends TestCase
 {
     public function testBuildComponent()
     {
@@ -55,6 +27,5 @@ public function testBuildComponent()
             ),
             $request->getParams()
         );
-
     }
 }