spiral / framework

src/Auth/Cycle/TokenStorage.php

Spacing +8 added lines, -8 removed lines

@@ -38,25 +38,25 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        if (strpos($id, ':') === false) {
+        if (strpos($id, ':') === false){
             return null;
         }
 
         list($pk, $hash) = explode(':', $id, 2);
 
-        if (!is_numeric($pk)) {
+        if (!is_numeric($pk)){
             return null;
         }
 
         /** @var TokenInterface $token */
         $token = $this->orm->getRepository(Token::class)->findByPK((int)$pk);
 
-        if ($token === null || $token->getID() !== $id) {
+        if ($token === null || $token->getID() !== $id){
             // hijacked or deleted
             return null;
         }
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()){
             $this->delete($token);
             return null;
         }
@@ -69,13 +69,13 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token($this->randomHash(128), $payload, new \DateTimeImmutable(), $expiresAt);
 
             (new Transaction($this->orm))->persist($token)->run();
 
             return $token;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to create token', $e->getCode(), $e);
         }
     }
@@ -85,9 +85,9 @@ 
      */
     public function delete(TokenInterface $token): void
     {
-        try {
+        try{
             (new Transaction($this->orm))->delete($token)->run();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to delete token', $e->getCode(), $e);
         }
     }

Braces +18 added lines, -8 removed lines

@@ -38,25 +38,29 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        if (strpos($id, ':') === false) {
+        if (strpos($id, ':') === false)
+        {
             return null;
         }
 
         list($pk, $hash) = explode(':', $id, 2);
 
-        if (!is_numeric($pk)) {
+        if (!is_numeric($pk))
+        {
             return null;
         }
 
         /** @var TokenInterface $token */
         $token = $this->orm->getRepository(Token::class)->findByPK((int)$pk);
 
-        if ($token === null || $token->getID() !== $id) {
+        if ($token === null || $token->getID() !== $id)
+        {
             // hijacked or deleted
             return null;
         }
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime())
+        {
             $this->delete($token);
             return null;
         }
@@ -69,13 +73,16 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token($this->randomHash(128), $payload, new \DateTimeImmutable(), $expiresAt);
 
             (new Transaction($this->orm))->persist($token)->run();
 
             return $token;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to create token', $e->getCode(), $e);
         }
     }
@@ -85,9 +92,12 @@ 
      */
     public function delete(TokenInterface $token): void
     {
-        try {
+        try
+        {
             (new Transaction($this->orm))->delete($token)->run();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to delete token', $e->getCode(), $e);
         }
     }

src/Auth/Session/Token.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
     public static function unpack(array $data): Token
     {
         $expiresAt = null;
-        if ($data['expiresAt'] != null) {
+        if ($data['expiresAt'] != null){
             $expiresAt = (new \DateTimeImmutable())->setTimestamp($data['expiresAt']);
         }
 

Braces +2 added lines, -1 removed lines

@@ -100,7 +100,8 @@
     public static function unpack(array $data): Token
     {
         $expiresAt = null;
-        if ($data['expiresAt'] != null) {
+        if ($data['expiresAt'] != null)
+        {
             $expiresAt = (new \DateTimeImmutable())->setTimestamp($data['expiresAt']);
         }
 

src/Auth/Session/TokenStorage.php

Spacing +6 added lines, -6 removed lines

@@ -40,18 +40,18 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try{
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
             $token = Token::unpack($tokenData);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to load session token', $e->getCode(), $e);
         }
 
-        if ($token->getID() !== $id) {
+        if ($token->getID() !== $id){
             return null;
         }
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime()){
             $this->delete($token);
             return null;
         }
@@ -64,12 +64,12 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token($this->randomHash(123), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to create session token', $e->getCode(), $e);
         }
     }

Braces +14 added lines, -6 removed lines

@@ -40,18 +40,23 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try
+        {
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
             $token = Token::unpack($tokenData);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to load session token', $e->getCode(), $e);
         }
 
-        if ($token->getID() !== $id) {
+        if ($token->getID() !== $id)
+        {
             return null;
         }
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime())
+        {
             $this->delete($token);
             return null;
         }
@@ -64,12 +69,15 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token($this->randomHash(123), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to create session token', $e->getCode(), $e);
         }
     }

src/Session/Middleware/SessionMiddleware.php

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
         CookiesConfig $cookiesConfig,
         SessionFactory $factory,
         ScopeInterface $scope
-    ) {
+    ){
         $this->config = $config;
         $this->httpConfig = $httpConfig;
         $this->cookiesConfig = $cookiesConfig;
@@ -79,14 +79,14 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try{
             $response = $this->scope->runScope(
                 [SessionInterface::class => $session],
                 function () use ($handler, $request, $session) {
                     return $handler->handle($request->withAttribute(static::ATTRIBUTE, $session));
                 }
             );
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $session->abort();
             throw $e;
         }
@@ -105,14 +105,14 @@ 
         Request $request,
         Response $response
     ): Response {
-        if (!$session->isStarted()) {
+        if (!$session->isStarted()){
             return $response;
         }
 
         $session->commit();
 
         //SID changed
-        if ($this->fetchID($request) != $session->getID()) {
+        if ($this->fetchID($request) != $session->getID()){
             return $this->withCookie($request, $response, $session->getID());
         }
 
@@ -129,7 +129,7 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()])){
             return null;
         }
 
@@ -162,8 +162,8 @@ 
     protected function clientSignature(Request $request): string
     {
         $signature = '';
-        foreach (static::SIGNATURE_HEADERS as $header) {
-            $signature .= $request->getHeaderLine($header) . ';';
+        foreach (static::SIGNATURE_HEADERS as $header){
+            $signature .= $request->getHeaderLine($header).';';
         }
 
         return hash('sha256', $signature);

Braces +15 added lines, -7 removed lines

@@ -79,14 +79,18 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try
+        {
             $response = $this->scope->runScope(
                 [SessionInterface::class => $session],
-                function () use ($handler, $request, $session) {
+                function () use ($handler, $request, $session)
+                {
                     return $handler->handle($request->withAttribute(static::ATTRIBUTE, $session));
                 }
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $session->abort();
             throw $e;
         }
@@ -105,14 +109,16 @@ 
         Request $request,
         Response $response
     ): Response {
-        if (!$session->isStarted()) {
+        if (!$session->isStarted())
+        {
             return $response;
         }
 
         $session->commit();
 
         //SID changed
-        if ($this->fetchID($request) != $session->getID()) {
+        if ($this->fetchID($request) != $session->getID())
+        {
             return $this->withCookie($request, $response, $session->getID());
         }
 
@@ -129,7 +135,8 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()]))
+        {
             return null;
         }
 
@@ -162,7 +169,8 @@ 
     protected function clientSignature(Request $request): string
     {
         $signature = '';
-        foreach (static::SIGNATURE_HEADERS as $header) {
+        foreach (static::SIGNATURE_HEADERS as $header)
+        {
             $signature .= $request->getHeaderLine($header) . ';';
         }
 

tests/app/src/Bootloader/AppBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             new Route('/auth/<action>', new Controller(AuthController::class))
         );
 
-        $views->addDirectory('custom', __DIR__ . '/../../views/custom/');
+        $views->addDirectory('custom', __DIR__.'/../../views/custom/');
         $views->addEngine(TestEngine::class);
 
         $validation->addAlias('aliased', 'notEmpty');

tests/app/src/Bootloader/AuthBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 {
     public function boot(EnvironmentInterface $env, BootloadManager $bootloadManager): void
     {
-        if ($env->get('CYCLE_AUTH')) {
+        if ($env->get('CYCLE_AUTH')){
             $bootloadManager->bootload([CycleTokensBootloader::class]);
             return;
         }

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 {
     public function boot(EnvironmentInterface $env, BootloadManager $bootloadManager): void
     {
-        if ($env->get('CYCLE_AUTH')) {
+        if ($env->get('CYCLE_AUTH'))
+        {
             $bootloadManager->bootload([CycleTokensBootloader::class]);
             return;
         }

tests/app/src/Controller/AuthController.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function tokenAction(AuthContextInterface $authContext)
     {
-        if ($authContext->getToken() !== null) {
+        if ($authContext->getToken() !== null){
             return $authContext->getToken()->getID();
         }
 

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
 
     public function tokenAction(AuthContextInterface $authContext)
     {
-        if ($authContext->getToken() !== null) {
+        if ($authContext->getToken() !== null)
+        {
             return $authContext->getToken()->getID();
         }