update travis-ci config (#115)

* travis ci: add php 7.1 to test matrix * travis ci: remove php 7.1 and hhvm from test matrix * dep: update PHPUnit * test: update tests to work with latest PHPUnit
FoolCode · Nov 7, 2017 · ca6e683 · ca6e683
1 parent dc9f7f6
commit ca6e683
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,11 @@ language: php
 sudo: false
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
 
 env:
   - DRIVER=mysqli SPHINXSEARCH_BUILD=rel22
@@ -18,9 +17,6 @@ env:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: DRIVER=pdo SPHINXSEARCH_BUILD=rel22
-    - env: DRIVER=pdo SPHINXSEARCH_BUILD=beta
 
 before_install:
   - mkdir $HOME/sphinx

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.4.*"
+        "phpunit/phpunit": "6.3.*"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/SphinxQL/ConnectionTest.php b/tests/SphinxQL/ConnectionTest.php
@@ -4,7 +4,7 @@
 use Foolz\SphinxQL\Expression;
 use Foolz\SphinxQL\Tests\TestUtil;
 
-class ConnectionTest extends PHPUnit_Framework_TestCase
+class ConnectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ConnectionInterface
@@ -98,7 +98,7 @@ public function testConnect()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Warning
+     * @expectedException PHPUnit\Framework\Error\Warning
      */
     public function testConnectThrowsPHPException()
     {
@@ -192,7 +192,7 @@ public function testEscape()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Warning
+     * @expectedException PHPUnit\Framework\Error\Warning
      */
     public function testEscapeThrowsException()
     {

diff --git a/tests/SphinxQL/ExpressionTest.php b/tests/SphinxQL/ExpressionTest.php
@@ -2,7 +2,7 @@
 
 use Foolz\SphinxQL\Expression as Expression;
 
-class ExpressionTest extends PHPUnit_Framework_TestCase
+class ExpressionTest extends \PHPUnit\Framework\TestCase
 {
     public function testValue()
     {
@@ -16,4 +16,4 @@ public function testValue()
         $this->assertInstanceOf('Foolz\Sphinxql\Expression', $result);
         $this->assertEquals('* \\ Ç"" \'', (string) $result);
     }
-}
+}
diff --git a/tests/SphinxQL/FacetTest.php b/tests/SphinxQL/FacetTest.php
@@ -7,7 +7,7 @@
  * @package Foolz\SphinxQL
  * @author Vicent Valls
  */
-class FacetTest  extends PHPUnit_Framework_TestCase
+class FacetTest  extends \PHPUnit\Framework\TestCase
 {
     public static $conn = null;
 

diff --git a/tests/SphinxQL/HelperTest.php b/tests/SphinxQL/HelperTest.php
@@ -5,14 +5,14 @@
 use Foolz\SphinxQL\Helper;
 use Foolz\SphinxQL\Tests\TestUtil;
 
-class HelperTest extends PHPUnit_Framework_TestCase
+class HelperTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ConnectionInterface
      */
     public $conn;
 
-    public function __construct()
+    public function setUp()
     {
         $conn = TestUtil::getConnectionDriver();
         $conn->setParam('port', 9307);

diff --git a/tests/SphinxQL/MatchTest.php b/tests/SphinxQL/MatchTest.php
@@ -4,7 +4,7 @@
 use Foolz\SphinxQL\Match;
 use Foolz\SphinxQL\Tests\TestUtil;
 
-class MatchTest extends PHPUnit_Framework_TestCase
+class MatchTest extends \PHPUnit\Framework\TestCase
 {
     public static $sphinxql = null;
 

diff --git a/tests/SphinxQL/MultiResultSetTest.php b/tests/SphinxQL/MultiResultSetTest.php
@@ -4,7 +4,7 @@
 use Foolz\SphinxQL\Tests\TestUtil;
 use Foolz\SphinxQL\Exception\DatabaseException;
 
-class MultiResultSetTest extends PHPUnit_Framework_TestCase
+class MultiResultSetTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Connection

diff --git a/tests/SphinxQL/ResultSetTest.php b/tests/SphinxQL/ResultSetTest.php
@@ -4,7 +4,7 @@
 use Foolz\SphinxQL\Drivers\Mysqli\Connection;
 use Foolz\SphinxQL\Tests\TestUtil;
 
-class ResultSetTest extends PHPUnit_Framework_TestCase
+class ResultSetTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Connection

diff --git a/tests/SphinxQL/SphinxQLTest.php b/tests/SphinxQL/SphinxQLTest.php
@@ -6,7 +6,7 @@
 use Foolz\SphinxQL\Match;
 use Foolz\SphinxQL\Tests\TestUtil;
 
-class SphinxQLTest extends PHPUnit_Framework_TestCase
+class SphinxQLTest extends \PHPUnit\Framework\TestCase
 {
     public static $conn = null;
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,5 +1,14 @@
 <?php
 
+// PHPUnit Backwards Compatability Fix
+if (!class_exists('\PHPUnit\Framework\TestCase')) {
+    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+}
+
+if (!class_exists('\PHPUnit\Framework\Error\Warning')) {
+    class_alias('\PHPUnit_Framework_Error_Warning', '\PHPUnit\Framework\Error\Warning');
+}
+
 // autoload.php generated by Composer
 
 require_once __DIR__ . '/../vendor/autoload.php';