Test PHP 7.2, switch to PSR-4 and require PHPUnit instead if implicitely depending on it (#6)

Author: whikloj

.gitignore

@@ -1 +1,2 @@
 build/
+vendor/

.travis.yml

@@ -1,28 +1,27 @@
 language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+dist: trusty
 
 matrix:
-  fast_finish: true
   include:
+    - php: 5.3
+      dist: precise
+    - php: 5.4
     - php: 5.5
       env: COVERAGE=true
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: hhvm
 
 install:
   - composer install
 
 before_script:
-  - vendor/bin/http_test_server > /dev/null 2>&1 &
   - if [[ "$COVERAGE" = true ]]; then PHPUNIT_FLAGS="--coverage-clover build/coverage.xml"; else PHPUNIT_FLAGS=""; fi
 
 script:
-  - phpunit $PHPUNIT_FLAGS
+  - vendor/bin/phpunit $PHPUNIT_FLAGS
 
 after_success:
   - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

Test/IriTest.php

@@ -10,13 +10,14 @@
 namespace ML\IRI\Test;
 
 use ML\IRI\IRI;
+use PHPUnit\Framework\TestCase;
 
 /**
  * The IRI test suite.
  *
  * @author Markus Lanthaler <[email protected]>
  */
-class IriTest extends \PHPUnit_Framework_TestCase
+class IriTest extends TestCase
 {
     /**
      * Test parsing

Test/bootstrap.php

@@ -17,8 +17,14 @@
         "php": ">=5.3.0",
         "lib-pcre": ">=4.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.8.*"
+    },
     "autoload": {
-        "psr-0": { "ML\\IRI": "" }
+        "psr-4": {
+            "ML\\IRI\\": "",
+            "ML\\IRI\\Test\\": "Test/"
+        }
     },
     "target-dir": "ML/IRI"
 }

composer.json

@@ -7,8 +7,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         strict="true"
-         bootstrap="./Test/bootstrap.php">
+         bootstrap="vendor/autoload.php">
 
     <testsuites>
         <testsuite name="IRI Test Suite">
@@ -18,10 +17,7 @@
 
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory>./</directory>
-            <exclude>
-                <directory>./Test</directory>
-            </exclude>
+            <file>IRI.php</file>
         </whitelist>
     </filter>