From 439d41b194073285ab97be94253b3f4cb4395e43 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Dec 2017 15:48:49 +0100 Subject: install smarty via composer and update other php libs --- .../oauth2-server-php/test/OAuth2/AutoloadTest.php | 4 +- .../OAuth2/Controller/AuthorizeControllerTest.php | 3 +- .../OAuth2/Controller/ResourceControllerTest.php | 3 +- .../test/OAuth2/Controller/TokenControllerTest.php | 45 +++++++++++++++++++++- .../test/OAuth2/Encryption/FirebaseJwtTest.php | 3 +- .../test/OAuth2/Encryption/JwtTest.php | 3 +- .../OAuth2/GrantType/AuthorizationCodeTest.php | 3 +- .../OAuth2/GrantType/ClientCredentialsTest.php | 3 +- .../test/OAuth2/GrantType/ImplicitTest.php | 3 +- .../test/OAuth2/GrantType/JwtBearerTest.php | 3 +- .../test/OAuth2/GrantType/RefreshTokenTest.php | 3 +- .../test/OAuth2/GrantType/UserCredentialsTest.php | 3 +- .../OpenID/Controller/AuthorizeControllerTest.php | 3 +- .../OpenID/Controller/UserInfoControllerTest.php | 3 +- .../OpenID/GrantType/AuthorizationCodeTest.php | 3 +- .../OAuth2/OpenID/ResponseType/CodeIdTokenTest.php | 3 +- .../OAuth2/OpenID/ResponseType/IdTokenTest.php | 3 +- .../OpenID/ResponseType/IdTokenTokenTest.php | 3 +- .../oauth2-server-php/test/OAuth2/RequestTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ResponseTest.php | 4 +- .../test/OAuth2/ResponseType/AccessTokenTest.php | 3 +- .../OAuth2/ResponseType/JwtAccessTokenTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ScopeTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ServerTest.php | 3 +- .../test/OAuth2/TokenType/BearerTest.php | 3 +- 25 files changed, 93 insertions(+), 26 deletions(-) (limited to 'vendor/bshaffer/oauth2-server-php/test/OAuth2') diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/AutoloadTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/AutoloadTest.php index 5901bdc42..2cb292389 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/AutoloadTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/AutoloadTest.php @@ -2,7 +2,9 @@ namespace OAuth2; -class AutoloadTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class AutoloadTest extends TestCase { public function testClassesExist() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php index 3bfc760e4..fe3553b23 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php @@ -10,8 +10,9 @@ use OAuth2\GrantType\AuthorizationCode; use OAuth2\Request; use OAuth2\Response; use OAuth2\Request\TestRequest; +use PHPUnit\Framework\TestCase; -class AuthorizeControllerTest extends \PHPUnit_Framework_TestCase +class AuthorizeControllerTest extends TestCase { public function testNoClientIdResponse() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/ResourceControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/ResourceControllerTest.php index b277514a5..cd54d239a 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/ResourceControllerTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/ResourceControllerTest.php @@ -7,8 +7,9 @@ use OAuth2\Server; use OAuth2\GrantType\AuthorizationCode; use OAuth2\Request; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class ResourceControllerTest extends \PHPUnit_Framework_TestCase +class ResourceControllerTest extends TestCase { public function testNoAccessToken() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/TokenControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/TokenControllerTest.php index 4a217bd55..d18eaa6d7 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/TokenControllerTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/TokenControllerTest.php @@ -10,8 +10,9 @@ use OAuth2\GrantType\UserCredentials; use OAuth2\Scope; use OAuth2\Request\TestRequest; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class TokenControllerTest extends \PHPUnit_Framework_TestCase +class TokenControllerTest extends TestCase { public function testNoGrantType() { @@ -271,6 +272,48 @@ class TokenControllerTest extends \PHPUnit_Framework_TestCase $this->assertEquals($response->getParameter('error_description'), 'The request method must be POST when revoking an access token'); } + public function testCanUseCrossOriginRequestForRevoke() + { + $server = $this->getTestServer(); + + $request = new TestRequest(); + $request->setMethod('OPTIONS'); + + $server->handleRevokeRequest($request, $response = new Response()); + $this->assertTrue($response instanceof Response); + $this->assertEquals(200, $response->getStatusCode(), var_export($response, 1)); + $this->assertEquals($response->getHttpHeader('Allow'), 'POST, OPTIONS'); + } + + public function testInvalidRequestMethodForAccessToken() + { + $server = $this->getTestServer(); + + $request = new TestRequest(); + $request->setQuery(array( + 'token_type_hint' => 'access_token' + )); + + $server->handleTokenRequest($request, $response = new Response()); + $this->assertTrue($response instanceof Response); + $this->assertEquals(405, $response->getStatusCode(), var_export($response, 1)); + $this->assertEquals($response->getParameter('error'), 'invalid_request'); + $this->assertEquals($response->getParameter('error_description'), 'The request method must be POST when requesting an access token'); + } + + public function testCanUseCrossOriginRequestForAccessToken() + { + $server = $this->getTestServer(); + + $request = new TestRequest(); + $request->setMethod('OPTIONS'); + + $server->handleTokenRequest($request, $response = new Response()); + $this->assertTrue($response instanceof Response); + $this->assertEquals(200, $response->getStatusCode(), var_export($response, 1)); + $this->assertEquals($response->getHttpHeader('Allow'), 'POST, OPTIONS'); + } + public function testCreateController() { $storage = Bootstrap::getInstance()->getMemoryStorage(); diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php index d34136767..c7e92c053 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php @@ -3,8 +3,9 @@ namespace OAuth2\Encryption; use OAuth2\Storage\Bootstrap; +use PHPUnit\Framework\TestCase; -class FirebaseJwtTest extends \PHPUnit_Framework_TestCase +class FirebaseJwtTest extends TestCase { private $privateKey; diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php index 214eebac8..d73b4c923 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php @@ -3,8 +3,9 @@ namespace OAuth2\Encryption; use OAuth2\Storage\Bootstrap; +use PHPUnit\Framework\TestCase; -class JwtTest extends \PHPUnit_Framework_TestCase +class JwtTest extends TestCase { private $privateKey; diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/AuthorizationCodeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/AuthorizationCodeTest.php index 356b8e53c..b2314ffc6 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/AuthorizationCodeTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/AuthorizationCodeTest.php @@ -6,8 +6,9 @@ use OAuth2\Storage\Bootstrap; use OAuth2\Server; use OAuth2\Request\TestRequest; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class AuthorizationCodeTest extends \PHPUnit_Framework_TestCase +class AuthorizationCodeTest extends TestCase { public function testNoCode() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ClientCredentialsTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ClientCredentialsTest.php index f0d46ccb3..2a7d0eb3d 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ClientCredentialsTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ClientCredentialsTest.php @@ -7,8 +7,9 @@ use OAuth2\Server; use OAuth2\Request\TestRequest; use OAuth2\Request; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class ClientCredentialsTest extends \PHPUnit_Framework_TestCase +class ClientCredentialsTest extends TestCase { public function testInvalidCredentials() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ImplicitTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ImplicitTest.php index a47aae3e8..14bf980f1 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ImplicitTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ImplicitTest.php @@ -6,8 +6,9 @@ use OAuth2\Storage\Bootstrap; use OAuth2\Server; use OAuth2\Request; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class ImplicitTest extends \PHPUnit_Framework_TestCase +class ImplicitTest extends TestCase { public function testImplicitNotAllowedResponse() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php index 0a6c4b827..e60023b3c 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php @@ -7,8 +7,9 @@ use OAuth2\Server; use OAuth2\Request\TestRequest; use OAuth2\Response; use OAuth2\Encryption\Jwt; +use PHPUnit\Framework\TestCase; -class JwtBearerTest extends \PHPUnit_Framework_TestCase +class JwtBearerTest extends TestCase { private $privateKey; diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/RefreshTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/RefreshTokenTest.php index a458aad8a..c964c6bbd 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/RefreshTokenTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/RefreshTokenTest.php @@ -6,8 +6,9 @@ use OAuth2\Storage\Bootstrap; use OAuth2\Server; use OAuth2\Request\TestRequest; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class RefreshTokenTest extends \PHPUnit_Framework_TestCase +class RefreshTokenTest extends TestCase { private $storage; diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/UserCredentialsTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/UserCredentialsTest.php index 18943d055..8b725e13a 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/UserCredentialsTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/UserCredentialsTest.php @@ -6,8 +6,9 @@ use OAuth2\Storage\Bootstrap; use OAuth2\Server; use OAuth2\Request\TestRequest; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class UserCredentialsTest extends \PHPUnit_Framework_TestCase +class UserCredentialsTest extends TestCase { public function testNoUsername() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php index 46de936d8..fdc16daba 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php @@ -6,8 +6,9 @@ use OAuth2\Storage\Bootstrap; use OAuth2\Server; use OAuth2\Request; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class AuthorizeControllerTest extends \PHPUnit_Framework_TestCase +class AuthorizeControllerTest extends TestCase { public function testValidateAuthorizeRequest() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php index b1b687077..62e84df57 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php @@ -6,8 +6,9 @@ use OAuth2\Storage\Bootstrap; use OAuth2\Server; use OAuth2\Request; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class UserInfoControllerTest extends \PHPUnit_Framework_TestCase +class UserInfoControllerTest extends TestCase { public function testCreateController() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php index 776002d1e..c89a1ae97 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php @@ -6,8 +6,9 @@ use OAuth2\Storage\Bootstrap; use OAuth2\Server; use OAuth2\Request\TestRequest; use OAuth2\Response; +use PHPUnit\Framework\TestCase; -class AuthorizationCodeTest extends \PHPUnit_Framework_TestCase +class AuthorizationCodeTest extends TestCase { public function testValidCode() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php index b0311434a..7b892c946 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php @@ -7,8 +7,9 @@ use OAuth2\Request; use OAuth2\Response; use OAuth2\Storage\Bootstrap; use OAuth2\GrantType\ClientCredentials; +use PHPUnit\Framework\TestCase; -class CodeIdTokenTest extends \PHPUnit_Framework_TestCase +class CodeIdTokenTest extends TestCase { public function testHandleAuthorizeRequest() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php index e772f6be4..a0df3a936 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php @@ -8,8 +8,9 @@ use OAuth2\Response; use OAuth2\Storage\Bootstrap; use OAuth2\GrantType\ClientCredentials; use OAuth2\Encryption\Jwt; +use PHPUnit\Framework\TestCase; -class IdTokenTest extends \PHPUnit_Framework_TestCase +class IdTokenTest extends TestCase { public function testValidateAuthorizeRequest() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php index bc564d37b..0573a9866 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php @@ -8,8 +8,9 @@ use OAuth2\Response; use OAuth2\Storage\Bootstrap; use OAuth2\GrantType\ClientCredentials; use OAuth2\ResponseType\AccessToken; +use PHPUnit\Framework\TestCase; -class IdTokenTokenTest extends \PHPUnit_Framework_TestCase +class IdTokenTokenTest extends TestCase { public function testHandleAuthorizeRequest() diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/RequestTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/RequestTest.php index 10db3215c..cbf8f096b 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/RequestTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/RequestTest.php @@ -5,8 +5,9 @@ namespace OAuth2; use OAuth2\Request\TestRequest; use OAuth2\Storage\Bootstrap; use OAuth2\GrantType\AuthorizationCode; +use PHPUnit\Framework\TestCase; -class RequestTest extends \PHPUnit_Framework_TestCase +class RequestTest extends TestCase { public function testRequestOverride() { diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php index b8149005d..2d2c57ee6 100644 --- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php +++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php @@ -1,8 +1,8 @@