spiral / framework

src/Session/SessionScope.php

Spacing +2 added lines, -2 removed lines

@@ -123,9 +123,9 @@
      */
     public function getActiveSession(): SessionInterface
     {
-        try {
+        try{
             return $this->container->get(SessionInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }catch (NotFoundExceptionInterface $e){
             throw new ScopeException('Unable to receive active session, invalid request scope', $e->getCode(), $e);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -123,9 +123,12 @@
      */
     public function getActiveSession(): SessionInterface
     {
-        try {
+        try
+        {
             return $this->container->get(SessionInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }
+        catch (NotFoundExceptionInterface $e)
+        {
             throw new ScopeException('Unable to receive active session, invalid request scope', $e->getCode(), $e);
         }
     }

src/Cookies/CookieManager.php

Spacing +5 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
         string $domain = null,
         bool $secure = null,
         bool $httpOnly = true
-    ) {
+    ){
         $this->getCookieQueue()->set($name, $value, $lifetime, $path, $domain, $secure, $httpOnly);
 
         return $this;
@@ -169,9 +169,9 @@ 
      */
     private function getRequest(): ServerRequestInterface
     {
-        try {
+        try{
             return $this->container->get(ServerRequestInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }catch (NotFoundExceptionInterface $e){
             throw new ScopeException('Unable to receive active request', $e->getCode(), $e);
         }
     }
@@ -183,9 +183,9 @@ 
      */
     private function getCookieQueue(): CookieQueue
     {
-        try {
+        try{
             return $this->container->get(CookieQueue::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }catch (NotFoundExceptionInterface $e){
             throw new ScopeException('Unable to receive cookie queue, invalid request scope', $e->getCode(), $e);
         }
     }

Braces +10 added lines, -4 removed lines

@@ -169,9 +169,12 @@ 
      */
     private function getRequest(): ServerRequestInterface
     {
-        try {
+        try
+        {
             return $this->container->get(ServerRequestInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }
+        catch (NotFoundExceptionInterface $e)
+        {
             throw new ScopeException('Unable to receive active request', $e->getCode(), $e);
         }
     }
@@ -183,9 +186,12 @@ 
      */
     private function getCookieQueue(): CookieQueue
     {
-        try {
+        try
+        {
             return $this->container->get(CookieQueue::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }
+        catch (NotFoundExceptionInterface $e)
+        {
             throw new ScopeException('Unable to receive cookie queue, invalid request scope', $e->getCode(), $e);
         }
     }

src/Bootloader/Auth/AuthBootloader.php

Spacing +6 added lines, -6 removed lines

@@ -50,8 +50,8 @@ 
      */
     public function getActor(TokenInterface $token): ?object
     {
-        foreach ($this->getProviders() as $provider) {
-            if (!$provider instanceof ActorProviderInterface) {
+        foreach ($this->getProviders() as $provider){
+            if (!$provider instanceof ActorProviderInterface){
                 throw new AuthException(sprintf(
                     "Expected `ActorProviderInterface`, got `%s`",
                     get_class($provider)
@@ -59,7 +59,7 @@ 
             }
 
             $actor = $provider->getActor($token);
-            if ($actor !== null) {
+            if ($actor !== null){
                 return $actor;
             }
         }
@@ -82,13 +82,13 @@ 
      */
     private function getProviders(): \Generator
     {
-        foreach ($this->actorProvider as $provider) {
-            if ($provider instanceof Autowire) {
+        foreach ($this->actorProvider as $provider){
+            if ($provider instanceof Autowire){
                 yield $provider->resolve($this->factory);
                 continue;
             }
 
-            if (is_object($provider)) {
+            if (is_object($provider)){
                 yield $provider;
                 continue;
             }

Braces +12 added lines, -6 removed lines

@@ -50,8 +50,10 @@ 
      */
     public function getActor(TokenInterface $token): ?object
     {
-        foreach ($this->getProviders() as $provider) {
-            if (!$provider instanceof ActorProviderInterface) {
+        foreach ($this->getProviders() as $provider)
+        {
+            if (!$provider instanceof ActorProviderInterface)
+            {
                 throw new AuthException(sprintf(
                     "Expected `ActorProviderInterface`, got `%s`",
                     get_class($provider)
@@ -59,7 +61,8 @@ 
             }
 
             $actor = $provider->getActor($token);
-            if ($actor !== null) {
+            if ($actor !== null)
+            {
                 return $actor;
             }
         }
@@ -82,13 +85,16 @@ 
      */
     private function getProviders(): \Generator
     {
-        foreach ($this->actorProvider as $provider) {
-            if ($provider instanceof Autowire) {
+        foreach ($this->actorProvider as $provider)
+        {
+            if ($provider instanceof Autowire)
+            {
                 yield $provider->resolve($this->factory);
                 continue;
             }
 
-            if (is_object($provider)) {
+            if (is_object($provider))
+            {
                 yield $provider;
                 continue;
             }

src/Auth/Session/TokenStorage.php

Spacing +8 added lines, -8 removed lines

@@ -42,19 +42,19 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try{
             $tokenData = $this->getAuthSection()->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;
         }
@@ -67,12 +67,12 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token($this->randomHash(123), $payload, $expiresAt);
             $this->getAuthSection()->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException("Unable to create session token", $e->getCode(), $e);
         }
     }
@@ -90,12 +90,12 @@ 
      */
     private function getAuthSection(): SessionSectionInterface
     {
-        try {
+        try{
             $session = $this->container->get(SessionInterface::class);
 
             /** @var SessionInterface $session */
             return $session->getSection(self::SESSION_SECTION);
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new ScopeException("Unable to find auth token, invalid session scope", $e->getCode(), $e);
         }
     }

Braces +19 added lines, -8 removed lines

@@ -42,19 +42,24 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try
+        {
             $tokenData = $this->getAuthSection()->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;
         }
@@ -67,12 +72,15 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token($this->randomHash(123), $payload, $expiresAt);
             $this->getAuthSection()->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException("Unable to create session token", $e->getCode(), $e);
         }
     }
@@ -90,12 +98,15 @@ 
      */
     private function getAuthSection(): SessionSectionInterface
     {
-        try {
+        try
+        {
             $session = $this->container->get(SessionInterface::class);
 
             /** @var SessionInterface $session */
             return $session->getSection(self::SESSION_SECTION);
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new ScopeException("Unable to find auth token, invalid session scope", $e->getCode(), $e);
         }
     }

src/Auth/Session/Token.php

Spacing +1 added lines, -1 removed lines

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

Braces +2 added lines, -1 removed lines

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

src/Auth/Cycle/TokenRepository.php

Spacing +8 added lines, -8 removed lines

@@ -40,25 +40,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($id)) {
+        if (!is_numeric($id)){
             return null;
         }
 
         /** @var TokenInterface $token */
         $token = $this->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;
         }
@@ -71,13 +71,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);
         }
     }
@@ -87,9 +87,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

@@ -40,25 +40,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($id)) {
+        if (!is_numeric($id))
+        {
             return null;
         }
 
         /** @var TokenInterface $token */
         $token = $this->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;
         }
@@ -71,13 +75,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);
         }
     }
@@ -87,9 +94,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/Cycle/Token.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         array $payload,
         \DateTimeImmutable $createdAt,
         \DateTimeInterface $expiresAt = null
-    ) {
+    ){
         $this->hash = $hash;
         $this->createdAt = $createdAt;
         $this->expiresAt = $expiresAt;

src/Auth/AuthScope.php

Spacing +2 added lines, -2 removed lines

@@ -94,9 +94,9 @@
      */
     private function getAuthContext(): AuthContextInterface
     {
-        try {
+        try{
             return $this->container->get(AuthContextInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }catch (NotFoundExceptionInterface $e){
             throw new ScopeException('Unable to resolve auth context, invalid scope', $e->getCode(), $e);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -94,9 +94,12 @@
      */
     private function getAuthContext(): AuthContextInterface
     {
-        try {
+        try
+        {
             return $this->container->get(AuthContextInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }
+        catch (NotFoundExceptionInterface $e)
+        {
             throw new ScopeException('Unable to resolve auth context, invalid scope', $e->getCode(), $e);
         }
     }

src/Auth/CredentialsAuthenticator.php

Spacing +3 added lines, -3 removed lines

@@ -52,15 +52,15 @@
     public function getUser(string $username, string $password): PasswordAwareInterface
     {
         $user = $this->source->findByUsername($username);
-        if (empty($user)) {
+        if (empty($user)){
             throw new CredentialsException("Unable to authorize, no such user");
         }
 
-        if (!$user instanceof PasswordAwareInterface) {
+        if (!$user instanceof PasswordAwareInterface){
             throw new LogicException("User must be instance of PasswordAwareInterface");
         }
 
-        if (!$this->hasher->hashEquals($password, $user->getPasswordHash())) {
+        if (!$this->hasher->hashEquals($password, $user->getPasswordHash())){
             throw new CredentialsException("Unable to authorize, invalid password");
         }
 

Braces +6 added lines, -3 removed lines

@@ -52,15 +52,18 @@
     public function getUser(string $username, string $password): PasswordAwareInterface
     {
         $user = $this->source->findByUsername($username);
-        if (empty($user)) {
+        if (empty($user))
+        {
             throw new CredentialsException("Unable to authorize, no such user");
         }
 
-        if (!$user instanceof PasswordAwareInterface) {
+        if (!$user instanceof PasswordAwareInterface)
+        {
             throw new LogicException("User must be instance of PasswordAwareInterface");
         }
 
-        if (!$this->hasher->hashEquals($password, $user->getPasswordHash())) {
+        if (!$this->hasher->hashEquals($password, $user->getPasswordHash()))
+        {
             throw new CredentialsException("Unable to authorize, invalid password");
         }