From 23c7138d48f0d760d3faeb2ef4eb2c9186ee293d Mon Sep 17 00:00:00 2001 From: Brian Retterer Date: Mon, 23 Oct 2017 15:26:10 +0000 Subject: [PATCH 1/3] Apply fixes from StyleCI --- src/AuthorizationServer.php | 1 + src/CryptTrait.php | 4 ++++ src/ResponseTypes/AbstractResponseType.php | 1 - tests/AuthorizationServerTest.php | 1 - tests/CryptTraitTest.php | 1 - tests/Grant/AbstractGrantTest.php | 1 - tests/Grant/AuthCodeGrantTest.php | 1 - tests/Stubs/CryptTraitStub.php | 1 - 8 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php index 46a9b27a..35e745d3 100644 --- a/src/AuthorizationServer.php +++ b/src/AuthorizationServer.php @@ -3,6 +3,7 @@ * @author Alex Bilbie * @copyright Copyright (c) Alex Bilbie * @license http://mit-license.org/ + * * @link https://github.com/thephpleague/oauth2-server */ diff --git a/src/CryptTrait.php b/src/CryptTrait.php index 805969b0..125a757e 100644 --- a/src/CryptTrait.php +++ b/src/CryptTrait.php @@ -1,9 +1,11 @@ * @copyright Copyright (c) Alex Bilbie * @license http://mit-license.org/ + * * @link https://github.com/thephpleague/oauth2-server */ @@ -24,6 +26,7 @@ trait CryptTrait * @param string $unencryptedData * * @throws \LogicException + * * @return string */ protected function encrypt($unencryptedData) @@ -41,6 +44,7 @@ trait CryptTrait * @param string $encryptedData * * @throws \LogicException + * * @return string */ protected function decrypt($encryptedData) diff --git a/src/ResponseTypes/AbstractResponseType.php b/src/ResponseTypes/AbstractResponseType.php index 0c256f17..d013bab0 100644 --- a/src/ResponseTypes/AbstractResponseType.php +++ b/src/ResponseTypes/AbstractResponseType.php @@ -60,5 +60,4 @@ abstract class AbstractResponseType implements ResponseTypeInterface { $this->privateKey = $key; } - } diff --git a/tests/AuthorizationServerTest.php b/tests/AuthorizationServerTest.php index 91ca9e4b..4571c5e1 100644 --- a/tests/AuthorizationServerTest.php +++ b/tests/AuthorizationServerTest.php @@ -3,7 +3,6 @@ namespace LeagueTests; use League\OAuth2\Server\AuthorizationServer; -use League\OAuth2\Server\CryptKey; use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Grant\AuthCodeGrant; use League\OAuth2\Server\Grant\ClientCredentialsGrant; diff --git a/tests/CryptTraitTest.php b/tests/CryptTraitTest.php index 8c7d2642..3d60ec9d 100644 --- a/tests/CryptTraitTest.php +++ b/tests/CryptTraitTest.php @@ -2,7 +2,6 @@ namespace LeagueTests\Utils; -use League\OAuth2\Server\CryptKey; use LeagueTests\Stubs\CryptTraitStub; class CryptTraitTest extends \PHPUnit_Framework_TestCase diff --git a/tests/Grant/AbstractGrantTest.php b/tests/Grant/AbstractGrantTest.php index 542c78dc..4cd490e3 100644 --- a/tests/Grant/AbstractGrantTest.php +++ b/tests/Grant/AbstractGrantTest.php @@ -3,7 +3,6 @@ namespace LeagueTests\Grant; use League\Event\Emitter; -use League\OAuth2\Server\CryptKey; use League\OAuth2\Server\Entities\AccessTokenEntityInterface; use League\OAuth2\Server\Entities\AuthCodeEntityInterface; use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; diff --git a/tests/Grant/AuthCodeGrantTest.php b/tests/Grant/AuthCodeGrantTest.php index 3bccba0a..d63aec29 100644 --- a/tests/Grant/AuthCodeGrantTest.php +++ b/tests/Grant/AuthCodeGrantTest.php @@ -2,7 +2,6 @@ namespace LeagueTests\Grant; -use League\OAuth2\Server\CryptKey; use League\OAuth2\Server\Entities\AccessTokenEntityInterface; use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Exception\OAuthServerException; diff --git a/tests/Stubs/CryptTraitStub.php b/tests/Stubs/CryptTraitStub.php index a481a849..3fe02199 100644 --- a/tests/Stubs/CryptTraitStub.php +++ b/tests/Stubs/CryptTraitStub.php @@ -2,7 +2,6 @@ namespace LeagueTests\Stubs; -use League\OAuth2\Server\CryptKey; use League\OAuth2\Server\CryptTrait; class CryptTraitStub From 63c2c21ee66a37fe4f42f35676294a99983d1419 Mon Sep 17 00:00:00 2001 From: Brian Retterer Date: Mon, 23 Oct 2017 11:26:21 -0400 Subject: [PATCH 2/3] Update readme file to bring in Andy, Brian, and Simon --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0cf7b95b..4f8b0906 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,8 @@ This package is released under the MIT License. See the bundled [LICENSE](https: ## Credits -This code is principally developed and maintained by [Alex Bilbie](https://twitter.com/alexbilbie). +This code is principally developed and maintained by [Andy Millington](https://twitter.com/Sephster), [Brian +Retterer](https://twitter.com/bretterer), and [Simon Hamp](https://twitter.com/simonhamp). Special thanks to [all of these awesome contributors](https://github.com/thephpleague/oauth2-server/contributors). From 4d77aee4a9eef4c7523a24cf7512463f5cea23f7 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Sat, 28 Oct 2017 18:29:55 +0700 Subject: [PATCH 3/3] =?UTF-8?q?Added=20a=20reference=20to=20myself=C2=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4f8b0906..93e3341e 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,8 @@ This package is released under the MIT License. See the bundled [LICENSE](https: This code is principally developed and maintained by [Andy Millington](https://twitter.com/Sephster), [Brian Retterer](https://twitter.com/bretterer), and [Simon Hamp](https://twitter.com/simonhamp). +Between 2012 and 2017 this library was developed and maintained by [Alex Bilbie](https://alexbilbie.com/). + Special thanks to [all of these awesome contributors](https://github.com/thephpleague/oauth2-server/contributors). Additional thanks go to the [Mozilla Secure Open Source Fund](https://wiki.mozilla.org/MOSS/Secure_Open_Source) for funding a security audit of this library.