spiral / framework

tests/Framework/Http/SessionTest.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function testSetSid()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -29,7 +29,7 @@ 
 
     public function testSessionResume()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -53,7 +53,7 @@ 
 
     public function testSessionRegenerateId()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -70,7 +70,7 @@ 
         $this->assertSame(200, $result->getStatusCode());
         $this->assertSame('2', $result->getBody()->__toString());
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             $this->session()->regenerateID(false);
 
             return ++$this->session()->getSection('cli')->value;
@@ -89,7 +89,7 @@ 
 
     public function testDestroySession()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -102,7 +102,7 @@ 
         ]);
         $this->assertSame(200, $result->getStatusCode());
         $this->assertSame('2', $result->getBody()->__toString());
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             $this->session()->destroy();
             $this->assertFalse($this->session()->isStarted());
 

Braces +12 added lines, -6 removed lines

@@ -15,7 +15,8 @@ 
 {
     public function testSetSid()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -29,7 +30,8 @@ 
 
     public function testSessionResume()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -53,7 +55,8 @@ 
 
     public function testSessionRegenerateId()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -70,7 +73,8 @@ 
         $this->assertSame(200, $result->getStatusCode());
         $this->assertSame('2', $result->getBody()->__toString());
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             $this->session()->regenerateID(false);
 
             return ++$this->session()->getSection('cli')->value;
@@ -89,7 +93,8 @@ 
 
     public function testDestroySession()
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -102,7 +107,8 @@ 
         ]);
         $this->assertSame(200, $result->getStatusCode());
         $this->assertSame('2', $result->getBody()->__toString());
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             $this->session()->destroy();
             $this->assertFalse($this->session()->isStarted());
 

tests/app/src/Controller/TestController.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     public function inputAction(InputScope $i)
     {
-        return 'value: ' . $i->withPrefix('section')->getValue('query', 'value');
+        return 'value: '.$i->withPrefix('section')->getValue('query', 'value');
     }
 
     public function errorAction()

src/Session/SessionScope.php

Spacing +3 added lines, -3 removed lines

@@ -120,15 +120,15 @@
      */
     private function getSession(): SessionInterface
     {
-        try {
+        try{
             $request = $this->container->get(ServerRequestInterface::class);
             $session = $request->getAttribute(SessionMiddleware::ATTRIBUTE);
-            if ($session === null) {
+            if ($session === null){
                 throw new ScopeException("Unable to receive active Session, invalid request scope");
             }
 
             return $session;
-        } catch (NotFoundExceptionInterface $e) {
+        }catch (NotFoundExceptionInterface $e){
             throw new ScopeException("Unable to receive active session", $e->getCode(), $e);
         }
     }

Braces +7 added lines, -3 removed lines

@@ -120,15 +120,19 @@
      */
     private function getSession(): SessionInterface
     {
-        try {
+        try
+        {
             $request = $this->container->get(ServerRequestInterface::class);
             $session = $request->getAttribute(SessionMiddleware::ATTRIBUTE);
-            if ($session === null) {
+            if ($session === null)
+            {
                 throw new ScopeException("Unable to receive active Session, invalid request scope");
             }
 
             return $session;
-        } catch (NotFoundExceptionInterface $e) {
+        }
+        catch (NotFoundExceptionInterface $e)
+        {
             throw new ScopeException("Unable to receive active session", $e->getCode(), $e);
         }
     }

src/Session/Middleware/SessionMiddleware.php

Spacing +8 added lines, -8 removed lines

@@ -57,7 +57,7 @@ 
         CookiesConfig $cookiesConfig,
         SessionFactory $factory,
         ScopeInterface $scope
-    ) {
+    ){
         $this->config = $config;
         $this->httpConfig = $httpConfig;
         $this->cookiesConfig = $cookiesConfig;
@@ -76,9 +76,9 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try{
             $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $session));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $session->abort();
             throw $e;
         }
@@ -97,14 +97,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());
         }
 
@@ -121,7 +121,7 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()])){
             return null;
         }
 
@@ -154,8 +154,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 +13 added lines, -6 removed lines

@@ -76,9 +76,12 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try
+        {
             $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $session));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $session->abort();
             throw $e;
         }
@@ -97,14 +100,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());
         }
 
@@ -121,7 +126,8 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()]))
+        {
             return null;
         }
 
@@ -154,7 +160,8 @@ 
     protected function clientSignature(Request $request): string
     {
         $signature = '';
-        foreach (static::SIGNATURE_HEADERS as $header) {
+        foreach (static::SIGNATURE_HEADERS as $header)
+        {
             $signature .= $request->getHeaderLine($header) . ';';
         }
 

src/Cookies/CookieManager.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
         string $domain = null,
         bool $secure = null,
         bool $httpOnly = true
-    ) {
+    ){
         $this->getCookieQueue()->set($name, $value, $lifetime, $path, $domain, $secure, $httpOnly);
 
         return $this;
@@ -158,9 +158,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);
         }
     }
@@ -174,7 +174,7 @@ 
     {
         $request = $this->getRequest();
         $queue = $request->getAttribute(CookieQueue::ATTRIBUTE, null);
-        if ($queue === null) {
+        if ($queue === null){
             throw new ScopeException("Unable to receive cookie queue, invalid request scope");
         }
 

Braces +7 added lines, -3 removed lines

@@ -158,9 +158,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);
         }
     }
@@ -174,7 +177,8 @@ 
     {
         $request = $this->getRequest();
         $queue = $request->getAttribute(CookieQueue::ATTRIBUTE, null);
-        if ($queue === null) {
+        if ($queue === null)
+        {
             throw new ScopeException("Unable to receive cookie queue, invalid request scope");
         }
 

src/Bootloader/Http/CookiesBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     private function cookieQueue(ServerRequestInterface $request): CookieQueue
     {
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE, null);
-        if ($cookieQueue === null) {
+        if ($cookieQueue === null){
             throw new ScopeException("Unable to resolve CookieQueue, invalid request scope");
         }
 

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
     private function cookieQueue(ServerRequestInterface $request): CookieQueue
     {
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE, null);
-        if ($cookieQueue === null) {
+        if ($cookieQueue === null)
+        {
             throw new ScopeException("Unable to resolve CookieQueue, invalid request scope");
         }
 

src/Bootloader/Http/RouterBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     private function route(ServerRequestInterface $request): RouteInterface
     {
         $route = $request->getAttribute(Router::ROUTE_ATTRIBUTE, null);
-        if ($route === null) {
+        if ($route === null){
             throw new ScopeException("Unable to resolve Route, invalid request scope");
         }
 

Braces +2 added lines, -1 removed lines

@@ -56,7 +56,8 @@
     private function route(ServerRequestInterface $request): RouteInterface
     {
         $route = $request->getAttribute(Router::ROUTE_ATTRIBUTE, null);
-        if ($route === null) {
+        if ($route === null)
+        {
             throw new ScopeException("Unable to resolve Route, invalid request scope");
         }