Upgrade PHPUnit to 6.x (#24)

* Upgrade PHPUnit to 6.x

* Update CHANGELOG

* Remove PHP 5.6 fom Travis config

Author: slavcodev

.travis.yml

@@ -5,13 +5,12 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
     - php: 7.0
       env:
         - EXECUTE_COVERAGE=true
-    - php: hhvm
+    - php: 7.1
   allow_failures:
-    - php: hhvm
+    - php: 7.1
 
 notifications:
   email: false

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file
 using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.2.0] 2017-10-29
+
+### Changed
+
+- Upgrade minimum of PHP version up to 7.0
+- Upgrade minimum of PHPUnit version up to 6.0
+
 ## [0.1.5] 2016-07-04
 
 ### Fixed

composer.json

@@ -13,10 +13,10 @@
   ],
   "minimum-stability": "stable",
   "require": {
-    "justinrainbow/json-schema": "~2.0",
-    "phpunit/phpunit": "~4.8|~5.0",
+    "php": "~7.0",
     "psr/http-message": "~1.0",
-    "php": "~5.6|~7.0"
+    "phpunit/phpunit": "~6.0",
+    "justinrainbow/json-schema": "~2.0"
   },
   "autoload": {
     "psr-4": {
@@ -26,7 +26,7 @@
   "require-dev": {
     "guzzlehttp/guzzle": "~6.2",
     "scrutinizer/ocular": "~1.1",
-    "fabpot/php-cs-fixer": "~1.0"
+    "friendsofphp/php-cs-fixer": "~2.0"
   },
   "autoload-dev": {
     "psr-4": {

phpunit.xml.dist

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true"
-		 stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false"
-		 bootstrap="tests/Bootstrap.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
+		 bootstrap="vendor/autoload.php"
+		 failOnRisky="true"
+		 failOnWarning="true"
+		 colors="true"
+		 verbose="true">
 	<testsuites>
 		<testsuite name="main">
-			<directory suffix="Test.php">tests/</directory>
+			<directory>tests/</directory>
 		</testsuite>
 	</testsuites>
 	<filter>

src/PhpUnit/Asserts.php

@@ -10,7 +10,7 @@
 
 namespace Rebilly\OpenAPI\PhpUnit;
 
-use PHPUnit_Framework_Assert as Assert;
+use PHPUnit\Framework\Assert;
 use Psr\Http\Message\RequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\StreamInterface as Stream;

src/PhpUnit/ContentTypeConstraint.php

@@ -10,7 +10,7 @@
 
 namespace Rebilly\OpenAPI\PhpUnit;
 
-use PHPUnit_Framework_Constraint as Constraint;
+use PHPUnit\Framework\Constraint\Constraint;
 
 /**
  * Constraint that asserts that the content-type matches the expected types.

src/PhpUnit/HeadersConstraint.php

@@ -10,7 +10,7 @@
 
 namespace Rebilly\OpenAPI\PhpUnit;
 
-use PHPUnit_Framework_Constraint as Constraint;
+use PHPUnit\Framework\Constraint\Constraint;
 use Rebilly\OpenAPI\JsonSchema\Validator;
 use Rebilly\OpenAPI\UnexpectedValueException;
 

src/PhpUnit/JsonSchemaConstraint.php

@@ -10,13 +10,13 @@
 
 namespace Rebilly\OpenAPI\PhpUnit;
 
-use PHPUnit_Framework_Constraint as BaseConstraint;
+use PHPUnit\Framework\Constraint\Constraint;
 use Rebilly\OpenAPI\JsonSchema\Validator;
 
 /**
  * Constraint that asserts that the object matches the expected JSON Schema.
  */
-final class JsonSchemaConstraint extends BaseConstraint
+final class JsonSchemaConstraint extends Constraint
 {
     /**
      * @var object

src/PhpUnit/MethodsAllowedConstraint.php

@@ -10,7 +10,7 @@
 
 namespace Rebilly\OpenAPI\PhpUnit;
 
-use PHPUnit_Framework_Constraint as Constraint;
+use PHPUnit\Framework\Constraint\Constraint;
 
 /**
  * Constraint that asserts that the HTTP method matches the expected allowed methods.

src/PhpUnit/UriConstraint.php

@@ -10,7 +10,7 @@
 
 namespace Rebilly\OpenAPI\PhpUnit;
 
-use PHPUnit_Framework_Constraint as Constraint;
+use PHPUnit\Framework\Constraint\Constraint;
 use Psr\Http\Message\UriInterface;
 use Rebilly\OpenAPI\JsonSchema\Validator;
 use Rebilly\OpenAPI\UnexpectedValueException;