Updated the phpunit version to be greater than 5.7.0 for latest CakePHP test suite. Also dropped PHP5.5 testing, and swapped to using the composer installed phpunit binary instead of the travis boxes binary

Author: davidyell

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
 php:
+  - 7.1
   - 7.0
-  - 5.5
   - 5.6
-  - 7.1
 
 dist: trusty
 
@@ -27,8 +26,8 @@ before_script:
   - composer install --prefer-dist --no-interaction
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then phpunit --coverage-clover=clover.xml; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then phpunit; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then ./vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then ./vendor/bin/phpunit; fi
 
   - if [[ $PHPCS = 1 ]]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 

composer.json

@@ -43,7 +43,7 @@
     "require-dev": {
         "cakephp/cakephp": ">=3.2",
         "cakephp/cakephp-codesniffer": "2.*",
-        "phpunit/phpunit": "4.1.*"
+        "phpunit/phpunit": "5.7.*"
     },
     "autoload": {
         "psr-4": {

tests/TestCase/Model/EndpointTest.php

@@ -321,7 +321,6 @@ public function testDisplaySet()
         $this->assertEquals('foo', $endpoint->displayField());
     }
 
-
     /**
      * Tests schema method
      *

tests/bootstrap.php

@@ -100,7 +100,6 @@
 ConnectionManager::config('test', $config);
 ConnectionManager::config('test_webservice', $config);
 
-
 Log::config([
     'debug' => [
         'engine' => 'Cake\Log\Engine\FileLog',

tests/test_app/Model/Endpoint/TestEndpoint.php

@@ -8,7 +8,6 @@
 class TestEndpoint extends Endpoint
 {
 
-
     /**
      * Returns the default validator object. Subclasses can override this function
      * to add a default validation set to the validator object.

tests/test_app/Webservice/EndpointTestWebservice.php

@@ -45,7 +45,6 @@ public function initialize()
         ];
     }
 
-
     protected function _executeCreateQuery(Query $query, array $options = [])
     {
         $fields = $query->set();