spiral / framework

src/Exceptions/src/PlainHandler.php

Spacing +12 added lines, -12 removed lines

@@ -26,13 +26,13 @@ 
     {
         $result = '';
 
-        $result .= '[' . get_class($e) . "]\n" . $e->getMessage();
+        $result .= '['.get_class($e)."]\n".$e->getMessage();
 
         $result .= sprintf(" in %s:%s\n", $e->getFile(), $e->getLine());
 
-        if ($verbosity >= self::VERBOSITY_DEBUG) {
+        if ($verbosity >= self::VERBOSITY_DEBUG){
             $result .= $this->renderTrace($e, new Highlighter(new PlainStyle()));
-        } elseif ($verbosity >= self::VERBOSITY_VERBOSE) {
+        } elseif ($verbosity >= self::VERBOSITY_VERBOSE){
             $result .= $this->renderTrace($e);
         }
 
@@ -47,38 +47,38 @@ 
     private function renderTrace(Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace)){
             return '';
         }
 
         $result = "\nException Trace:\n";
 
-        foreach ($stacktrace as $trace) {
-            if (isset($trace['type']) && isset($trace['class'])) {
+        foreach ($stacktrace as $trace){
+            if (isset($trace['type']) && isset($trace['class'])){
                 $line = sprintf(
                     ' %s%s%s()',
                     $trace['class'],
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }else{
                 $line = $trace['function'];
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file'])){
                 $line .= sprintf(' at %s:%s', $trace['file'], $trace['line']);
-            } else {
+            }else{
                 $line .= sprintf(' at %s:%s', 'n/a', 'n/a');
             }
 
-            $result .= $line . "\n";
+            $result .= $line."\n";
 
-            if (!empty($h) && !empty($trace['file'])) {
+            if (!empty($h) && !empty($trace['file'])){
                 $result .= $h->highlightLines(
                     file_get_contents($trace['file']),
                     $trace['line'],
                     static::SHOW_LINES
-                ) . "\n";
+                )."\n";
             }
         }
 

Braces +21 added lines, -9 removed lines

@@ -30,9 +30,12 @@ 
 
         $result .= sprintf(" in %s:%s\n", $e->getFile(), $e->getLine());
 
-        if ($verbosity >= self::VERBOSITY_DEBUG) {
+        if ($verbosity >= self::VERBOSITY_DEBUG)
+        {
             $result .= $this->renderTrace($e, new Highlighter(new PlainStyle()));
-        } elseif ($verbosity >= self::VERBOSITY_VERBOSE) {
+        }
+        elseif ($verbosity >= self::VERBOSITY_VERBOSE)
+        {
             $result .= $this->renderTrace($e);
         }
 
@@ -47,33 +50,42 @@ 
     private function renderTrace(Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace))
+        {
             return '';
         }
 
         $result = "\nException Trace:\n";
 
-        foreach ($stacktrace as $trace) {
-            if (isset($trace['type']) && isset($trace['class'])) {
+        foreach ($stacktrace as $trace)
+        {
+            if (isset($trace['type']) && isset($trace['class']))
+            {
                 $line = sprintf(
                     ' %s%s%s()',
                     $trace['class'],
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }
+            else
+            {
                 $line = $trace['function'];
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file']))
+            {
                 $line .= sprintf(' at %s:%s', $trace['file'], $trace['line']);
-            } else {
+            }
+            else
+            {
                 $line .= sprintf(' at %s:%s', 'n/a', 'n/a');
             }
 
             $result .= $line . "\n";
 
-            if (!empty($h) && !empty($trace['file'])) {
+            if (!empty($h) && !empty($trace['file']))
+            {
                 $result .= $h->highlightLines(
                     file_get_contents($trace['file']),
                     $trace['line'],

src/Exceptions/src/AbstractHandler.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
     protected function getStacktrace(Throwable $e): array
     {
         $stacktrace = $e->getTrace();
-        if (empty($stacktrace)) {
+        if (empty($stacktrace)){
             return [];
         }
 
@@ -42,7 +42,7 @@ 
                 'line' => $e->getLine(),
             ] + $stacktrace[0];
 
-        if ($stacktrace[0] != $header) {
+        if ($stacktrace[0] != $header){
             array_unshift($stacktrace, $header);
         }
 

Braces +4 added lines, -2 removed lines

@@ -32,7 +32,8 @@ 
     protected function getStacktrace(Throwable $e): array
     {
         $stacktrace = $e->getTrace();
-        if (empty($stacktrace)) {
+        if (empty($stacktrace))
+        {
             return [];
         }
 
@@ -42,7 +43,8 @@ 
                 'line' => $e->getLine(),
             ] + $stacktrace[0];
 
-        if ($stacktrace[0] != $header) {
+        if ($stacktrace[0] != $header)
+        {
             array_unshift($stacktrace, $header);
         }
 

src/Exceptions/src/ValueWrapper.php

Spacing +8 added lines, -8 removed lines

@@ -43,33 +43,33 @@
     public function wrap(array $args): array
     {
         $result = [];
-        foreach ($args as $arg) {
+        foreach ($args as $arg){
             $display = $type = strtolower(gettype($arg));
 
-            if (is_numeric($arg)) {
+            if (is_numeric($arg)){
                 $result[] = $this->r->apply($arg, 'value', $type);
                 continue;
-            } elseif (is_bool($arg)) {
+            } elseif (is_bool($arg)){
                 $result[] = $this->r->apply($arg ? 'true' : 'false', 'value', $type);
                 continue;
-            } elseif (is_null($arg)) {
+            } elseif (is_null($arg)){
                 $result[] = $this->r->apply('null', 'value', $type);
                 continue;
             }
 
-            if (is_object($arg)) {
+            if (is_object($arg)){
                 $reflection = new ReflectionClass($arg);
                 $display = sprintf('<span title="%s">%s</span>', $reflection->getName(), $reflection->getShortName());
             }
 
             $type = $this->r->apply($display, 'value', $type);
 
-            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG) {
+            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG){
                 $result[] = sprintf('<span>%s</span>', $type);
-            } else {
+            }else{
                 $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg, JSON_THROW_ON_ERROR));
 
-                if (!isset($this->values[$hash])) {
+                if (!isset($this->values[$hash])){
                     $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN);
                 }
 

Braces +19 added lines, -8 removed lines

@@ -43,33 +43,44 @@
     public function wrap(array $args): array
     {
         $result = [];
-        foreach ($args as $arg) {
+        foreach ($args as $arg)
+        {
             $display = $type = strtolower(gettype($arg));
 
-            if (is_numeric($arg)) {
+            if (is_numeric($arg))
+            {
                 $result[] = $this->r->apply($arg, 'value', $type);
                 continue;
-            } elseif (is_bool($arg)) {
+            }
+            elseif (is_bool($arg))
+            {
                 $result[] = $this->r->apply($arg ? 'true' : 'false', 'value', $type);
                 continue;
-            } elseif (is_null($arg)) {
+            }
+            elseif (is_null($arg))
+            {
                 $result[] = $this->r->apply('null', 'value', $type);
                 continue;
             }
 
-            if (is_object($arg)) {
+            if (is_object($arg))
+            {
                 $reflection = new ReflectionClass($arg);
                 $display = sprintf('<span title="%s">%s</span>', $reflection->getName(), $reflection->getShortName());
             }
 
             $type = $this->r->apply($display, 'value', $type);
 
-            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG) {
+            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG)
+            {
                 $result[] = sprintf('<span>%s</span>', $type);
-            } else {
+            }
+            else
+            {
                 $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg, JSON_THROW_ON_ERROR));
 
-                if (!isset($this->values[$hash])) {
+                if (!isset($this->values[$hash]))
+                {
                     $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN);
                 }
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
                 $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg, JSON_THROW_ON_ERROR));
 
                 if (!isset($this->values[$hash])) {
-                    $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN);
+                    $this->values[$hash] = $this->dumper->dump($arg, Dumper::return);
                 }
 
                 $result[] = sprintf('<span onclick="_da(\'%s\')">%s</span>', $hash, $type);

src/Exceptions/src/JsonHandler.php

Spacing +4 added lines, -4 removed lines

@@ -32,24 +32,24 @@
 
     private function renderTrace(array $trace, int $verbosity): Generator
     {
-        foreach ($trace as $item) {
+        foreach ($trace as $item){
             $result = [];
 
-            if (isset($item['class'])) {
+            if (isset($item['class'])){
                 $result['function'] = sprintf(
                     '%s%s%s()',
                     $item['class'],
                     $item['type'],
                     $item['function']
                 );
-            } else {
+            }else{
                 $result['function'] = sprintf(
                     '%s()',
                     $item['function']
                 );
             }
 
-            if ($verbosity >= self::VERBOSITY_VERBOSE && isset($item['file'])) {
+            if ($verbosity >= self::VERBOSITY_VERBOSE && isset($item['file'])){
                 $result['at'] = [
                     'file' => $item['file'] ?? null,
                     'line' => $item['line'] ?? null,

Braces +9 added lines, -4 removed lines

@@ -32,24 +32,29 @@
 
     private function renderTrace(array $trace, int $verbosity): Generator
     {
-        foreach ($trace as $item) {
+        foreach ($trace as $item)
+        {
             $result = [];
 
-            if (isset($item['class'])) {
+            if (isset($item['class']))
+            {
                 $result['function'] = sprintf(
                     '%s%s%s()',
                     $item['class'],
                     $item['type'],
                     $item['function']
                 );
-            } else {
+            }
+            else
+            {
                 $result['function'] = sprintf(
                     '%s()',
                     $item['function']
                 );
             }
 
-            if ($verbosity >= self::VERBOSITY_VERBOSE && isset($item['file'])) {
+            if ($verbosity >= self::VERBOSITY_VERBOSE && isset($item['file']))
+            {
                 $result['at'] = [
                     'file' => $item['file'] ?? null,
                     'line' => $item['line'] ?? null,

src/AuthHttp/src/TransportRegistry.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     {
         $name ??= $this->default;
 
-        if (!isset($this->transports[$name])) {
+        if (!isset($this->transports[$name])){
             throw new TransportException("Undefined auth transport {$name}");
         }
 

Braces +2 added lines, -1 removed lines

@@ -40,7 +40,8 @@
     {
         $name ??= $this->default;
 
-        if (!isset($this->transports[$name])) {
+        if (!isset($this->transports[$name]))
+        {
             throw new TransportException("Undefined auth transport {$name}");
         }
 

src/AuthHttp/src/Transport/CookieTransport.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
         bool $secure = false,
         bool $httpOnly = true,
         ?string $sameSite = null
-    ) {
+    ){
         $this->cookie = $cookie;
         $this->basePath = $basePath;
         $this->domain = $domain;
@@ -72,7 +72,7 @@ 
     ): Response {
         /** @var CookieQueue $cookieQueue */
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE);
-        if ($cookieQueue === null) {
+        if ($cookieQueue === null){
             return $response->withAddedHeader(
                 'Set-Cookie',
                 Cookie::create(
@@ -88,9 +88,9 @@ 
             );
         }
 
-        if ($tokenID === null) {
+        if ($tokenID === null){
             $cookieQueue->delete($this->cookie);
-        } else {
+        }else{
             $cookieQueue->set(
                 $this->cookie,
                 $tokenID,
@@ -120,7 +120,7 @@ 
      */
     private function getLifetime(DateTimeInterface $expiresAt = null): ?int
     {
-        if ($expiresAt === null) {
+        if ($expiresAt === null){
             return null;
         }
 

Braces +9 added lines, -4 removed lines

@@ -72,7 +72,8 @@ 
     ): Response {
         /** @var CookieQueue $cookieQueue */
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE);
-        if ($cookieQueue === null) {
+        if ($cookieQueue === null)
+        {
             return $response->withAddedHeader(
                 'Set-Cookie',
                 Cookie::create(
@@ -88,9 +89,12 @@ 
             );
         }
 
-        if ($tokenID === null) {
+        if ($tokenID === null)
+        {
             $cookieQueue->delete($this->cookie);
-        } else {
+        }
+        else
+        {
             $cookieQueue->set(
                 $this->cookie,
                 $tokenID,
@@ -120,7 +124,8 @@ 
      */
     private function getLifetime(DateTimeInterface $expiresAt = null): ?int
     {
-        if ($expiresAt === null) {
+        if ($expiresAt === null)
+        {
             return null;
         }
 

src/AuthHttp/src/Transport/HeaderTransport.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header)){
             return $this->extractToken($request);
         }
 
@@ -52,7 +52,7 @@ 
         string $tokenID,
         DateTimeInterface $expiresAt = null
     ): Response {
-        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID) {
+        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID){
             return $response;
         }
 
@@ -71,10 +71,10 @@ 
     {
         $headerLine = $request->getHeaderLine($this->header);
 
-        if ($this->valueFormat !== '%s') {
+        if ($this->valueFormat !== '%s'){
             [$token] = sscanf($headerLine, $this->valueFormat);
 
-            return $token !== null ? (string) $token : null;
+            return $token !== null ? (string)$token : null;
         }
 
         return $headerLine;

Braces +6 added lines, -3 removed lines

@@ -36,7 +36,8 @@ 
      */
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header))
+        {
             return $this->extractToken($request);
         }
 
@@ -52,7 +53,8 @@ 
         string $tokenID,
         DateTimeInterface $expiresAt = null
     ): Response {
-        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID) {
+        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID)
+        {
             return $response;
         }
 
@@ -71,7 +73,8 @@ 
     {
         $headerLine = $request->getHeaderLine($this->header);
 
-        if ($this->valueFormat !== '%s') {
+        if ($this->valueFormat !== '%s')
+        {
             [$token] = sscanf($headerLine, $this->valueFormat);
 
             return $token !== null ? (string) $token : null;

src/AuthHttp/src/Middleware/AuthMiddleware.php

Braces +10 added lines, -5 removed lines

@@ -70,14 +70,17 @@ 
 
     private function initContext(Request $request, AuthContextInterface $authContext): AuthContextInterface
     {
-        foreach ($this->transportRegistry->getTransports() as $name => $transport) {
+        foreach ($this->transportRegistry->getTransports() as $name => $transport)
+        {
             $tokenID = $transport->fetchToken($request);
-            if ($tokenID === null) {
+            if ($tokenID === null)
+            {
                 continue;
             }
 
             $token = $this->tokenStorage->load($tokenID);
-            if ($token === null) {
+            if ($token === null)
+            {
                 continue;
             }
 
@@ -91,13 +94,15 @@ 
 
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
     {
-        if ($authContext->getToken() === null) {
+        if ($authContext->getToken() === null)
+        {
             return $response;
         }
 
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
 
-        if ($authContext->isClosed()) {
+        if ($authContext->isClosed())
+        {
             $this->tokenStorage->delete($authContext->getToken());
 
             return $transport->removeToken(

src/Csrf/src/Middleware/CsrfMiddleware.php

Spacing +6 added lines, -6 removed lines

@@ -45,9 +45,9 @@ 
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $cookie = null;
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
+        if (isset($request->getCookieParams()[$this->config->getCookie()])){
             $token = $request->getCookieParams()[$this->config->getCookie()];
-        } else {
+        }else{
             //Making new token
             $token = $this->random($this->config->getTokenLength());
 
@@ -58,7 +58,7 @@ 
         //CSRF issues must be handled by Firewall middleware
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
 
-        if (!empty($cookie)) {
+        if (!empty($cookie)){
             return $response->withAddedHeader('Set-Cookie', $cookie);
         }
 
@@ -89,11 +89,11 @@ 
      */
     private function random(int $length = 32): string
     {
-        try {
-            if (empty($string = random_bytes($length))) {
+        try{
+            if (empty($string = random_bytes($length))){
                 throw new RuntimeException('Unable to generate random string');
             }
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new RuntimeException('Unable to generate random string', $e->getCode(), $e);
         }
 

Braces +14 added lines, -6 removed lines

@@ -45,9 +45,12 @@ 
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $cookie = null;
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
+        if (isset($request->getCookieParams()[$this->config->getCookie()]))
+        {
             $token = $request->getCookieParams()[$this->config->getCookie()];
-        } else {
+        }
+        else
+        {
             //Making new token
             $token = $this->random($this->config->getTokenLength());
 
@@ -58,7 +61,8 @@ 
         //CSRF issues must be handled by Firewall middleware
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
 
-        if (!empty($cookie)) {
+        if (!empty($cookie))
+        {
             return $response->withAddedHeader('Set-Cookie', $cookie);
         }
 
@@ -89,11 +93,15 @@ 
      */
     private function random(int $length = 32): string
     {
-        try {
-            if (empty($string = random_bytes($length))) {
+        try
+        {
+            if (empty($string = random_bytes($length)))
+            {
                 throw new RuntimeException('Unable to generate random string');
             }
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new RuntimeException('Unable to generate random string', $e->getCode(), $e);
         }