Merge pull request #17 from chrisryan/master

Add Php 7 support, update minimum versions
traderinteractive · May 25, 2016 · eb3b6b3 · eb3b6b3
2 parents ddf5d09 + 1952c37
commit eb3b6b3
Show file tree

Hide file tree

Showing 5 changed files with 731 additions and 322 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /coverage/
 /vendor/
+/clover.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 php:
+  - 7.0
   - 5.6
-  - 5.5
-  - 5.4
 script: ./build.php
 after_script: ./vendor/bin/coveralls -v
diff --git a/build.php b/build.php
@@ -20,7 +20,7 @@
 $phpunitConfiguration = PHPUnit_Util_Configuration::getInstance(__DIR__ . '/phpunit.xml');
 $phpunitArguments = ['coverageHtml' => __DIR__ . '/coverage', 'configuration' => $phpunitConfiguration];
 $testRunner = new PHPUnit_TextUI_TestRunner();
-$result = $testRunner->doRun($phpunitConfiguration->getTestSuiteConfiguration(), $phpunitArguments);
+$result = $testRunner->doRun($phpunitConfiguration->getTestSuiteConfiguration(), $phpunitArguments, false);
 if (!$result->wasSuccessful()) {
     exit(1);
 }

diff --git a/composer.json b/composer.json
@@ -16,10 +16,10 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "~5.4"
+        "php": "~5.6 || ~7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
+        "phpunit/phpunit": "~5.0",
         "satooshi/php-coveralls": "~0.6.1",
         "squizlabs/php_codesniffer": "~1.5"
     },