spiral / framework

src/Auth/Session/TokenStorage.php

Spacing +7 added lines, -7 removed lines

@@ -40,22 +40,22 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try{
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
-            if ($tokenData === null) {
+            if ($tokenData === null){
                 return null;
             }
 
             $token = Token::unpack($tokenData);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to load session token', $e->getCode(), $e);
         }
 
-        if (!hash_equals($token->getID(), $id)) {
+        if (!hash_equals($token->getID(), $id)){
             return null;
         }
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime()){
             $this->delete($token);
             return null;
         }
@@ -68,12 +68,12 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token($this->randomHash(128), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to create session token', $e->getCode(), $e);
         }
     }

Braces +16 added lines, -7 removed lines

@@ -40,22 +40,28 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try
+        {
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
-            if ($tokenData === null) {
+            if ($tokenData === null)
+            {
                 return null;
             }
 
             $token = Token::unpack($tokenData);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to load session token', $e->getCode(), $e);
         }
 
-        if (!hash_equals($token->getID(), $id)) {
+        if (!hash_equals($token->getID(), $id))
+        {
             return null;
         }
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() > new \DateTime())
+        {
             $this->delete($token);
             return null;
         }
@@ -68,12 +74,15 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token($this->randomHash(128), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to create session token', $e->getCode(), $e);
         }
     }

src/Domain/CycleInterceptor.php

Spacing +11 added lines, -11 removed lines

@@ -45,22 +45,22 @@ 
     {
         $entities = $this->getDeclaredEntities($controller, $action);
 
-        foreach ($entities as $parameter => $role) {
+        foreach ($entities as $parameter => $role){
             $value = $this->getParameter($parameter, $parameters, count($entities) === 1);
-            if ($value === null) {
+            if ($value === null){
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
                 );
             }
 
-            if (is_object($value)) {
+            if (is_object($value)){
                 // pre-filled
                 continue;
             }
 
             $entity = $this->resolveEntity($role, $value);
-            if ($entity === null) {
+            if ($entity === null){
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
@@ -81,7 +81,7 @@ 
      */
     protected function getParameter(string $role, array $parameters, bool $useDefault = false)
     {
-        if (!$useDefault) {
+        if (!$useDefault){
             return $parameters[$role] ?? null;
         }
 
@@ -106,23 +106,23 @@ 
     private function getDeclaredEntities(string $controller, string $action): array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache)){
             return $this->cache[$key];
         }
 
         $this->cache[$key] = [];
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
-            if ($parameter->getClass() === null) {
+        foreach ($method->getParameters() as $parameter){
+            if ($parameter->getClass() === null){
                 continue;
             }
 
-            if ($this->orm->getSchema()->defines($parameter->getClass()->getName())) {
+            if ($this->orm->getSchema()->defines($parameter->getClass()->getName())){
                 $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($parameter->getClass()->getName());
             }
         }

Braces +23 added lines, -11 removed lines

@@ -45,22 +45,26 @@ 
     {
         $entities = $this->getDeclaredEntities($controller, $action);
 
-        foreach ($entities as $parameter => $role) {
+        foreach ($entities as $parameter => $role)
+        {
             $value = $this->getParameter($parameter, $parameters, count($entities) === 1);
-            if ($value === null) {
+            if ($value === null)
+            {
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
                 );
             }
 
-            if (is_object($value)) {
+            if (is_object($value))
+            {
                 // pre-filled
                 continue;
             }
 
             $entity = $this->resolveEntity($role, $value);
-            if ($entity === null) {
+            if ($entity === null)
+            {
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
@@ -81,7 +85,8 @@ 
      */
     protected function getParameter(string $role, array $parameters, bool $useDefault = false)
     {
-        if (!$useDefault) {
+        if (!$useDefault)
+        {
             return $parameters[$role] ?? null;
         }
 
@@ -106,23 +111,30 @@ 
     private function getDeclaredEntities(string $controller, string $action): array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache))
+        {
             return $this->cache[$key];
         }
 
         $this->cache[$key] = [];
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
-            if ($parameter->getClass() === null) {
+        foreach ($method->getParameters() as $parameter)
+        {
+            if ($parameter->getClass() === null)
+            {
                 continue;
             }
 
-            if ($this->orm->getSchema()->defines($parameter->getClass()->getName())) {
+            if ($this->orm->getSchema()->defines($parameter->getClass()->getName()))
+            {
                 $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($parameter->getClass()->getName());
             }
         }

src/Domain/GuardInterceptor.php

Spacing +9 added lines, -9 removed lines

@@ -52,7 +52,7 @@ 
     {
         $permission = $this->getPermissions($controller, $action);
 
-        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) {
+        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)){
             throw new ControllerException(
                 sprintf(
                     'Unauthorized permission `%s` for action `%s`->`%s`',
@@ -79,14 +79,14 @@ 
     private function getPermissions(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache)){
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return null;
         }
 
@@ -104,7 +104,7 @@ 
             Guarded::class
         );
 
-        if ($action === null) {
+        if ($action === null){
             return null;
         }
 
@@ -126,7 +126,7 @@ 
             ControllerException::FORBIDDEN
         ];
 
-        if ($guarded->permission === null && $ns === null) {
+        if ($guarded->permission === null && $ns === null){
             throw new InterceptorException(sprintf(
                 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`',
                 $method->getDeclaringClass()->getName(),
@@ -134,16 +134,16 @@ 
             ));
         }
 
-        if ($ns !== null) {
+        if ($ns !== null){
             $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]);
         }
 
-        if ($this->namespace !== null) {
+        if ($this->namespace !== null){
             // global namespace
             $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]);
         }
 
-        switch ($guarded->else) {
+        switch ($guarded->else){
             case 'badAction':
                 $permission[1] = ControllerException::BAD_ACTION;
                 break;

Braces +19 added lines, -9 removed lines

@@ -52,7 +52,8 @@ 
     {
         $permission = $this->getPermissions($controller, $action);
 
-        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) {
+        if ($permission !== null && !$this->guard->allows($permission[0], $parameters))
+        {
             throw new ControllerException(
                 sprintf(
                     'Unauthorized permission `%s` for action `%s`->`%s`',
@@ -79,14 +80,18 @@ 
     private function getPermissions(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache))
+        {
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return null;
         }
 
@@ -104,7 +109,8 @@ 
             Guarded::class
         );
 
-        if ($action === null) {
+        if ($action === null)
+        {
             return null;
         }
 
@@ -126,7 +132,8 @@ 
             ControllerException::FORBIDDEN
         ];
 
-        if ($guarded->permission === null && $ns === null) {
+        if ($guarded->permission === null && $ns === null)
+        {
             throw new InterceptorException(sprintf(
                 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`',
                 $method->getDeclaringClass()->getName(),
@@ -134,16 +141,19 @@ 
             ));
         }
 
-        if ($ns !== null) {
+        if ($ns !== null)
+        {
             $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]);
         }
 
-        if ($this->namespace !== null) {
+        if ($this->namespace !== null)
+        {
             // global namespace
             $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]);
         }
 
-        switch ($guarded->else) {
+        switch ($guarded->else)
+        {
             case 'badAction':
                 $permission[1] = ControllerException::BAD_ACTION;
                 break;

src/Snapshots/FileSnapshotter.php

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
         HandlerInterface $handler,
         FilesInterface $files,
         LoggerInterface $logger = null
-    ) {
+    ){
         $this->directory = $directory;
         $this->maxFiles = $maxFiles;
         $this->verbosity = $verbosity;
@@ -69,7 +69,7 @@ 
     {
         $snapshot = new Snapshot($this->getID($e), $e);
 
-        if ($this->logger !== null) {
+        if ($this->logger !== null){
             $this->logger->error($snapshot->getMessage());
         }
 
@@ -101,17 +101,17 @@ 
     protected function rotateSnapshots(): void
     {
         $finder = new Finder();
-        $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) {
+        $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b){
             return $b->getMTime() - $a->getMTime();
         });
 
         $count = 0;
-        foreach ($finder as $file) {
+        foreach ($finder as $file){
             $count++;
-            if ($count > $this->maxFiles) {
-                try {
+            if ($count > $this->maxFiles){
+                try{
                     $this->files->delete($file->getRealPath());
-                } catch (FilesException $e) {
+                }catch (FilesException $e){
                     // ignore
                 }
             }

Braces +13 added lines, -6 removed lines

@@ -69,7 +69,8 @@ 
     {
         $snapshot = new Snapshot($this->getID($e), $e);
 
-        if ($this->logger !== null) {
+        if ($this->logger !== null)
+        {
             $this->logger->error($snapshot->getMessage());
         }
 
@@ -101,17 +102,23 @@ 
     protected function rotateSnapshots(): void
     {
         $finder = new Finder();
-        $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) {
+        $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b)
+        {
             return $b->getMTime() - $a->getMTime();
         });
 
         $count = 0;
-        foreach ($finder as $file) {
+        foreach ($finder as $file)
+        {
             $count++;
-            if ($count > $this->maxFiles) {
-                try {
+            if ($count > $this->maxFiles)
+            {
+                try
+                {
                     $this->files->delete($file->getRealPath());
-                } catch (FilesException $e) {
+                }
+                catch (FilesException $e)
+                {
                     // ignore
                 }
             }

tests/Framework/Http/RrTest.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
         );
 
         $psr->shouldReceive('respond')->once()->with(
-            \Mockery::on(function ($r) {
+            \Mockery::on(function ($r){
                 $this->assertSame('Hello, dave.', (string)$r->getBody());
                 return true;
             })
@@ -65,7 +65,7 @@ 
         );
 
         $psr->shouldReceive('respond')->once()->with(
-            \Mockery::on(function ($r) {
+            \Mockery::on(function ($r){
                 $this->assertContains('500', (string)$r->getBody());
                 return true;
             })
@@ -74,7 +74,7 @@ 
         $psr->shouldReceive('acceptRequest')->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);
@@ -82,7 +82,7 @@ 
         $this->app->get(RrDispacher::class)->serve($psr);
 
         $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);
@@ -103,7 +103,7 @@ 
         );
 
         $psr->shouldReceive('respond')->once()->with(
-            \Mockery::on(function ($r) {
+            \Mockery::on(function ($r){
                 $this->assertContains('undefined', (string)$r->getBody());
                 return true;
             })
@@ -112,7 +112,7 @@ 
         $psr->shouldReceive('acceptRequest')->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);
@@ -120,7 +120,7 @@ 
         $this->app->get(RrDispacher::class)->serve($psr);
 
         $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 +6 added lines, -3 removed lines

@@ -43,7 +43,8 @@ 
         );
 
         $psr->shouldReceive('respond')->once()->with(
-            \Mockery::on(function ($r) {
+            \Mockery::on(function ($r)
+            {
                 $this->assertSame('Hello, dave.', (string)$r->getBody());
                 return true;
             })
@@ -65,7 +66,8 @@ 
         );
 
         $psr->shouldReceive('respond')->once()->with(
-            \Mockery::on(function ($r) {
+            \Mockery::on(function ($r)
+            {
                 $this->assertContains('500', (string)$r->getBody());
                 return true;
             })
@@ -103,7 +105,8 @@ 
         );
 
         $psr->shouldReceive('respond')->once()->with(
-            \Mockery::on(function ($r) {
+            \Mockery::on(function ($r)
+            {
                 $this->assertContains('undefined', (string)$r->getBody());
                 return true;
             })

src/Bootloader/SnapshotsBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
         DirectoriesInterface $dirs,
         FilesInterface $files,
         LoggerInterface $logger = null
-    ) {
+    ){
         return new FileSnapshotter(
-            $dirs->get('runtime') . '/snapshots/',
+            $dirs->get('runtime').'/snapshots/',
             $env->get('SNAPSHOT_MAX_FILES', self::MAX_SNAPSHOTS),
             $env->get('SNAPSHOT_VERBOSITY', HandlerInterface::VERBOSITY_VERBOSE),
             new PlainHandler(),

src/Http/Middleware/ErrorHandlerMiddleware.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
         RendererInterface $renderer,
         ResponseFactoryInterface $responseFactory,
         SnapshotterInterface $snapshots = null
-    ) {
+    ){
         $this->suppressErrors = $suppressErrors;
         $this->renderer = $renderer;
         $this->responseFactory = $responseFactory;
@@ -68,22 +68,22 @@ 
      */
     public function process(Request $request, Handler $handler): Response
     {
-        try {
+        try{
             return $handler->handle($request);
-        } catch (ClientException | RouterException $e) {
-            if ($e instanceof ClientException) {
+        }catch (ClientException | RouterException $e){
+            if ($e instanceof ClientException){
                 $code = $e->getCode();
-            } else {
+            }else{
                 $code = 404;
             }
-        } catch (\Throwable $e) {
-            if ($this->snapshots !== null) {
+        }catch (\Throwable $e){
+            if ($this->snapshots !== null){
                 $this->snapshots->register($e);
             }
 
             $code = 500;
 
-            if (!$this->suppressErrors) {
+            if (!$this->suppressErrors){
                 return $this->renderException($request, $e);
             }
         }
@@ -104,7 +104,7 @@ 
     {
         $response = $this->responseFactory->createResponse(500);
 
-        if ($request->getHeaderLine('Accept') == 'application/json') {
+        if ($request->getHeaderLine('Accept') == 'application/json'){
             $response = $response->withHeader('Content-Type', 'application/json');
             $handler = new JsonHandler();
             $response->getBody()->write(json_encode(
@@ -114,7 +114,7 @@ 
                     true
                 )
             ));
-        } else {
+        }else{
             $handler = new HtmlHandler();
             $response->getBody()->write($handler->renderException($e, HtmlHandler::VERBOSITY_VERBOSE));
         }

Braces +22 added lines, -9 removed lines

@@ -68,22 +68,32 @@ 
      */
     public function process(Request $request, Handler $handler): Response
     {
-        try {
+        try
+        {
             return $handler->handle($request);
-        } catch (ClientException | RouterException $e) {
-            if ($e instanceof ClientException) {
+        }
+        catch (ClientException | RouterException $e)
+        {
+            if ($e instanceof ClientException)
+            {
                 $code = $e->getCode();
-            } else {
+            }
+            else
+            {
                 $code = 404;
             }
-        } catch (\Throwable $e) {
-            if ($this->snapshots !== null) {
+        }
+        catch (\Throwable $e)
+        {
+            if ($this->snapshots !== null)
+            {
                 $this->snapshots->register($e);
             }
 
             $code = 500;
 
-            if (!$this->suppressErrors) {
+            if (!$this->suppressErrors)
+            {
                 return $this->renderException($request, $e);
             }
         }
@@ -104,7 +114,8 @@ 
     {
         $response = $this->responseFactory->createResponse(500);
 
-        if ($request->getHeaderLine('Accept') == 'application/json') {
+        if ($request->getHeaderLine('Accept') == 'application/json')
+        {
             $response = $response->withHeader('Content-Type', 'application/json');
             $handler = new JsonHandler();
             $response->getBody()->write(json_encode(
@@ -114,7 +125,9 @@ 
                     true
                 )
             ));
-        } else {
+        }
+        else
+        {
             $handler = new HtmlHandler();
             $response->getBody()->write($handler->renderException($e, HtmlHandler::VERBOSITY_VERBOSE));
         }