spiral / framework

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/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;
         }

src/Session/src/Config/SessionConfig.php

Spacing +3 added lines, -3 removed lines

@@ -64,15 +64,15 @@
      */
     public function getHandler(): ?Autowire
     {
-        if (empty($this->config['handler'])) {
+        if (empty($this->config['handler'])){
             return null;
         }
 
-        if ($this->config['handler'] instanceof Autowire) {
+        if ($this->config['handler'] instanceof Autowire){
             return $this->config['handler'];
         }
 
-        if (class_exists($this->config['handler'])) {
+        if (class_exists($this->config['handler'])){
             return new Autowire($this->config['handler']);
         }
 

Braces +6 added lines, -3 removed lines

@@ -64,15 +64,18 @@
      */
     public function getHandler(): ?Autowire
     {
-        if (empty($this->config['handler'])) {
+        if (empty($this->config['handler']))
+        {
             return null;
         }
 
-        if ($this->config['handler'] instanceof Autowire) {
+        if ($this->config['handler'] instanceof Autowire)
+        {
             return $this->config['handler'];
         }
 
-        if (class_exists($this->config['handler'])) {
+        if (class_exists($this->config['handler']))
+        {
             return new Autowire($this->config['handler']);
         }
 

src/Views/tests/LoaderTest.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
         $this->expectException(LoaderException::class);
 
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
+            'default' => __DIR__.'/fixtures/default',
         ]);
 
         $loader->exists('view');
@@ -35,7 +35,7 @@ 
         $this->expectException(LoaderException::class);
 
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
+            'default' => __DIR__.'/fixtures/default',
         ]);
 
         $loader->list();
@@ -46,7 +46,7 @@ 
         $this->expectException(LoaderException::class);
 
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
+            'default' => __DIR__.'/fixtures/default',
         ]);
 
         $loader->load('view');
@@ -55,7 +55,7 @@ 
     public function testExists(): void
     {
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
+            'default' => __DIR__.'/fixtures/default',
         ]);
 
         $loader = $loader->withExtension('php');
@@ -86,7 +86,7 @@ 
     public function testList(): void
     {
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
+            'default' => __DIR__.'/fixtures/default',
         ]);
 
         $loader = $loader->withExtension('php');
@@ -103,7 +103,7 @@ 
         $this->expectException(LoaderException::class);
 
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
+            'default' => __DIR__.'/fixtures/default',
         ]);
 
         $loader = $loader->withExtension('php');
@@ -146,7 +146,7 @@ 
     public function testLoad(): void
     {
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
+            'default' => __DIR__.'/fixtures/default',
         ]);
 
         $loader = $loader->withExtension('php');
@@ -169,8 +169,8 @@ 
     public function testMultipleNamespaces(): void
     {
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
-            'other'   => __DIR__ . '/fixtures/other',
+            'default' => __DIR__.'/fixtures/default',
+            'other'   => __DIR__.'/fixtures/other',
 
         ]);