Merge branch 'Return-Response' of github.com:joomla-framework/github-api into Return-Response

mbabker · mbabker · commit f0c62cdea768 · 2018-01-20T15:54:03.000-06:00
diff --git a/src/AbstractGithubObject.php b/src/AbstractGithubObject.php
@@ -146,23 +146,23 @@ protected function fetchUrl($path, $page = 0, $limit = 0)
 	 * @param   Response  $response      The response.
 	 * @param   integer   $expectedCode  The expected "good" code.
 	 *
-	 * @return  mixed
+	 * @return  Response
 	 *
 	 * @since   1.0
 	 * @throws  UnexpectedResponseException
 	 */
 	protected function processResponse(Response $response, $expectedCode = 200)
 	{
 		// Validate the response code.
-		if ($response->code != $expectedCode)
+		if ($response->getStatusCode() != $expectedCode)
 		{
 			// Decode the error response and throw an exception.
 			$error = json_decode($response->body);
 
 			// Check if the error message is set; send a generic one if not
 			$message = isset($error->message) ? $error->message : 'Invalid response received from GitHub.';
 
-			throw new UnexpectedResponseException($response, $message, $response->code);
+			throw new UnexpectedResponseException($response, $message, $response->getStatusCode());
 		}
 
 		return $response;

Original file line number	Diff line number	Diff line change
`@@ -146,23 +146,23 @@ protected function fetchUrl($path, $page = 0, $limit = 0)`
`146`	`146`	`* @param Response $response The response.`
`147`	`147`	`* @param integer $expectedCode The expected "good" code.`
`148`	`148`	`*`
`149`		`- * @return mixed`
	`149`	`+ * @return Response`
`150`	`150`	`*`
`151`	`151`	`* @since 1.0`
`152`	`152`	`* @throws UnexpectedResponseException`
`153`	`153`	`*/`
`154`	`154`	`protected function processResponse(Response $response, $expectedCode = 200)`
`155`	`155`	`{`
`156`	`156`	`// Validate the response code.`
`157`		`- if ($response->code != $expectedCode)`
	`157`	`+ if ($response->getStatusCode() != $expectedCode)`
`158`	`158`	`{`
`159`	`159`	`// Decode the error response and throw an exception.`
`160`	`160`	`$error = json_decode($response->body);`
`161`	`161`
`162`	`162`	`// Check if the error message is set; send a generic one if not`
`163`	`163`	`$message = isset($error->message) ? $error->message : 'Invalid response received from GitHub.';`
`164`	`164`
`165`		`- throw new UnexpectedResponseException($response, $message, $response->code);`
	`165`	`+ throw new UnexpectedResponseException($response, $message, $response->getStatusCode());`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`return $response;`