vitalif
/
oauth2-client
mirror of https://github.com/vitalif/oauth2-client
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'geofflancaster-idpexception-empty-strings'

oauth1test
Ben Ramsey 2015-03-10 16:03:13 -05:00
parent 57ea7ac8f9 847dbf5dfe
commit 7faec8077f
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Exception/IDPException.php
View File

@ -12,10 +12,10 @@ class IDPException extends \Exception
$code = isset($result['code']) ? $result['code'] : 0;
if (isset($result['error'])) {
if (isset($result['error']) && $result['error'] !== '') {
// OAuth 2.0 Draft 10 style
$message = $result['error'];
} elseif (isset($result['message'])) {
} elseif (isset($result['message']) && $result['message'] !== '') {
// cURL style
$message = $result['message'];
} else {

24
test/src/Exception/IDPExceptionTest.php
View File

@ -54,4 +54,28 @@ class IDPExceptionTest extends \PHPUnit_Framework_TestCase
$exception->getResponseBody()
);
}
public function testEmptyMessage()
{
$exception = new IDPException(array('error' => 'error_message', 'message' => ''));
$this->assertEquals('error_message', $exception->getMessage());
}
public function testNonEmptyErrorAndMessage()
{
$exception = new IDPException(array('error' => 'error_message', 'message' => 'message'));
$this->assertEquals('error_message', $exception->getMessage());
}
public function testEmptyError()
{
$exception = new IDPException(array('error' => '', 'message' => 'message'));
$this->assertEquals('message', $exception->getMessage());
}
public function testEmptyErrorAndMessage()
{
$exception = new IDPException(array('error' => '', 'message' => ''));
$this->assertEquals('Unknown Error.', $exception->getMessage());
}
}