Skip to content

Commit 7f4fd8c

Browse files
authored
Merge pull request #12 from chrisryan/master
Add Php 7 and Update minimum versions
2 parents 3af62af + 630cf9a commit 7f4fd8c

File tree

5 files changed

+1076
-379
lines changed

5 files changed

+1076
-379
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/coverage/
22
/vendor/
3+
/clover.xml

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22
php:
3+
- 7.0
34
- 5.6
4-
- 5.5
5-
- 5.4
65
script: ./build.php
76
after_script: ./vendor/bin/coveralls -v

build.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
$phpunitConfiguration = PHPUnit_Util_Configuration::getInstance(__DIR__ . '/phpunit.xml');
2121
$phpunitArguments = ['coverageHtml' => __DIR__ . '/coverage', 'configuration' => $phpunitConfiguration];
2222
$testRunner = new PHPUnit_TextUI_TestRunner();
23-
$result = $testRunner->doRun($phpunitConfiguration->getTestSuiteConfiguration(), $phpunitArguments);
23+
$result = $testRunner->doRun($phpunitConfiguration->getTestSuiteConfiguration(), $phpunitArguments, false);
2424
if (!$result->wasSuccessful()) {
2525
exit(1);
2626
}

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
],
1212
"license": "MIT",
1313
"require": {
14-
"php": "~5.4",
15-
"dominionenterprises/util": "~1.4",
14+
"php": "~5.6 || ~7.0",
15+
"dominionenterprises/util": "~2.0",
1616
"clue/socket-raw": "~1.0",
1717
"ext-sockets": "*"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "~4.1",
20+
"phpunit/phpunit": "~5.0",
2121
"satooshi/php-coveralls": "~0.6.1",
2222
"squizlabs/php_codesniffer": "~1.5"
2323
},

0 commit comments

Comments
 (0)