Feature/php74

.travis.yml

@@ -1,11 +1,13 @@
 language: php
-
+dist: trusty
 sudo: required
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
+  - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
 
 env: TEST_PARAMS='-c tests/php.ini'
 

composer.json

@@ -10,13 +10,13 @@
     }
   ],
   "require": {
-    "php": ">=5.4",
-    "guzzlehttp/guzzle": "^5.3"
+    "php": ">=5.6",
+    "guzzlehttp/guzzle": "^6.2"
   },
   "require-dev": {
     "tracy/tracy": "^2.4",
     "nette/tester": "^1.7",
-    "mockery/mockery": "^0.9.9",
+    "mockery/mockery": "^1.3",
     "latte/latte": "^2.4"
   },
   "autoload": {

examples/clientApi.php

@@ -3,7 +3,7 @@
 require __DIR__ . '/bootstrap.php';
 
 use GuzzleHttp\Exception\BadResponseException;
-use GuzzleHttp\Message\Request;
+use GuzzleHttp\Psr7\Request;
 use SizeID\OAuth2\ClientApi;
 
 

examples/popupLogin.php

@@ -1,6 +1,6 @@
 <?php
 require __DIR__ . '/bootstrap.php';
-use GuzzleHttp\Message\Request;
+use GuzzleHttp\Psr7\Request;
 use Latte\Engine;
 use SizeID\OAuth2\Exceptions\RedirectException;
 use SizeID\OAuth2\Repositories\SessionAccessTokenRepository;

examples/userApi.php

@@ -1,7 +1,7 @@
 <?php
 require __DIR__ . '/bootstrap.php';
 use GuzzleHttp\Exception\BadResponseException;
-use GuzzleHttp\Message\Request;
+use GuzzleHttp\Psr7\Request;
 use SizeID\OAuth2\Exceptions\RedirectException;
 use SizeID\OAuth2\UserApi;
 

src/Api.php

@@ -5,11 +5,13 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
+use GuzzleHttp\Psr7\Uri;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use SizeID\OAuth2\Entities\AccessToken;
 use SizeID\OAuth2\Exceptions\InvalidStateException;
 use SizeID\OAuth2\Repositories\AccessTokenRepositoryInterface;
+use GuzzleHttp\RequestOptions;
 
 /**
  * Shared functionality of API calls
@@ -59,19 +61,22 @@ public function __construct(
 		$authorizationServerUrl,
 		$apiBaseUrl,
 		$httpClient
-	)
-	{
+	) {
 		$this->clientId = $clientId;
 		$this->clientSecret = $clientSecret;
 		$this->accessTokenRepository = $accessTokenRepository;
-		if ($authorizationServerUrl === NULL) {
+		if ($authorizationServerUrl === null) {
 			$authorizationServerUrl = Config::AUTHORIZATION_SERVER_URL;
 		}
-		if ($apiBaseUrl === NULL) {
+		if ($apiBaseUrl === null) {
 			$apiBaseUrl = Config::API_URL;
 		}
-		if ($httpClient === NULL) {
-			$httpClient = new Client();
+		if ($httpClient === null) {
+			$httpClient = new Client(
+				[
+					RequestOptions::HTTP_ERRORS => false,
+				]
+			);
 		}
 		$this->authorizationServerUrl = $authorizationServerUrl;
 		$this->apiBaseUrl = $apiBaseUrl;
@@ -154,7 +159,7 @@ protected function parseToken(ResponseInterface $response)
 	private function createResponse(RequestInterface $request)
 	{
 		$response = $this->callApi($this->buildRequest($request));
-		if ($response->getStatusCode() === 401 && $response->getHeader(self::SIZEID_ERROR_CODE_HEADER) == 109) {
+		if ($response->getStatusCode() === 401 && $response->getHeaderLine(self::SIZEID_ERROR_CODE_HEADER) == 109) {
 			$this->refreshAccessToken();
 			return $this->callApi($this->buildRequest($request));
 		}
@@ -176,9 +181,7 @@ private function callApi(RequestInterface $request)
 	 */
 	private function buildRequest(RequestInterface $request)
 	{
-		$request = clone $request;
-		$request->addHeader('Authorization', 'Bearer ' . $this->getAccessToken()->getAccessToken());
-		$request->setUrl($this->apiBaseUrl . '/' . $request->getUrl());
-		return $request;
+		return $request->withAddedHeader('Authorization', 'Bearer ' . $this->getAccessToken()->getAccessToken())
+			->withUri(new Uri($this->apiBaseUrl . '/' . $request->getUri()));
 	}
 }

src/ClientApi.php

@@ -46,7 +46,7 @@ public function acquireNewAccessToken()
 		$response = $this->httpClient->post(
 			$this->authorizationServerUrl . '/access-token',
 			[
-				'body' => [
+				'form_params' => [
 					'grant_type' => 'client_credentials',
 					'client_id' => $this->clientId,
 					'client_secret' => $this->clientSecret,

src/UserApi.php

@@ -4,8 +4,9 @@
 
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Url;
+use Psr\Http\Message\ResponseInterface;
+use GuzzleHttp\Psr7\Uri;
+use Psr\Http\Message\UriInterface;
 use SizeID\OAuth2\Entities\AccessToken;
 use SizeID\OAuth2\Exceptions\InvalidCSRFTokenException;
 use SizeID\OAuth2\Exceptions\InvalidStateException;
@@ -69,16 +70,13 @@ public function __construct(
 	 */
 	public function getAuthorizationUrl()
 	{
-		$url = Url::fromString($this->authorizationServerUrl);
-		$url->setQuery(
-			[
-				'response_type' => 'code',
-				'client_id' => $this->clientId,
-				'redirect_uri' => $this->redirectUri,
-				'state' => $this->csrfTokenRepository->generateCSRFToken(),
-			]
-		);
-		return $url;
+		$url = new Uri($this->authorizationServerUrl);
+		return Uri::withQueryValues($url, [
+			'response_type' => 'code',
+			'client_id' => $this->clientId,
+			'redirect_uri' => $this->redirectUri,
+			'state' => $this->csrfTokenRepository->generateCSRFToken(),
+		]);
 	}
 
 	/**
@@ -149,7 +147,7 @@ public function refreshAccessToken()
 			$this->saveTokenFromResponse($response);
 		} catch (ClientException $ex) {
 			$response = $ex->getResponse();
-			$sizeIdErrorCode = (int)$response->getHeader(self::SIZEID_ERROR_CODE_HEADER);
+			$sizeIdErrorCode = (int)$response->getHeaderLine(self::SIZEID_ERROR_CODE_HEADER);
 			if ($response->getStatusCode() === 400 && $sizeIdErrorCode === 108) {
 				//refresh token expired
 				throw RedirectException::create(

tests/ApiTest.phpt

@@ -2,8 +2,8 @@
 
 namespace SizeID\OAuth2\Tests;
 
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
 use Mockery as m;
 use SizeID\OAuth2\ClientApi;
 use SizeID\OAuth2\Entities\AccessToken;
@@ -20,7 +20,7 @@ class ApiTest extends TestCase
 		$tokenRepository = m::mock('SizeID\OAuth2\Repositories\SessionAccessTokenRepository');
 		$tokenRepository
 			->shouldReceive('hasAccessToken')
-			->andReturn(NULL);
+			->andReturn(null);
 		$clientApi = new ClientApi(
 			'clientId',
 			'clientSecret',

tests/ClientApiTest.phpt

@@ -2,12 +2,14 @@
 
 namespace SizeID\OAuth2\Tests;
 
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
 use Mockery as m;
+use Psr\Http\Message\StreamInterface;
 use SizeID\OAuth2\Api;
 use SizeID\OAuth2\ClientApi;
 use SizeID\OAuth2\Entities\AccessToken;
+use SizeID\OAuth2\Repositories\SessionAccessTokenRepository;
 use Tester\Assert;
 use Tester\TestCase;
 
@@ -27,7 +29,7 @@ class ClientApiTest extends TestCase
 
 	public function testAcquireToken()
 	{
-		$tokenRepository = m::mock('SizeID\OAuth2\Repositories\SessionAccessTokenRepository');
+		$tokenRepository = m::mock(SessionAccessTokenRepository::class);
 		$tokenRepository
 			->shouldReceive('hasAccessToken')
 			->andReturn(FALSE);
@@ -38,7 +40,7 @@ class ClientApiTest extends TestCase
 			->shouldReceive('getAccessToken')
 			->andReturn($accessToken);
 		$httpClient = m::mock('GuzzleHttp\Client');
-		$stream = m::mock('GuzzleHttp\Stream\StreamInterface');
+		$stream = m::mock(StreamInterface::class);
 		$stream
 			->shouldReceive('getContents')
 			->andReturn('{"access_token":"token", "expires_in": 60}');
@@ -57,13 +59,13 @@ class ClientApiTest extends TestCase
 			NULL,
 			$httpClient
 		);
-		Assert::type('SizeID\OAuth2\ClientApi', $clientApi);
+		Assert::type(ClientApi::class, $clientApi);
 		$clientApi->send(new Request('get', 'client'));
 	}
 
 	public function testRefreshToken()
 	{
-		$tokenRepository = m::mock('SizeID\OAuth2\Repositories\SessionAccessTokenRepository');
+		$tokenRepository = m::mock(SessionAccessTokenRepository::class);
 		$tokenRepository
 			->shouldReceive('hasAccessToken')
 			->andReturn(TRUE);
@@ -78,7 +80,7 @@ class ClientApiTest extends TestCase
 		$httpClient
 			->shouldReceive('send')
 			->andReturn($response);
-		$stream = m::mock('GuzzleHttp\Stream\StreamInterface');
+		$stream = m::mock(StreamInterface::class);
 		$stream
 			->shouldReceive('getContents')
 			->andReturn('{"access_token":"token", "expires_in": 60}');
@@ -97,8 +99,8 @@ class ClientApiTest extends TestCase
 			NULL,
 			$httpClient
 		);
-		Assert::type('SizeID\OAuth2\ClientApi', $clientApi);
-		Assert::type('GuzzleHttp\Message\Response', $clientApi->send(new Request('POST', 'client')));
+		Assert::type(ClientApi::class, $clientApi);
+		Assert::type(Response::class, $clientApi->send(new Request('POST', 'client')));
 	}
 }