Merge pull request #175 from StudioMaX/patch-1

Add PHP 7.2 and 7.3 to Travis

Author: oohnoitz

.travis.yml

@@ -6,6 +6,8 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
+  - 7.3
 
 env:
   - DRIVER=mysqli SEARCH_BUILD=SPHINX2 EXCLUDE_GROUP="--exclude-group=Manticore"
@@ -27,9 +29,12 @@ before_install:
   - $TRAVIS_BUILD_DIR/tests/install.sh
   - popd
 
+install: composer update --prefer-dist --no-interaction
+
 before_script:
   - composer dump-autoload
   - cd tests
   - $TRAVIS_BUILD_DIR/tests/run.sh
+  - cd ..
 
-script: phpunit --configuration travis/$DRIVER.phpunit.xml --coverage-text $EXCLUDE_GROUP
+script: ./vendor/bin/phpunit --configuration tests/travis/$DRIVER.phpunit.xml --coverage-text $EXCLUDE_GROUP

composer.json

@@ -15,7 +15,7 @@
         "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*"
+        "phpunit/phpunit": "^5.7 || 6.3.*"
     },
     "autoload": {
         "psr-4": {

tests/SphinxQL/ConnectionTest.php

@@ -11,13 +11,13 @@ class ConnectionTest extends \PHPUnit\Framework\TestCase
      */
     private $connection = null;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->connection = TestUtil::getConnectionDriver();
         $this->connection->setParams(array('host' => '127.0.0.1', 'port' => 9307));
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         $this->connection = null;
     }

tests/SphinxQL/HelperTest.php

@@ -12,7 +12,7 @@ class HelperTest extends \PHPUnit\Framework\TestCase
      */
     public $conn;
 
-    public function setUp()
+    protected function setUp()
     {
         $conn = TestUtil::getConnectionDriver();
         $conn->setParam('port', 9307);