platine-php / framework

src/Env/Loader.php

Spacing +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
                 continue;

             }

 

-            $value = preg_replace_callback('~\$\{(\w+)\}~', function ($m) {

+            $value = preg_replace_callback('~\$\{(\w+)\}~', function($m) {

                 return (null === $ref = Env::get($m[1], null)) ? $m[0] : $ref;

             }, $value);

 

Braces +11 added lines, -12 removed lines

@@ -55,8 +55,7 @@ 
  * @class Loader

  * @package Platine\Framework\Env

  */

-class Loader

-{

+class Loader {
     /**

      * Put the parsed key value pair into

      * $_ENV super global.

@@ -92,7 +91,7 @@ 
         bool $overwrite = false,

         int $mode = self::PUTENV

     ): void {

-        if (!is_file($file)) {

+        if (!is_file($file)) {
             throw new InvalidArgumentException(sprintf(

                 'The [%s] file does not exist or is not readable',

                 $file

@@ -104,7 +103,7 @@ 
         $content = (string) preg_replace('/^\s*#/m', ';', $fileContent);

         $parsed  = parse_ini_string($content, false, INI_SCANNER_RAW);

 

-        if ($parsed === false) {

+        if ($parsed === false) {
             throw new RuntimeException(sprintf(

                 'The [%s] file cannot be parsed due to malformed values',

                 $file

@@ -127,9 +126,9 @@ 
         int $mode

     ): void {

         $default = microtime(true);

-        foreach ($vars as $key => $value) {

+        foreach ($vars as $key => $value) {
             // Skip if we already have value and cant override.

-            if (!$overwrite && $default !== Env::get($key, $default)) {

+            if (!$overwrite && $default !== Env::get($key, $default)) {
                 continue;

             }

 

@@ -163,12 +162,12 @@ 
         array $vars,

         int $mode

     ): void {

-        foreach ($vars as $key => $value) {

-            if (!$value || strpos($value, '${') === false) {

+        foreach ($vars as $key => $value) {
+            if (!$value || strpos($value, '${') === false) {
                 continue;

             }

 

-            $value = preg_replace_callback('~\$\{(\w+)\}~', function ($m) {

+            $value = preg_replace_callback('~\$\{(\w+)\}~', function ($m) {
                 return (null === $ref = Env::get($m[1], null)) ? $m[0] : $ref;

             }, $value);

 

@@ -185,7 +184,7 @@ 
      */

     protected function setValueEnv(string $key, string $value, int $mode): void

     {

-        if ($mode & self::ENV) {

+        if ($mode & self::ENV) {
             $_ENV[$key] = $value;

         }

     }

@@ -199,7 +198,7 @@ 
      */

     protected function setValueServer(string $key, string $value, int $mode): void

     {

-        if ($mode & self::SERVER) {

+        if ($mode & self::SERVER) {
             $_SERVER[$key] = $value;

         }

     }

@@ -213,7 +212,7 @@ 
      */

     protected function setValuePutenv(string $key, string $value, int $mode): void

     {

-        if ($mode & self::PUTENV) {

+        if ($mode & self::PUTENV) {
             putenv("$key=$value");

         }

     }

src/Env/Env.php

Indentation +6 added lines, -6 removed lines

@@ -115,12 +115,12 @@
         $options = 0

     ) {

         static $special = [

-          'true' => true,

-          'TRUE' => true,

-          'false' => false,

-          'FALSE' => false,

-          'null' => null,

-          'NULL' => null,

+            'true' => true,

+            'TRUE' => true,

+            'false' => false,

+            'FALSE' => false,

+            'null' => null,

+            'NULL' => null,

         ];

 

         $valueResolved = static::resolveReference($value);

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
             return $value;

         }

 

-        $valueResolved = preg_replace_callback('~\$\{(\w+)\}~', function ($m) {

+        $valueResolved = preg_replace_callback('~\$\{(\w+)\}~', function($m) {

             return (null === $ref = static::get($m[1], null)) ? $m[0] : $ref;

         }, $value);

 

Braces +14 added lines, -15 removed lines

@@ -52,8 +52,7 @@ 
  * @class Env

  * @package Platine\Framework\Env

  */

-class Env

-{

+class Env {
     /**

      * Get the environment variable by its key/name.

      * @param string $key

@@ -67,8 +66,8 @@ 
         $default = null,

         ?string $filter = null,

         $options = 0

-    ) {

-        if ($filter !== null) {

+    ) {
+        if ($filter !== null) {
             $filterMaps = [

                 'bool' => FILTER_VALIDATE_BOOLEAN,

                 'int' => FILTER_VALIDATE_INT,

@@ -78,22 +77,22 @@ 
                 'url' => FILTER_VALIDATE_URL,

             ];

 

-            if (isset($filterMaps[$filter])) {

+            if (isset($filterMaps[$filter])) {
                 $filter = $filterMaps[$filter];

-            } else {

+            } else {
                 $filter = null;

             }

         }

         $value = getenv($key);

-        if ($value !== false) {

+        if ($value !== false) {
             return static::prepareValue($value, $filter, $options);

         }

 

-        if (isset($_ENV[$key])) {

+        if (isset($_ENV[$key])) {
             return static::prepareValue($_ENV[$key], $filter, $options);

         }

 

-        if (isset($_SERVER[$key])) {

+        if (isset($_SERVER[$key])) {
             return static::prepareValue($_SERVER[$key], $filter, $options);

         }

 

@@ -113,7 +112,7 @@ 
         string $value,

         ?int $filter = null,

         $options = 0

-    ) {

+    ) {
         static $special = [

           'true' => true,

           'TRUE' => true,

@@ -126,11 +125,11 @@ 
         $valueResolved = static::resolveReference($value);

 

         // strlen($valueResolved) < 6.

-        if (!isset($valueResolved[5]) && array_key_exists($valueResolved, $special)) {

+        if (!isset($valueResolved[5]) && array_key_exists($valueResolved, $special)) {
             return $special[$value];

         }

 

-        if ($filter === null || !function_exists('filter_var')) {

+        if ($filter === null || !function_exists('filter_var')) {
             return $valueResolved;

         }

 

@@ -144,15 +143,15 @@ 
      */

     protected static function resolveReference(string $value): string

     {

-        if (!$value || strpos($value, '${') === false) {

+        if (!$value || strpos($value, '${') === false) {
             return $value;

         }

 

-        $valueResolved = preg_replace_callback('~\$\{(\w+)\}~', function ($m) {

+        $valueResolved = preg_replace_callback('~\$\{(\w+)\}~', function ($m) {
             return (null === $ref = static::get($m[1], null)) ? $m[0] : $ref;

         }, $value);

 

-        if ($valueResolved !== null) {

+        if ($valueResolved !== null) {
             return $valueResolved;

         }

 

src/OAuth2/User/TokenOwner.php

Braces +3 added lines, -6 removed lines

@@ -53,8 +53,7 @@ 
  * @class TokenOwner

  * @package Platine\Framework\OAuth2\User

  */

-class TokenOwner implements TokenOwnerInterface

-{

+class TokenOwner implements TokenOwnerInterface {
     /**

      * The owner id

      * @var mixed

@@ -65,16 +64,14 @@ 
      * Create new instance

      * @param mixed|null $id

      */

-    public function __construct($id = null)

-    {

+    public function __construct($id = null) {
         $this->id = $id;

     }

 

     /**

      * {@inheritdoc}

      */

-    public function getOwnerId()

-    {

+    public function getOwnerId() {
         return $this->id;

     }

 }

src/OAuth2/User/UserAuthentication.php

Braces +6 added lines, -8 removed lines

@@ -56,8 +56,7 @@ 
  * @class UserAuthentication

  * @package Platine\Framework\OAuth2\User

  */

-class UserAuthentication implements UserAuthenticationInterface

-{

+class UserAuthentication implements UserAuthenticationInterface {
     /**

      * The Authentication

      * @var AuthenticationInterface

@@ -68,8 +67,7 @@ 
      * Create new instance

      * @param AuthenticationInterface $authentication

      */

-    public function __construct(AuthenticationInterface $authentication)

-    {

+    public function __construct(AuthenticationInterface $authentication) {
         $this->authentication = $authentication;

     }

 

@@ -80,20 +78,20 @@ 
     public function validate(string $username, string $password): ?TokenOwnerInterface

     {

         $userId = null;

-        try {

+        try {
             $isLogged = $this->authentication->login([

                 'username' => $username,

                 'password' => $password,

             ]);

 

-            if ($isLogged) {

+            if ($isLogged) {
                 $userId = $this->authentication->getUser()->getId();

             }

-        } catch (AuthenticationException $ex) {

+        } catch (AuthenticationException $ex) {
             return null;

         }

 

-        if ($userId === null) {

+        if ($userId === null) {
             return null;

         }

 

src/OAuth2/Middleware/OauthResourceMiddleware.php

Indentation +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
      */

     protected function shouldBeProcessed(ServerRequestInterface $request): bool

     {

-       //If no route has been match no need check

+        //If no route has been match no need check

         /** @var Route|null $route */

         $route = $request->getAttribute(Route::class);

         if ($route === null) {

Braces +8 added lines, -9 removed lines

@@ -49,8 +49,7 @@ 
  * @package Platine\Framework\OAuth2\Middleware

  * @template T

  */

-class OauthResourceMiddleware implements MiddlewareInterface

-{

+class OauthResourceMiddleware implements MiddlewareInterface {
     /**

      * The Resource Server

      * @var ResourceServerInterface

@@ -77,7 +76,7 @@ 
     public function __construct(

         ResourceServerInterface $resourceServer,

         Config $config

-    ) {

+    ) {
         $this->resourceServer = $resourceServer;

         $this->config = $config;

     }

@@ -89,16 +88,16 @@ 
         ServerRequestInterface $request,

         RequestHandlerInterface $handler

     ): ResponseInterface {

-        if ($this->shouldBeProcessed($request) === false) {

+        if ($this->shouldBeProcessed($request) === false) {
             return $handler->handle($request);

         }

 

-        try {

+        try {
             $token = $this->resourceServer->getAccessToken($request, $this->scopes);

-            if ($token === null) {

+            if ($token === null) {
                 throw InvalidAccessTokenException::invalidToken('No access token found in the request');

             }

-        } catch (InvalidAccessTokenException $ex) {

+        } catch (InvalidAccessTokenException $ex) {
             // If we're here, this means that there was an access token, but it's either expired

             // or invalid. If that's the case we must immediately return

             return new JsonResponse(

@@ -123,7 +122,7 @@ 
        //If no route has been match no need check

         /** @var Route|null $route */

         $route = $request->getAttribute(Route::class);

-        if ($route === null) {

+        if ($route === null) {
             return false;

         }

 

@@ -132,7 +131,7 @@ 
 

         //check if is url whitelist

         $urls = $this->config->get('oauth2.url_whitelist', []);

-        if (in_array($route->getName(), $urls)) {

+        if (in_array($route->getName(), $urls)) {
             return false;

         }

 

src/OAuth2/Handler/AuthorizationRequestHandler.php

Braces +2 added lines, -4 removed lines

@@ -43,8 +43,7 @@ 
  * @class AuthorizationRequestHandler

  * @package Platine\Framework\OAuth2\Handler

  */

-class AuthorizationRequestHandler implements RequestHandlerInterface

-{

+class AuthorizationRequestHandler implements RequestHandlerInterface {
     /**

      * The Authorization Server

      * @var AuthorizationServerInterface

@@ -55,8 +54,7 @@ 
      * Create new instance

      * @param AuthorizationServerInterface $authorizationServer

      */

-    public function __construct(AuthorizationServerInterface $authorizationServer)

-    {

+    public function __construct(AuthorizationServerInterface $authorizationServer) {
         $this->authorizationServer = $authorizationServer;

     }

 

src/OAuth2/Handler/AccessTokenRequestHandler.php

Braces +2 added lines, -4 removed lines

@@ -43,8 +43,7 @@ 
  * @class AccessTokenRequestHandler

  * @package Platine\Framework\OAuth2\Handler

  */

-class AccessTokenRequestHandler implements RequestHandlerInterface

-{

+class AccessTokenRequestHandler implements RequestHandlerInterface {
     /**

      * The Authorization Server

      * @var AuthorizationServerInterface

@@ -55,8 +54,7 @@ 
      * Create new instance

      * @param AuthorizationServerInterface $authorizationServer

      */

-    public function __construct(AuthorizationServerInterface $authorizationServer)

-    {

+    public function __construct(AuthorizationServerInterface $authorizationServer) {
         $this->authorizationServer = $authorizationServer;

     }

 

src/OAuth2/Handler/TokenRevocationRequestHandler.php

Braces +2 added lines, -4 removed lines

@@ -42,8 +42,7 @@ 
  * @class TokenRevocationRequestHandler

  * @package Platine\Framework\OAuth2\Handler

  */

-class TokenRevocationRequestHandler implements RequestHandlerInterface

-{

+class TokenRevocationRequestHandler implements RequestHandlerInterface {
     /**

      * The Authorization Server

      * @var AuthorizationServerInterface

@@ -54,8 +53,7 @@ 
      * Create new instance

      * @param AuthorizationServerInterface $authorizationServer

      */

-    public function __construct(AuthorizationServerInterface $authorizationServer)

-    {

+    public function __construct(AuthorizationServerInterface $authorizationServer) {
         $this->authorizationServer = $authorizationServer;

     }

 

src/OAuth2/Repository/RefreshTokenRepository.php

Indentation +17 added lines, -17 removed lines

@@ -80,27 +80,27 @@ 
         $this->clientService = $clientService;

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function cleanExpiredTokens(): void

     {

         $this->query()->where('expires')->lte(date('Y-m-d H:i:s'))

-                      ->delete();

+                        ->delete();

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function deleteToken(BaseToken $token): bool

     {

         return $this->query()->where('refresh_token')->is($token->getToken())

-                             ->delete() >= 0;

+                                ->delete() >= 0;

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function getByToken(string $token): ?BaseToken

     {

         $refreshToken = $this->find($token);

@@ -122,17 +122,17 @@ 
         ]);

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function isTokenExists(string $token): bool

     {

         return $this->find($token) !== null;

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function saveRefreshToken(RefreshToken $token): RefreshToken

     {

         $clientId = null;

Braces +6 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
  * @package Platine\Framework\OAuth2\Repository

  * @extends Repository<OauthRefreshToken>

  */

-class RefreshTokenRepository extends Repository implements RefreshTokenRepositoryInterface

-{

+class RefreshTokenRepository extends Repository implements RefreshTokenRepositoryInterface {
     /**

      * The Client Service

      * @var ClientService

@@ -74,8 +73,7 @@ 
      * @param EntityManager<OauthRefreshToken> $manager

      * @param ClientService $clientService

      */

-    public function __construct(EntityManager $manager, ClientService $clientService)

-    {

+    public function __construct(EntityManager $manager, ClientService $clientService) {
         parent::__construct($manager, OauthRefreshToken::class);

         $this->clientService = $clientService;

     }

@@ -104,12 +102,12 @@ 
     public function getByToken(string $token): ?BaseToken

     {

         $refreshToken = $this->find($token);

-        if ($refreshToken === null) {

+        if ($refreshToken === null) {
             return null;

         }

 

         $client = null;

-        if ($refreshToken->client_id !== null) {

+        if ($refreshToken->client_id !== null) {
             $client = $this->clientService->find($refreshToken->client_id);

         }

 

@@ -136,12 +134,12 @@ 
     public function saveRefreshToken(RefreshToken $token): RefreshToken

     {

         $clientId = null;

-        if ($token->getClient() !== null) {

+        if ($token->getClient() !== null) {
             $clientId = $token->getClient()->getId();

         }

 

         $ownerId = null;

-        if ($token->getOwner() !== null) {

+        if ($token->getOwner() !== null) {
             $ownerId = $token->getOwner()->getOwnerId();

         }