Skip to content

Commit 1e4325b

Browse files
committed
Merge pull request #20 from chrisryan/php7
Add Php 7 support, update minimum versions
2 parents 0a53396 + 654c1a5 commit 1e4325b

4 files changed

Lines changed: 305 additions & 19 deletions

File tree

build.php

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"license": "MIT",
2323
"require": {
2424
"php": "~5.6||~7.0",
25-
"dominionenterprises/util": "~1.4",
25+
"dominionenterprises/util": "~2.0",
2626
"guzzle/http": "~3.7",
2727
"ext-curl": "*",
2828
"lib-curl": "~7.15"

composer.lock

Lines changed: 302 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/ClientTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ public function end($handle)
618618
return new Response(200, ['Content-Type' => ['application/json']], ['access_token' => 'a token', 'expires_in' => 1]);
619619
}
620620

621-
if ($this->_request->getMethod() === 'GET' && $this->_request->getUrl() === 'baseUrl/v1/resource+name?the+name=the+value') {
621+
if ($this->_request->getMethod() === 'GET' && urldecode($this->_request->getUrl()) === 'baseUrl/v1/resource name?the name=the value') {
622622
return new Response(200, ['Content-Type' => ['application/json']], ['key' => 'value']);
623623
}
624624

0 commit comments

Comments
 (0)