Merge branch 'master' into develop

Author: skie

src/Service/Action/Extension/CrudHateoasExtension.php

@@ -179,8 +179,8 @@ protected function _buildViewLinks(Action $action)
 
                 $currentId = Inflector::singularize(Inflector::underscore($service->getName())) . '_id';
                 $defaults = !empty($route->defaults) ? $route->defaults : [];
-                
-                if(isset($route)) {
+
+                if (isset($route)) {
                     $viewRoute = $action->getRoute();
                     $defaults[$currentId] = $viewRoute['id'];
                     $indexPath = $service->routeReverse($defaults);

src/Service/Action/Extension/CrudRelationsExtension.php

@@ -11,11 +11,11 @@
 
 namespace CakeDC\Api\Service\Action\Extension;
 
-use Cake\ORM\Association;
 use CakeDC\Api\Service\Action\Action;
 use CakeDC\Api\Service\Action\CrudAction;
 use Cake\Event\Event;
 use Cake\Event\EventListenerInterface;
+use Cake\ORM\Association;
 use Cake\ORM\Query;
 use Cake\Utility\Inflector;
 

src/Service/Auth/Auth.php

@@ -31,9 +31,9 @@
 use Cake\Core\InstanceConfigTrait;
 use Cake\Event\Event;
 use Cake\Event\EventDispatcherTrait;
-use Cake\Log\LogTrait;
 use Cake\Http\Exception\ForbiddenException;
 use Cake\Http\Response;
+use Cake\Log\LogTrait;
 
 /**
  * Class Auth

src/Service/Auth/Authenticate/SocialAuthenticate.php

@@ -11,9 +11,9 @@
 
 namespace CakeDC\Api\Service\Auth\Authenticate;
 
+use Cake\Http\Exception\ForbiddenException;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Http\Exception\ForbiddenException;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Hash;
 use \OutOfBoundsException;

src/Service/Auth/Authenticate/TokenAuthenticate.php

@@ -11,9 +11,9 @@
 
 namespace CakeDC\Api\Service\Auth\Authenticate;
 
+use Cake\Http\Exception\ForbiddenException;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Http\Exception\ForbiddenException;
 use Cake\Utility\Hash;
 use \OutOfBoundsException;
 

src/Service/Auth/Authorize/SimpleRbacAuthorize.php

@@ -15,8 +15,8 @@
 use CakeDC\Users\Auth\Rules\Rule;
 use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
-use Cake\Log\LogTrait;
 use Cake\Http\ServerRequest;
+use Cake\Log\LogTrait;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 use Psr\Log\LogLevel;

tests/ConfigTrait.php

@@ -12,8 +12,8 @@
 namespace CakeDC\Api\Test;
 
 use Cake\Core\Configure;
-use Cake\Http\ServerRequest;
 use Cake\Http\Response;
+use Cake\Http\ServerRequest;
 use Cake\Utility\Hash;
 
 /**

tests/TestCase/Auth/Authenticate/SocialAuthenticateTest.php

@@ -18,8 +18,8 @@
 use CakeDC\Api\TestSuite\TestCase;
 use CakeDC\Api\Test\ConfigTrait;
 use CakeDC\Api\Test\FixturesTrait;
-use Cake\Http\ServerRequest;
 use Cake\Http\Response;
+use Cake\Http\ServerRequest;
 
 class SocialAuthenticateTest extends TestCase
 {

tests/TestCase/Auth/Authenticate/TokenAuthenticateTest.php

@@ -17,8 +17,8 @@
 use CakeDC\Api\TestSuite\TestCase;
 use CakeDC\Api\Test\ConfigTrait;
 use CakeDC\Api\Test\FixturesTrait;
-use Cake\Http\ServerRequest;
 use Cake\Http\Response;
+use Cake\Http\ServerRequest;
 
 class TokenAuthenticateTest extends TestCase
 {

tests/TestCase/Auth/Authorize/SimpleRbacAuthorizeTest.php

@@ -18,8 +18,8 @@
 use CakeDC\Api\Service\Service;
 use CakeDC\Api\TestSuite\TestCase;
 use CakeDC\Users\Auth\Rules\Rule;
-use Cake\Http\ServerRequest;
 use Cake\Http\Response;
+use Cake\Http\ServerRequest;
 use ReflectionClass;
 
 class SimpleRbacAuthorizeTest extends TestCase