spiral / framework

src/Router/src/AbstractRoute.php

Spacing +2 added lines, -2 removed lines

@@ -65,12 +65,12 @@
      */
     public function match(Request $request): ?RouteInterface
     {
-        if (!in_array(strtoupper($request->getMethod()), $this->getVerbs(), true)) {
+        if (!in_array(strtoupper($request->getMethod()), $this->getVerbs(), true)){
             return null;
         }
 
         $matches = $this->uriHandler->match($request->getUri(), $this->defaults);
-        if ($matches === null) {
+        if ($matches === null){
             return null;
         }
 

Braces +4 added lines, -2 removed lines

@@ -65,12 +65,14 @@
      */
     public function match(Request $request): ?RouteInterface
     {
-        if (!in_array(strtoupper($request->getMethod()), $this->getVerbs(), true)) {
+        if (!in_array(strtoupper($request->getMethod()), $this->getVerbs(), true))
+        {
             return null;
         }
 
         $matches = $this->uriHandler->match($request->getUri(), $this->defaults);
-        if ($matches === null) {
+        if ($matches === null)
+        {
             return null;
         }
 

src/Router/src/CoreHandler.php

Spacing +16 added lines, -16 removed lines

@@ -60,7 +60,7 @@ 
         CoreInterface $core,
         ScopeInterface $scope,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->core = $core;
         $this->scope = $scope;
         $this->responseFactory = $responseFactory;
@@ -103,7 +103,7 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null){
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -113,7 +113,7 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -128,22 +128,22 @@ 
                     );
                 }
             );
-        } catch (ControllerException $e) {
+        }catch (ControllerException $e){
             ob_get_clean();
             throw $this->mapException($e);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
-                $output = ob_get_clean() . $output;
+        }finally{
+            while (ob_get_level() > $outputLevel + 1){
+                $output = ob_get_clean().$output;
             }
         }
 
         return $this->wrapResponse(
             $response,
             $result,
-            ob_get_clean() . $output
+            ob_get_clean().$output
         );
     }
 
@@ -153,8 +153,8 @@ 
      */
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
-            return strtolower($request->getMethod()) . ucfirst($this->action);
+        if ($this->verbActions){
+            return strtolower($request->getMethod()).ucfirst($this->action);
         }
 
         return $this->action;
@@ -170,17 +170,17 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response){
+            if ($output !== '' && $result->getBody()->isWritable()){
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if (is_array($result) || $result instanceof \JsonSerializable) {
+        if (is_array($result) || $result instanceof \JsonSerializable){
             $response = $this->writeJson($response, $result);
-        } else {
+        }else{
             $response->getBody()->write((string)$result);
         }
 
@@ -198,7 +198,7 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode()){
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

Braces +30 added lines, -13 removed lines

@@ -103,7 +103,8 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null)
+        {
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -113,14 +114,16 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
                     Request::class  => $request,
                     Response::class => $response
                 ],
-                function () use ($request) {
+                function () use ($request)
+                {
                     return $this->core->callAction(
                         $this->controller,
                         $this->getAction($request),
@@ -128,14 +131,21 @@ 
                     );
                 }
             );
-        } catch (ControllerException $e) {
+        }
+        catch (ControllerException $e)
+        {
             ob_get_clean();
             throw $this->mapException($e);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
+        }
+        finally
+        {
+            while (ob_get_level() > $outputLevel + 1)
+            {
                 $output = ob_get_clean() . $output;
             }
         }
@@ -153,7 +163,8 @@ 
      */
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
+        if ($this->verbActions)
+        {
             return strtolower($request->getMethod()) . ucfirst($this->action);
         }
 
@@ -170,17 +181,22 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response)
+        {
+            if ($output !== '' && $result->getBody()->isWritable())
+            {
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if (is_array($result) || $result instanceof \JsonSerializable) {
+        if (is_array($result) || $result instanceof \JsonSerializable)
+        {
             $response = $this->writeJson($response, $result);
-        } else {
+        }
+        else
+        {
             $response->getBody()->write((string)$result);
         }
 
@@ -198,7 +214,8 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode())
+        {
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

src/Router/src/UriHandler.php

Spacing +31 added lines, -31 removed lines

@@ -32,7 +32,7 @@ 
         'integer' => '\d+',
         'uuid'    => '0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}'
     ];
-    private const URI_FIXERS       = [
+    private const URI_FIXERS = [
         '[]'  => '',
         '[/]' => '',
         '['   => '',
@@ -78,7 +78,7 @@ 
     public function __construct(
         UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null
-    ) {
+    ){
         $this->uriFactory = $uriFactory;
         $this->slugify = $slugify ?? new Slugify();
     }
@@ -167,12 +167,12 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
         $matches = [];
-        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)){
             return null;
         }
 
@@ -190,7 +190,7 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -200,8 +200,8 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $values) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $values){
+            if (empty($parameters[$key])){
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -210,7 +210,7 @@ 
         $path = $this->interpolate($this->template, $parameters);
 
         //Uri with added prefix
-        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix) . trim($path, '/'));
+        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix).trim($path, '/'));
 
         return empty($query) ? $uri : $uri->withQuery(http_build_query($query));
     }
@@ -227,18 +227,18 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter){
+            if (is_numeric($key) && isset($allowed[$key])){
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) {
+            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)){
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             //String must be normalized here
-            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)){
                 $result[$key] = $this->slugify->slugify($parameter);
                 continue;
             }
@@ -259,15 +259,15 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
-            $path = '/' . $path;
+        if (empty($path) || $path[0] !== '/'){
+            $path = '/'.$path;
         }
 
-        if ($this->matchHost) {
-            $uriString = $uri->getHost() . $path;
-        } else {
+        if ($this->matchHost){
+            $uriString = $uri->getHost().$path;
+        }else{
             $uriString = substr($path, strlen($this->prefix));
-            if ($uriString === false) {
+            if ($uriString === false){
                 $uriString = '';
             }
         }
@@ -280,7 +280,7 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -288,14 +288,14 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
-            $pattern = '[' . substr($pattern, 2);
+        if (strpos($pattern, '[/') === 0){
+            $pattern = '['.substr($pattern, 2);
         }
 
-        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)){
             $variables = array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment){
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -305,13 +305,13 @@ 
         $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = array_fill_keys($options, null);
 
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value){
+            if ($value instanceof Autofill){
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
-            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])){
                 throw new ConstrainException(
                     sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -322,7 +322,7 @@ 
             }
         }
 
-        $this->compiled = '/^' . strtr($template, $replaces + self::PATTERN_REPLACES) . '$/iu';
+        $this->compiled = '/^'.strtr($template, $replaces + self::PATTERN_REPLACES).'$/iu';
         $this->template = stripslashes(str_replace('?', '', $template));
         $this->options = $options;
     }
@@ -337,7 +337,7 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value){
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -354,15 +354,15 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== ''){
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name])){
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name])){
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);

Braces +50 added lines, -24 removed lines

@@ -167,12 +167,14 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
         $matches = [];
-        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches))
+        {
             return null;
         }
 
@@ -190,7 +192,8 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -200,8 +203,10 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $values) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $values)
+        {
+            if (empty($parameters[$key]))
+            {
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -227,18 +232,23 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter)
+        {
+            if (is_numeric($key) && isset($allowed[$key]))
+            {
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) {
+            }
+            elseif (!array_key_exists($key, $this->options) && is_array($parameters))
+            {
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             //String must be normalized here
-            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter))
+            {
                 $result[$key] = $this->slugify->slugify($parameter);
                 continue;
             }
@@ -259,15 +269,20 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
+        if (empty($path) || $path[0] !== '/')
+        {
             $path = '/' . $path;
         }
 
-        if ($this->matchHost) {
+        if ($this->matchHost)
+        {
             $uriString = $uri->getHost() . $path;
-        } else {
+        }
+        else
+        {
             $uriString = substr($path, strlen($this->prefix));
-            if ($uriString === false) {
+            if ($uriString === false)
+            {
                 $uriString = '';
             }
         }
@@ -280,7 +295,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -288,14 +304,17 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
+        if (strpos($pattern, '[/') === 0)
+        {
             $pattern = '[' . substr($pattern, 2);
         }
 
-        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches))
+        {
             $variables = array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment)
+            {
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -305,13 +324,16 @@ 
         $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = array_fill_keys($options, null);
 
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value)
+        {
+            if ($value instanceof Autofill)
+            {
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
-            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!array_key_exists($key, $options) && !isset($this->defaults[$key]))
+            {
                 throw new ConstrainException(
                     sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -337,7 +359,8 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -354,15 +377,18 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== '')
+        {
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name]))
+        {
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name]))
+        {
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);

src/Session/tests/FactoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 {
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE){
             session_abort();
         }
     }

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
 {
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE)
+        {
             session_abort();
         }
     }

src/Session/tests/SessionTest.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE){
             session_abort();
         }
     }
@@ -125,7 +125,7 @@ 
         $this->assertSame('default', $section->getName());
 
         $section->set('key', 'value');
-        foreach ($section as $key => $value) {
+        foreach ($section as $key => $value){
             $this->assertSame('key', $key);
             $this->assertSame('value', $value);
         }

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
 
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE)
+        {
             session_abort();
         }
     }
@@ -125,7 +126,8 @@ 
         $this->assertSame('default', $section->getName());
 
         $section->set('key', 'value');
-        foreach ($section as $key => $value) {
+        foreach ($section as $key => $value)
+        {
             $this->assertSame('key', $key);
             $this->assertSame('value', $value);
         }

src/Session/src/SessionSection.php

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
      */
     public function get(string $name, $default = null)
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             return $default;
         }
 
@@ -202,7 +202,7 @@ 
     {
         $this->session->resume();
 
-        if (!isset($_SESSION[$this->name])) {
+        if (!isset($_SESSION[$this->name])){
             $_SESSION[$this->name] = [];
         }
     }

Braces +4 added lines, -2 removed lines

@@ -127,7 +127,8 @@ 
      */
     public function get(string $name, $default = null)
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             return $default;
         }
 
@@ -202,7 +203,8 @@ 
     {
         $this->session->resume();
 
-        if (!isset($_SESSION[$this->name])) {
+        if (!isset($_SESSION[$this->name]))
+        {
             $_SESSION[$this->name] = [];
         }
     }

src/Session/src/Handler/FileHandler.php

Spacing +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
      */
     public function gc($maxlifetime): void
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename){
+            if ($this->files->time($filename) < time() - $maxlifetime){
                 $this->files->delete($filename);
             }
         }

Braces +4 added lines, -2 removed lines

@@ -62,8 +62,10 @@
      */
     public function gc($maxlifetime): void
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename)
+        {
+            if ($this->files->time($filename) < time() - $maxlifetime)
+            {
                 $this->files->delete($filename);
             }
         }

src/Session/src/SessionFactory.php

Spacing +4 added lines, -4 removed lines

@@ -48,15 +48,15 @@
      */
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE){
             throw new MultipleSessionException('Unable to initiate session, session already started');
         }
 
         //Initiating proper session handler
-        if ($this->config->getHandler() !== null) {
-            try {
+        if ($this->config->getHandler() !== null){
+            try{
                 $handler = $this->config->getHandler()->resolve($this->factory);
-            } catch (\Throwable | ContainerExceptionInterface $e) {
+            }catch (\Throwable | ContainerExceptionInterface $e){
                 throw new SessionException($e->getMessage(), $e->getCode(), $e);
             }
 

Braces +9 added lines, -4 removed lines

@@ -48,15 +48,20 @@
      */
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE)
+        {
             throw new MultipleSessionException('Unable to initiate session, session already started');
         }
 
         //Initiating proper session handler
-        if ($this->config->getHandler() !== null) {
-            try {
+        if ($this->config->getHandler() !== null)
+        {
+            try
+            {
                 $handler = $this->config->getHandler()->resolve($this->factory);
-            } catch (\Throwable | ContainerExceptionInterface $e) {
+            }
+            catch (\Throwable | ContainerExceptionInterface $e)
+            {
                 throw new SessionException($e->getMessage(), $e->getCode(), $e);
             }
 

src/Session/src/Session.php

Spacing +13 added lines, -13 removed lines

@@ -72,7 +72,7 @@ 
         $this->clientSignature = $clientSignature;
         $this->lifetime = $lifetime;
 
-        if (!empty($id) && $this->validID($id)) {
+        if (!empty($id) && $this->validID($id)){
             $this->id = $id;
         }
     }
@@ -103,24 +103,24 @@ 
      */
     public function resume(): void
     {
-        if ($this->isStarted()) {
+        if ($this->isStarted()){
             return;
         }
 
-        if (!empty($this->id)) {
+        if (!empty($this->id)){
             session_id($this->id);
-        } else {
+        }else{
             // always new id
             session_id(session_create_id());
         }
 
-        try {
+        try{
             session_start(['use_cookies' => false]);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new SessionException('Unable to start session', $e->getCode(), $e);
         }
 
-        if (empty($this->id)) {
+        if (empty($this->id)){
             //Sign newly created session
             $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature;
             $_SESSION[self::SESSION_CREATED] = time();
@@ -131,7 +131,7 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession()){
             $this->invalidateSession();
         }
     }
@@ -170,7 +170,7 @@ 
      */
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -185,7 +185,7 @@ 
      */
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -228,17 +228,17 @@ 
         if (
             !array_key_exists(self::CLIENT_SIGNATURE, $_SESSION)
             || !array_key_exists(self::SESSION_CREATED, $_SESSION)
-        ) {
+        ){
             //Missing session signature or timestamp!
             return false;
         }
 
-        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) {
+        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime){
             //Session expired
             return false;
         }
 
-        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) {
+        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)){
             //Signatures do not match
             return false;
         }

Braces +26 added lines, -12 removed lines

@@ -72,7 +72,8 @@ 
         $this->clientSignature = $clientSignature;
         $this->lifetime = $lifetime;
 
-        if (!empty($id) && $this->validID($id)) {
+        if (!empty($id) && $this->validID($id))
+        {
             $this->id = $id;
         }
     }
@@ -103,24 +104,32 @@ 
      */
     public function resume(): void
     {
-        if ($this->isStarted()) {
+        if ($this->isStarted())
+        {
             return;
         }
 
-        if (!empty($this->id)) {
+        if (!empty($this->id))
+        {
             session_id($this->id);
-        } else {
+        }
+        else
+        {
             // always new id
             session_id(session_create_id());
         }
 
-        try {
+        try
+        {
             session_start(['use_cookies' => false]);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new SessionException('Unable to start session', $e->getCode(), $e);
         }
 
-        if (empty($this->id)) {
+        if (empty($this->id))
+        {
             //Sign newly created session
             $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature;
             $_SESSION[self::SESSION_CREATED] = time();
@@ -131,7 +140,8 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession())
+        {
             $this->invalidateSession();
         }
     }
@@ -170,7 +180,8 @@ 
      */
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -185,7 +196,8 @@ 
      */
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -233,12 +245,14 @@ 
             return false;
         }
 
-        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) {
+        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime)
+        {
             //Session expired
             return false;
         }
 
-        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) {
+        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature))
+        {
             //Signatures do not match
             return false;
         }