Merge pull request #22 from ozh/fixtests2

Fix tests (episode 2)

Author: jakeasmith

.travis.yml

@@ -1,16 +1,13 @@
+sudo: false
+
 language: php
 php:
-  - 5.2
   - 5.3
   - 5.4
   - 5.5
   - 5.6
-  - 7
+  - 7.0
+  - 7.1
   - hhvm
 
-before_install:
-    - phpenv global 5.5
-    - composer require codeclimate/php-test-reporter --dev
-    - phpenv global "$TRAVIS_PHP_VERSION"
-    
-script: ./vendor/bin/phpunit --coverage-text
+script: phpunit --coverage-text

composer.json

@@ -12,9 +12,6 @@
     "issues": "https://github.com/jakeasmith/http_build_url/issues",
     "source": "https://github.com/jakeasmith/http_build_url"
   },
-  "require-dev": {
-    "phpunit/phpunit": "~3.7"
-  },
   "autoload": {
       "files": ["src/http_build_url.php"]
   }

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<phpunit bootstrap="./tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite>
             <directory>./tests</directory>

tests/bootstrap.php

@@ -0,0 +1,13 @@
+<?php
+require dirname( __DIR__ ) . '/src/http_build_url.php';
+
+// PHPUnit 6 compatibility for previous versions
+if ( class_exists( 'PHPUnit\Runner\Version' ) && version_compare( PHPUnit\Runner\Version::id(), '6.0', '>=' ) ) {
+    class_alias( 'PHPUnit\Framework\Assert',        'PHPUnit_Framework_Assert' );
+    class_alias( 'PHPUnit\Framework\TestCase',      'PHPUnit_Framework_TestCase' );
+    class_alias( 'PHPUnit\Framework\Error\Error',   'PHPUnit_Framework_Error' );
+    class_alias( 'PHPUnit\Framework\Error\Notice',  'PHPUnit_Framework_Error_Notice' );
+    class_alias( 'PHPUnit\Framework\Error\Warning', 'PHPUnit_Framework_Error_Warning' );
+}
+
+// Past this point, tests will start