Applied fixes from StyleCI

examples/public/auth_code.php

@@ -3,19 +3,17 @@
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Grant\AuthCodeGrant;
 use League\OAuth2\Server\Server;
-
 use OAuth2ServerExamples\Repositories\AccessTokenRepository;
 use OAuth2ServerExamples\Repositories\AuthCodeRepository;
 use OAuth2ServerExamples\Repositories\ClientRepository;
 use OAuth2ServerExamples\Repositories\RefreshTokenRepository;
 use OAuth2ServerExamples\Repositories\ScopeRepository;
 use OAuth2ServerExamples\Repositories\UserRepository;
-
 use Slim\App;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-include(__DIR__ . '/../vendor/autoload.php');
+include __DIR__.'/../vendor/autoload.php';
 
 // App
 $app = new App([
@@ -29,8 +27,8 @@ $app = new App([
         $refreshTokenRepository = new RefreshTokenRepository();
         $authCodeRepository = new AuthCodeRepository();
 
-        $privateKeyPath = 'file://' . __DIR__ . '/../private.key';
-        $publicKeyPath = 'file://' . __DIR__ . '/../public.key';
+        $privateKeyPath = 'file://'.__DIR__.'/../private.key';
+        $publicKeyPath = 'file://'.__DIR__.'/../public.key';
 
         // Setup the authorization server
         $server = new Server(

examples/public/client_credentials.php

@@ -3,16 +3,14 @@
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Grant\ClientCredentialsGrant;
 use League\OAuth2\Server\Server;
-
 use OAuth2ServerExamples\Repositories\AccessTokenRepository;
 use OAuth2ServerExamples\Repositories\ClientRepository;
 use OAuth2ServerExamples\Repositories\ScopeRepository;
-
 use Slim\App;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-include(__DIR__ . '/../vendor/autoload.php');
+include __DIR__.'/../vendor/autoload.php';
 
 // App
 $app = new App([
@@ -23,8 +21,8 @@ $app = new App([
         $scopeRepository = new ScopeRepository();
         $accessTokenRepository = new AccessTokenRepository();
 
-        $privateKeyPath = 'file://' . __DIR__ . '/../private.key';
-        $publicKeyPath = 'file://' . __DIR__ . '/../public.key';
+        $privateKeyPath = 'file://'.__DIR__.'/../private.key';
+        $publicKeyPath = 'file://'.__DIR__.'/../public.key';
 
         // Setup the authorization server
         $server = new Server(
@@ -39,7 +37,7 @@ $app = new App([
         $server->enableGrantType(new ClientCredentialsGrant(), new \DateInterval('PT1H'));
 
         return $server;
-    }
+    },
 ]);
 
 $app->post('/access_token', function (Request $request, Response $response) {

examples/public/middleware_authentication.php

@@ -4,16 +4,14 @@ use League\OAuth2\Server\Grant\PasswordGrant;
 use League\OAuth2\Server\Grant\RefreshTokenGrant;
 use League\OAuth2\Server\Middleware\AuthenticationServerMiddleware;
 use League\OAuth2\Server\Server;
-
 use OAuth2ServerExamples\Repositories\AccessTokenRepository;
 use OAuth2ServerExamples\Repositories\ClientRepository;
 use OAuth2ServerExamples\Repositories\RefreshTokenRepository;
 use OAuth2ServerExamples\Repositories\ScopeRepository;
 use OAuth2ServerExamples\Repositories\UserRepository;
-
 use Slim\App;
 
-include(__DIR__ . '/../vendor/autoload.php');
+include __DIR__.'/../vendor/autoload.php';
 
 // App
 $app = new App([
@@ -29,8 +27,8 @@ $app = new App([
         $userRepository = new UserRepository();
         $refreshTokenRepository = new RefreshTokenRepository();
 
-        $privateKeyPath = 'file://' . __DIR__ . '/../private.key';
-        $publicKeyPath = 'file://' . __DIR__ . '/../public.key';
+        $privateKeyPath = 'file://'.__DIR__.'/../private.key';
+        $publicKeyPath = 'file://'.__DIR__.'/../public.key';
 
         // Setup the authorization server
         $server = new Server(
@@ -52,7 +50,7 @@ $app = new App([
         );
 
         return $server;
-    }
+    },
 ]);
 
 $app->post('/access_token', function () {

examples/public/password.php

@@ -3,18 +3,16 @@
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Grant\PasswordGrant;
 use League\OAuth2\Server\Server;
-
 use OAuth2ServerExamples\Repositories\AccessTokenRepository;
 use OAuth2ServerExamples\Repositories\ClientRepository;
 use OAuth2ServerExamples\Repositories\RefreshTokenRepository;
 use OAuth2ServerExamples\Repositories\ScopeRepository;
 use OAuth2ServerExamples\Repositories\UserRepository;
-
 use Slim\App;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-include(__DIR__ . '/../vendor/autoload.php');
+include __DIR__.'/../vendor/autoload.php';
 
 // App
 $app = new App([
@@ -27,8 +25,8 @@ $app = new App([
         $userRepository = new UserRepository();
         $refreshTokenRepository = new RefreshTokenRepository();
 
-        $privateKeyPath = 'file://' . __DIR__ . '/../private.key';
-        $publicKeyPath = 'file://' . __DIR__ . '/../public.key';
+        $privateKeyPath = 'file://'.__DIR__.'/../private.key';
+        $publicKeyPath = 'file://'.__DIR__.'/../public.key';
 
         // Setup the authorization server
         $server = new Server(
@@ -46,7 +44,7 @@ $app = new App([
         );
 
         return $server;
-    }
+    },
 ]);
 
 $app->post('/access_token', function (Request $request, Response $response) {

examples/public/protected_api.php

@@ -2,16 +2,14 @@
 
 use League\OAuth2\Server\Middleware\ResourceServerMiddleware;
 use League\OAuth2\Server\Server;
-
 use OAuth2ServerExamples\Repositories\AccessTokenRepository;
 use OAuth2ServerExamples\Repositories\ClientRepository;
 use OAuth2ServerExamples\Repositories\ScopeRepository;
-
 use Slim\App;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-include(__DIR__ . '/../vendor/autoload.php');
+include __DIR__.'/../vendor/autoload.php';
 
 // App
 $app = new App([
@@ -25,8 +23,8 @@ $app = new App([
         $scopeRepository = new ScopeRepository();
         $accessTokenRepository = new AccessTokenRepository();
 
-        $privateKeyPath = 'file://' . __DIR__ . '/../private.key';
-        $publicKeyPath = 'file://' . __DIR__ . '/../public.key';
+        $privateKeyPath = 'file://'.__DIR__.'/../private.key';
+        $publicKeyPath = 'file://'.__DIR__.'/../public.key';
 
         // Setup the authorization server
         $server = new Server(
@@ -38,7 +36,7 @@ $app = new App([
         );
 
         return $server;
-    }
+    },
 ]);
 
 $app->add(new ResourceServerMiddleware($app->getContainer()->get(Server::class)));
@@ -50,7 +48,7 @@ $app->post('/api/example', function (Request $request, Response $response) {
         $params = [
             'id'   => 1,
             'name' => 'Alex',
-            'city' => 'London'
+            'city' => 'London',
         ];
     }
 

examples/public/refresh_token.php

@@ -3,19 +3,15 @@
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Grant\RefreshTokenGrant;
 use League\OAuth2\Server\Server;
-
 use OAuth2ServerExamples\Repositories\AccessTokenRepository;
 use OAuth2ServerExamples\Repositories\ClientRepository;
 use OAuth2ServerExamples\Repositories\RefreshTokenRepository;
 use OAuth2ServerExamples\Repositories\ScopeRepository;
-
 use Slim\App;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-include(__DIR__ . '/../vendor/autoload.php');
-
-
+include __DIR__.'/../vendor/autoload.php';
 
 // App
 $app = new App([Server::class => function () {
@@ -25,8 +21,8 @@ $app = new App([Server::class => function () {
     $accessTokenRepository = new AccessTokenRepository();
     $refreshTokenRepository = new RefreshTokenRepository();
 
-    $privateKeyPath = 'file://' . __DIR__ . '/../private.key';
-    $publicKeyPath = 'file://' . __DIR__ . '/../public.key';
+    $privateKeyPath = 'file://'.__DIR__.'/../private.key';
+    $publicKeyPath = 'file://'.__DIR__.'/../public.key';
 
     // Setup the authorization server
     $server = new Server(

examples/src/Entities/UserEntity.php

@@ -7,11 +7,12 @@ use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface;
 class UserEntity implements UserEntityInterface
 {
     /**
-     * Return the user's identifier
+     * Return the user's identifier.
+     *
      * @return mixed
      */
     public function getIdentifier()
     {
         return 1;
     }
-}
+}

examples/src/Repositories/AccessTokenRepository.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace OAuth2ServerExamples\Repositories;
 
 use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
@@ -7,7 +8,7 @@ use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
 class AccessTokenRepository implements AccessTokenRepositoryInterface
 {
     /**
-     * Persists a new access token to permanent storage
+     * Persists a new access token to permanent storage.
      *
      * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessTokenEntity
      */
@@ -17,7 +18,7 @@ class AccessTokenRepository implements AccessTokenRepositoryInterface
     }
 
     /**
-     * Revoke an access token
+     * Revoke an access token.
      *
      * @param string $tokenId
      */
@@ -27,7 +28,7 @@ class AccessTokenRepository implements AccessTokenRepositoryInterface
     }
 
     /**
-     * Check if the access token has been revoked
+     * Check if the access token has been revoked.
      *
      * @param string $tokenId
      *

examples/src/Repositories/AuthCodeRepository.php

@@ -7,9 +7,8 @@ use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
 
 class AuthCodeRepository implements AuthCodeRepositoryInterface
 {
-
     /**
-     * Persists a new auth code to permanent storage
+     * Persists a new auth code to permanent storage.
      *
      * @param \League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface $authCodeEntity
      */
@@ -19,7 +18,7 @@ class AuthCodeRepository implements AuthCodeRepositoryInterface
     }
 
     /**
-     * Revoke an auth code
+     * Revoke an auth code.
      *
      * @param string $codeId
      */
@@ -29,7 +28,7 @@ class AuthCodeRepository implements AuthCodeRepositoryInterface
     }
 
     /**
-     * Check if the auth code has been revoked
+     * Check if the auth code has been revoked.
      *
      * @param string $codeId
      *
@@ -39,4 +38,4 @@ class AuthCodeRepository implements AuthCodeRepositoryInterface
     {
         // TODO: Implement isAuthCodeRevoked() method.
     }
-}
+}

examples/src/Repositories/ClientRepository.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace OAuth2ServerExamples\Repositories;
 
 use League\OAuth2\Server\Entities\ClientEntity;
@@ -7,7 +8,7 @@ use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 class ClientRepository implements ClientRepositoryInterface
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function getClientEntity($clientIdentifier, $clientSecret = null, $redirectUri = null, $grantType = null)
     {
@@ -15,23 +16,23 @@ class ClientRepository implements ClientRepositoryInterface
             'myawesomeapp' => [
                 'secret'       => password_hash('abc123', PASSWORD_BCRYPT),
                 'name'         => 'My Awesome App',
-                'redirect_uri' => 'http://foo/bar'
-            ]
+                'redirect_uri' => 'http://foo/bar',
+            ],
         ];
 
         // Check if client is registered
         if (array_key_exists($clientIdentifier, $clients) === false) {
-            return null;
+            return;
         }
 
         // Check if client secret is valid
         if ($clientSecret !== null && password_verify($clientSecret, $clients[$clientIdentifier]['secret']) === false) {
-            return null;
+            return;
         }
 
         // Check if redirect URI is valid
         if ($redirectUri !== null && $redirectUri !== $clients[$clientIdentifier]['redirect_uri']) {
-            return null;
+            return;
         }
 
         $client = new ClientEntity();

examples/src/Repositories/RefreshTokenRepository.php

@@ -7,9 +7,8 @@ use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
 
 class RefreshTokenRepository implements RefreshTokenRepositoryInterface
 {
-
     /**
-     * Create a new refresh token_name
+     * Create a new refresh token_name.
      *
      * @param \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface $refreshTokenEntityInterface
      */
@@ -19,7 +18,7 @@ class RefreshTokenRepository implements RefreshTokenRepositoryInterface
     }
 
     /**
-     * Revoke the refresh token
+     * Revoke the refresh token.
      *
      * @param string $tokenId
      */
@@ -29,7 +28,7 @@ class RefreshTokenRepository implements RefreshTokenRepositoryInterface
     }
 
     /**
-     * Check if the refresh token has been revoked
+     * Check if the refresh token has been revoked.
      *
      * @param string $tokenId
      *

examples/src/Repositories/ScopeRepository.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace OAuth2ServerExamples\Repositories;
 
 use League\OAuth2\Server\Entities\ScopeEntity;
@@ -7,21 +8,21 @@ use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
 class ScopeRepository implements ScopeRepositoryInterface
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function getScopeEntityByIdentifier($scopeIdentifier, $grantType, $clientId = null)
     {
         $scopes = [
             'basic' => [
-                'description' => 'Basic details about you'
+                'description' => 'Basic details about you',
             ],
             'email' => [
-                'description' => 'Your email address'
-            ]
+                'description' => 'Your email address',
+            ],
         ];
 
         if (array_key_exists($scopeIdentifier, $scopes) === false) {
-            return null;
+            return;
         }
 
         $scope = new ScopeEntity();

examples/src/Repositories/UserRepository.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace OAuth2ServerExamples\Repositories;
 
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
@@ -7,7 +8,7 @@ use OAuth2ServerExamples\Entities\UserEntity;
 class UserRepository implements UserRepositoryInterface
 {
     /**
-     * Get a user entity
+     * Get a user entity.
      *
      * @param string $username
      * @param string $password
@@ -20,6 +21,6 @@ class UserRepository implements UserRepositoryInterface
             return new UserEntity();
         }
 
-        return null;
+        return;
     }
 }