code style fixes

Author: skie

src/ApiInitializer.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 declare(strict_types=1);
 
 /**
@@ -15,24 +15,22 @@
 
 use Authentication\AuthenticationService;
 use Authorization\AuthorizationService;
-use Authorization\AuthorizationServiceInterface;
+use Authorization\AuthorizationServiceInterface as ASI;
 use Authorization\AuthorizationServiceProviderInterface;
 use Authorization\Policy\MapResolver;
 use Authorization\Policy\OrmResolver;
 use Authorization\Policy\ResolverCollection;
-use Cake\Core\Configure;
 use Cake\Http\ServerRequest;
 use CakeDC\Api\Rbac\ApiRbac;
-use CakeDC\Auth\Rbac\Rbac;
 use CakeDC\Auth\Policy\CollectionPolicy;
 use CakeDC\Auth\Policy\RbacPolicy;
-use CakeDC\Auth\Policy\SuperuserPolicy;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 class ApiInitializer implements AuthorizationServiceProviderInterface
 {
-
+    /**
+     * @return \Authentication\AuthenticationService
+     */
     public function getAuthenticationService(): AuthenticationService
     {
         $service = new AuthenticationService();
@@ -50,11 +48,15 @@ public function getAuthenticationService(): AuthenticationService
         $service->loadAuthenticator('Authentication.Token', [
             'queryParam' => 'token',
         ]);
-        
+
         return $service;
     }
 
-    public function getAuthorizationService(ServerRequestInterface $request): AuthorizationServiceInterface
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request Request instance.
+     * @return \Authorization\AuthorizationServiceInterface
+     */
+    public function getAuthorizationService(ServerRequestInterface $request): ASI
     {
         $map = new MapResolver();
         $rbac = new ApiRbac();
@@ -63,19 +65,18 @@ public function getAuthorizationService(ServerRequestInterface $request): Author
             new CollectionPolicy([
                 //SuperuserPolicy::class,
                 new RbacPolicy([
-                    'adapter' => $rbac
-                ])
+                    'adapter' => $rbac,
+                ]),
             ])
         );
 
         $orm = new OrmResolver();
 
         $resolver = new ResolverCollection([
             $map,
-            $orm
+            $orm,
         ]);
 
         return new AuthorizationService($resolver);
     }
-
 }

src/Controller/ApiController.php

@@ -123,7 +123,12 @@ protected function _process(array $options = []): ?Response
 
         return $this->getResponse();
     }
-    
+
+    /**
+     * Not found router fallback method.
+     *
+     * @return \Cake\Http\Response|null
+     */
     public function notFound()
     {
         return $this->getResponse()->withStatus(404);

src/Middleware/ParseApiRequestMiddleware.php

@@ -17,7 +17,6 @@
 use Cake\Core\Configure;
 use Cake\Http\Response;
 use CakeDC\Api\Service\ConfigReader;
-use CakeDC\Api\Service\Result;
 use CakeDC\Api\Service\ServiceRegistry;
 use Exception;
 use Psr\Http\Message\ResponseInterface;

src/Middleware/UnauthorizedHandler/ApiExceptionHandler.php

@@ -16,8 +16,8 @@
 use Authorization\Exception\Exception;
 use Authorization\Exception\ForbiddenException;
 use Authorization\Middleware\UnauthorizedHandler\HandlerInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
 
 /**
  * This handler rethrows an exception caught by the middleware.
@@ -27,7 +27,7 @@ class ApiExceptionHandler implements HandlerInterface
     /**
      * {@inheritDoc}
      */
-    public function handle(Exception $exception, ServerRequestInterface $request, array $options = []): ResponseInterface
+    public function handle(Exception $exception, Request $request, array $options = []): Response
     {
         $service = $request->getAttribute('service');
         if ($service !== null) {

src/Plugin.php

@@ -13,12 +13,6 @@
 
 namespace CakeDC\Api;
 
-use Authentication\AuthenticationService;
-use Authentication\Middleware\AuthenticationMiddleware;
-use Authorization\Middleware\AuthorizationMiddleware;
-use Authorization\Middleware\RequestAuthorizationMiddleware;
-use CakeDC\Api\Middleware\ParseApiRequestMiddleware;
-use CakeDC\Api\Middleware\ProcessApiRequestMiddleware;
 use Cake\Core\BasePlugin;
 use Cake\Core\Configure;
 
@@ -27,7 +21,9 @@
  */
 class Plugin extends BasePlugin
 {
-    
+    /**
+     * {@inheritDoc}
+     */
     public function routes($routes): void
     {
         $middlewares = Configure::read('Api.Middleware');
@@ -51,6 +47,5 @@ public function routes($routes): void
         }
 
         parent::routes($routes);
-    }    
-    
+    }
 }

src/Rbac/ApiRbac.php

@@ -231,7 +231,8 @@ protected function _matchOrAsterisk($possibleValues, $value, $allowEmpty = false
     {
         $possibleArray = (array)$possibleValues;
 
-        if ($possibleValues === '*' ||
+        if (
+            $possibleValues === '*' ||
             $value === $possibleValues ||
             in_array($value, $possibleArray) ||
             in_array(Inflector::camelize((string)$value, '-'), $possibleArray)

src/Service/Action/Auth/ValidateAccountRequestAction.php

@@ -74,12 +74,14 @@ public function execute()
         $data = $this->getData();
         $reference = $data['reference'];
         try {
-            if ($this->getUsersTable()->resetToken($reference, [
+            if (
+                $this->getUsersTable()->resetToken($reference, [
                 'expiration' => Configure::read('Users.Token.expiration'),
                 'checkActive' => true,
                 'sendEmail' => true,
                 'emailTemplate' => 'CakeDC/Users.validation',
-            ])) {
+                ])
+            ) {
                 return __d('CakeDC/Api', 'Token has been reset successfully. Please check your email.');
             } else {
                 throw new Exception(__d('CakeDC/Api', 'Token could not be reset'), 500);

src/Service/Action/CrudAction.php

@@ -362,8 +362,10 @@ protected function _describe(): array
         ];
 
         $validators = [];
-        foreach ($table->getValidator()
-                       ->getIterator() as $name => $field) {
+        foreach (
+            $table->getValidator()
+                       ->getIterator() as $name => $field
+        ) {
             /** @var \Cake\Validation\ValidationSet $field */
             $validators[$name] = [
                 'validatePresence' => $field->isPresenceRequired(),

src/Service/Auth/Auth.php

@@ -231,7 +231,8 @@ public function authCheck(Event $event)
             throw new UnauthenticatedException();
         }
 
-        if (empty($this->_config['authorize']) ||
+        if (
+            empty($this->_config['authorize']) ||
             $this->isAuthorized($this->user())
         ) {
             return null;

src/Service/Auth/Authorize/SimpleRbacAuthorize.php

@@ -195,10 +195,12 @@ protected function _matchRule(array $permission, $user, string $role, ServerRequ
         $service = $this->_action->getService()->getName();
         $version = $this->_action->getService()->getVersion();
 
-        if ($this->_matchOrAsterisk($permission, 'role', $role) &&
+        if (
+            $this->_matchOrAsterisk($permission, 'role', $role) &&
                 $this->_matchOrAsterisk($permission, 'version', $version, true) &&
                 $this->_matchOrAsterisk($permission, 'service', $service) &&
-                $this->_matchOrAsterisk($permission, 'action', $action)) {
+                $this->_matchOrAsterisk($permission, 'action', $action)
+        ) {
             $allowed = Hash::get($permission, 'allowed');
 
             if ($allowed === null) {
@@ -231,9 +233,11 @@ protected function _matchOrAsterisk(array $permission, string $key, $value, bool
         if ($allowEmpty && empty($possibleValues) && $value === null) {
             return true;
         }
-        if (Hash::get($permission, $key) === '*' ||
+        if (
+            Hash::get($permission, $key) === '*' ||
                 in_array($value, $possibleValues) ||
-                in_array(Inflector::camelize($value, '-'), $possibleValues)) {
+                in_array(Inflector::camelize($value, '-'), $possibleValues)
+        ) {
             return true;
         }
 

tests/Fixture/ArticlesFixture.php

@@ -58,11 +58,12 @@ class ArticlesFixture extends TestFixture
         ['id' => 15, 'author_id' => 1, 'title' => 'Article N15', 'body' => 'Article N15 Body', 'published' => 'Y'],
     ];
 
-    public function insert(ConnectionInterface $db) {
+    public function insert(ConnectionInterface $db)
+    {
         parent::insert($db);
 
         if ($db->getDriver() instanceof Postgres) {
-            foreach (range(1,count($this->records)) as $i) {
+            foreach (range(1, count($this->records)) as $i) {
                 $db->execute('select nextval(\'articles_id_seq\'::regclass)');
             }
         }

tests/FixturesTrait.php

@@ -33,7 +33,7 @@ trait FixturesTrait
         'plugin.CakeDC/Api.Tags',
         'plugin.CakeDC/Api.ArticlesTags',
     ];
-    
+
     public function mergeFixtures()
     {
         if (empty($this->fixtures)) {

tests/TestCase/Auth/Authorize/SimpleRbacAuthorizeTest.php

@@ -24,7 +24,6 @@
 
 class SimpleRbacAuthorizeTest extends TestCase
 {
-
     /**
      * @var Service
      */