spiral / framework

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/Security/GuardScope.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
         PermissionsInterface $permissions,
         ContainerInterface $actorScope,
         array $roles = []
-    ) {
+    ){
         $this->roles = $roles;
         $this->container = $actorScope;
         $this->permissions = $permissions;
@@ -53,8 +53,8 @@ 
     public function allows(string $permission, array $context = []): bool
     {
         $allows = false;
-        foreach ($this->getRoles() as $role) {
-            if (!$this->permissions->hasRole($role)) {
+        foreach ($this->getRoles() as $role){
+            if (!$this->permissions->hasRole($role)){
                 continue;
             }
 
@@ -100,13 +100,13 @@ 
      */
     public function getActor(): ActorInterface
     {
-        if (!is_null($this->actor)) {
+        if (!is_null($this->actor)){
             return $this->actor;
         }
 
-        try {
+        try{
             return $this->container->get(ActorInterface::class);
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             throw new ScopeException('Unable to resolve Actor from the scope', $e->getCode(), $e);
         }
     }

Braces +11 added lines, -5 removed lines

@@ -52,8 +52,10 @@ 
     public function allows(string $permission, array $context = []): bool
     {
         $allows = false;
-        foreach ($this->getRoles() as $role) {
-            if (!$this->permissions->hasRole($role)) {
+        foreach ($this->getRoles() as $role)
+        {
+            if (!$this->permissions->hasRole($role))
+            {
                 continue;
             }
 
@@ -99,13 +101,17 @@ 
      */
     public function getActor(): ActorInterface
     {
-        if (!is_null($this->actor)) {
+        if (!is_null($this->actor))
+        {
             return $this->actor;
         }
 
-        try {
+        try
+        {
             return $this->container->get(ActorInterface::class);
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             throw new ScopeException('Unable to resolve Actor from the scope', $e->getCode(), $e);
         }
     }

src/Cookies/CookieManager.php

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,7 @@ 
         string $domain = null,
         bool $secure = null,
         bool $httpOnly = true
-    ) {
+    ){
         $this->getCookieQueue()->set($name, $value, $lifetime, $path, $domain, $secure, $httpOnly);
 
         return $this;
@@ -159,9 +159,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);
         }
     }
@@ -175,7 +175,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

@@ -159,9 +159,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);
         }
     }
@@ -175,7 +178,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/Session/SessionScope.php

Spacing +3 added lines, -3 removed lines

@@ -121,15 +121,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

@@ -121,15 +121,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/Bootloader/Http/RouterBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,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

@@ -57,7 +57,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');
         }
 

src/Bootloader/Http/CookiesBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,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

@@ -72,7 +72,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');
         }
 

tests/Framework/GRPC/DispatcherTest.php

Spacing +13 added lines, -13 removed lines

@@ -22,14 +22,14 @@ 
     public function setUp(): void
     {
         exec('protoc 2>&1', $out);
-        if (strpos(join("\n", $out), '--php_out') === false) {
+        if (strpos(join("\n", $out), '--php_out') === false){
             $this->markTestSkipped('Protoc binary is missing');
         }
 
         parent::setUp();
 
         $fs = new Files();
-        $proto = $fs->normalizePath($this->app->dir('app') . 'proto/service.proto');
+        $proto = $fs->normalizePath($this->app->dir('app').'proto/service.proto');
 
         // protoc can't figure relative paths
         $proto = str_replace('Framework/../', '', $proto);
@@ -38,7 +38,7 @@ 
             'proto' => $proto
         ]);
 
-        file_put_contents($this->app->dir('app') . 'src/Service/EchoService.php', GenerateTest::SERVICE);
+        file_put_contents($this->app->dir('app').'src/Service/EchoService.php', GenerateTest::SERVICE);
     }
 
     public function tearDown(): void
@@ -47,12 +47,12 @@ 
 
         $fs = new Files();
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) {
-            $fs->deleteDirectory($this->app->dir('app') . 'src/Service');
+        if ($fs->isDirectory($this->app->dir('app').'src/Service')){
+            $fs->deleteDirectory($this->app->dir('app').'src/Service');
         }
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) {
-            $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata');
+        if ($fs->isDirectory($this->app->dir('app').'src/GPBMetadata')){
+            $fs->deleteDirectory($this->app->dir('app').'src/GPBMetadata');
         }
     }
 
@@ -78,7 +78,7 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "service": "service.Echo",
                   "method": "Ping"
@@ -89,7 +89,7 @@ 
         )->andReturn($msg->serializeToString());
 
         $w->shouldReceive('send')->once()->with(
-            \Mockery::on(function ($out) {
+            \Mockery::on(function ($out){
                 $msg = new Message();
                 $msg->mergeFromString($out);
                 $this->assertSame('hello', $msg->getMsg());
@@ -100,7 +100,7 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = null;
                 return true;
             })
@@ -120,7 +120,7 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "service": "service.Echo",
                   "method": "Invalid"
@@ -131,7 +131,7 @@ 
         )->andReturn($msg->serializeToString());
 
         $w->shouldReceive('error')->once()->with(
-            \Mockery::on(function ($out) {
+            \Mockery::on(function ($out){
                 $this->assertContains('Method `Invalid` not found', $out);
                 return true;
             })
@@ -139,7 +139,7 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = null;
                 return true;
             })

Braces +18 added lines, -9 removed lines

@@ -22,7 +22,8 @@ 
     public function setUp(): void
     {
         exec('protoc 2>&1', $out);
-        if (strpos(join("\n", $out), '--php_out') === false) {
+        if (strpos(join("\n", $out), '--php_out') === false)
+        {
             $this->markTestSkipped('Protoc binary is missing');
         }
 
@@ -47,11 +48,13 @@ 
 
         $fs = new Files();
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) {
+        if ($fs->isDirectory($this->app->dir('app') . 'src/Service'))
+        {
             $fs->deleteDirectory($this->app->dir('app') . 'src/Service');
         }
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) {
+        if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata'))
+        {
             $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata');
         }
     }
@@ -78,7 +81,8 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "service": "service.Echo",
                   "method": "Ping"
@@ -89,7 +93,8 @@ 
         )->andReturn($msg->serializeToString());
 
         $w->shouldReceive('send')->once()->with(
-            \Mockery::on(function ($out) {
+            \Mockery::on(function ($out)
+            {
                 $msg = new Message();
                 $msg->mergeFromString($out);
                 $this->assertSame('hello', $msg->getMsg());
@@ -100,7 +105,8 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = null;
                 return true;
             })
@@ -120,7 +126,8 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "service": "service.Echo",
                   "method": "Invalid"
@@ -131,7 +138,8 @@ 
         )->andReturn($msg->serializeToString());
 
         $w->shouldReceive('error')->once()->with(
-            \Mockery::on(function ($out) {
+            \Mockery::on(function ($out)
+            {
                 $this->assertContains('Method `Invalid` not found', $out);
                 return true;
             })
@@ -139,7 +147,8 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = null;
                 return true;
             })

tests/Framework/Jobs/DispatcherTest.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
         $this->assertNull($this->app->getEnvironment()->get('FIRED'));
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "id": "1",
                   "job": "spiral.app.job.TestJob"
@@ -69,7 +69,7 @@ 
         $this->app->getContainer()->bind(Worker::class, $w);
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "id": "1",
                   "job": "spiral.app.job.ErrorJob"
@@ -85,7 +85,7 @@ 
         $w->shouldReceive('receive')->once()->andReturn(null);
 
         $files = $this->app->get(FilesInterface::class)->getFiles(
-            $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/'
+            $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/'
         );
 
         $this->assertCount(0, $files);
@@ -93,7 +93,7 @@ 
         $this->app->get(JobDispatcher::class)->serve();
 
         $files = $this->app->get(FilesInterface::class)->getFiles(
-            $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/'
+            $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/'
         );
 
         $this->assertCount(1, $files);

Braces +4 added lines, -2 removed lines

@@ -41,7 +41,8 @@ 
         $this->assertNull($this->app->getEnvironment()->get('FIRED'));
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "id": "1",
                   "job": "spiral.app.job.TestJob"
@@ -69,7 +70,8 @@ 
         $this->app->getContainer()->bind(Worker::class, $w);
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "id": "1",
                   "job": "spiral.app.job.ErrorJob"

tests/Framework/Http/SessionTest.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 {
     public function testSetSid(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -32,7 +32,7 @@ 
 
     public function testSessionResume(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -56,7 +56,7 @@ 
 
     public function testSessionRegenerateId(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -73,7 +73,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;
@@ -92,7 +92,7 @@ 
 
     public function testDestroySession(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -105,7 +105,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

@@ -18,7 +18,8 @@ 
 {
     public function testSetSid(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -32,7 +33,8 @@ 
 
     public function testSessionResume(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -56,7 +58,8 @@ 
 
     public function testSessionRegenerateId(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -73,7 +76,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;
@@ -92,7 +96,8 @@ 
 
     public function testDestroySession(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return ++$this->session()->getSection('cli')->value;
         });
 
@@ -105,7 +110,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());