Fix unit tests on PHP 7.0

Use PHPUnit 5.7.21+ on PHP 5.6, and PHPUnit 6.0+ on PHP 7.0+
choccybiccy · Oct 8, 2017 · 30e862e · 30e862e
1 parent 24c5b24
commit 30e862e
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 php:
- - 5.5
  - 5.6
  - 7.0
  - 7.1
 before_script: composer install
-script: phpunit
+script: vendor/bin/phpunit
 
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
  "guzzlehttp/guzzle": "~6.0"
  },
  "require-dev": {
- "phpunit/phpunit": "4.6.*"
+ "phpunit/phpunit": "^5.7.21|^6.0"
  },
  "autoload": {
  "psr-4": { "Choccybiccy\\": "src/" }

diff --git a/tests/HumanApi/ApplicationTest.php b/tests/HumanApi/ApplicationTest.php
@@ -8,7 +8,7 @@
  * Class ApplicationTest
  * @package Choccybiccy\HumanApi
  */
-class ApplicationTest extends \PHPUnit_Framework_TestCase
+class ApplicationTest extends \PHPUnit\Framework\TestCase
 {
 
  use ReflectionMethods;
@@ -80,7 +80,7 @@ public function testBatchThrowsExceptionWhenUsingUnsupportedEndpoint()
  {
 
  $application = $this->getMockApplication();
- $this->setExpectedException('Choccybiccy\HumanApi\Exception\UnsupportedBatchEndpointException');
+ $this->expectException('Choccybiccy\HumanApi\Exception\UnsupportedBatchEndpointException');
  $application->batch("thisEndpointDoesntExist");
 
  }
@@ -212,7 +212,7 @@ public function testDeleteUserById($statusCode = 204)
  */
  public function testDeleteUserThrowsExceptionWhenWrongErrorCode()
  {
- $this->setExpectedException('\Choccybiccy\HumanApi\Exception\UnexpectedResponseException');
+ $this->expectException('\Choccybiccy\HumanApi\Exception\UnexpectedResponseException');
  $this->testDeleteUserById(500);
  }
 
@@ -246,7 +246,7 @@ public function testDeleteUserThrowsExceptionWhenUnexpectedResponse()
  )
  ->willThrowException($exception);
 
- $this->setExpectedException('\Choccybiccy\HumanApi\Exception\UnexpectedResponseException');
+ $this->expectException('\Choccybiccy\HumanApi\Exception\UnexpectedResponseException');
  $application->deleteUserById($humanId);
 
  }

diff --git a/tests/HumanApi/AuthTest.php b/tests/HumanApi/AuthTest.php
@@ -8,7 +8,7 @@
  * Class AuthTest
  * @package Choccybiccy\HumanApi
  */
-class AuthTest extends \PHPUnit_Framework_TestCase
+class AuthTest extends \PHPUnit\Framework\TestCase
 {
 
  use ReflectionMethods;

diff --git a/tests/HumanApi/Endpoint/LocationsTest.php b/tests/HumanApi/Endpoint/LocationsTest.php
@@ -8,7 +8,7 @@
  * Class LocationsTest
  * @package Choccybiccy\HumanApi\Endpoint
  */
-class LocationsTest extends \PHPUnit_Framework_TestCase
+class LocationsTest extends \PHPUnit\Framework\TestCase
 {
 
  use ReflectionMethods;

diff --git a/tests/HumanApi/Endpoint/MeasurementEndpointTest.php b/tests/HumanApi/Endpoint/MeasurementEndpointTest.php
@@ -8,7 +8,7 @@
  * Class MeasurementEndpointTest
  * @package Choccybiccy\HumanApi\Endpoint
  */
-class MeasurementEndpointTest extends \PHPUnit_Framework_TestCase
+class MeasurementEndpointTest extends \PHPUnit\Framework\TestCase
 {
 
  use ReflectionMethods;

diff --git a/tests/HumanApi/Endpoint/PeriodicEndpointTest.php b/tests/HumanApi/Endpoint/PeriodicEndpointTest.php
@@ -8,7 +8,7 @@
  * Class PeriodicEndpointTest
  * @package Choccybiccy\HumanApi\Endpoint
  */
-class PeriodicEndpointTest extends \PHPUnit_Framework_TestCase
+class PeriodicEndpointTest extends \PHPUnit\Framework\TestCase
 {
 
  use ReflectionMethods;

diff --git a/tests/HumanApi/Endpoint/SimpleEndpointTest.php b/tests/HumanApi/Endpoint/SimpleEndpointTest.php
@@ -8,7 +8,7 @@
  * Class SimpleEndpointTest
  * @package Choccybiccy\HumanApi\Endpoint
  */
-class SimpleEndpointTest extends \PHPUnit_Framework_TestCase
+class SimpleEndpointTest extends \PHPUnit\Framework\TestCase
 {
 
  use ReflectionMethods;
@@ -44,7 +44,7 @@ public function testBuildSpecificEntryUrlThrowsUnsuportedException()
  ->disableOriginalConstructor()
  ->getMock();
 
- $this->setExpectedException('Choccybiccy\HumanApi\Exception\UnsupportedEndpointMethodException');
+ $this->expectException('Choccybiccy\HumanApi\Exception\UnsupportedEndpointMethodException');
  $this->runProtectedMethod($simple, "buildSpecificEntryUrl", array(1));
 
  }
@@ -60,7 +60,7 @@ public function testBuildRecentUrlThrowsUnsuportedException()
  ->disableOriginalConstructor()
  ->getMock();
 
- $this->setExpectedException('Choccybiccy\HumanApi\Exception\UnsupportedEndpointMethodException');
+ $this->expectException('Choccybiccy\HumanApi\Exception\UnsupportedEndpointMethodException');
  $this->runProtectedMethod($simple, "buildRecentUrl", array(1));
 
  }

diff --git a/tests/HumanApi/EndpointTest.php b/tests/HumanApi/EndpointTest.php
@@ -8,7 +8,7 @@
  * Class EndpointTest
  * @package Choccybiccy\HumanApi
  */
-class EndpointTest extends \PHPUnit_Framework_TestCase
+class EndpointTest extends \PHPUnit\Framework\TestCase
 {
 
  use ReflectionMethods;

diff --git a/tests/HumanApi/HumanTest.php b/tests/HumanApi/HumanTest.php
@@ -8,7 +8,7 @@
  * Class HumanTest
  * @package Choccybiccy\HumanApi
  */
-class HumanTest extends \PHPUnit_Framework_TestCase
+class HumanTest extends \PHPUnit\Framework\TestCase
 {
 
  /**

diff --git a/tests/HumanApi/ModelTest.php b/tests/HumanApi/ModelTest.php
@@ -8,7 +8,7 @@
  * Class ModelTest
  * @package Choccybiccy\HumanApi
  */
-class ModelTest extends \PHPUnit_Framework_TestCase
+class ModelTest extends \PHPUnit\Framework\TestCase
 {
 
  /**