spiral / framework

src/Debug/StateCollector/HttpCollector.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function populate(StateInterface $state): void
     {
-        if (!$this->request === null) {
+        if (!$this->request === null){
             return;
         }
 
@@ -48,11 +48,11 @@ 
 
         $state->setVariable('headers', $this->request->getHeaders());
 
-        if ($this->request->getQueryParams() !== []) {
+        if ($this->request->getQueryParams() !== []){
             $state->setVariable('query', $this->request->getQueryParams());
         }
 
-        if ($this->request->getParsedBody() !== null) {
+        if ($this->request->getParsedBody() !== null){
             $state->setVariable('data', $this->request->getParsedBody());
         }
     }

Braces +6 added lines, -3 removed lines

@@ -39,7 +39,8 @@ 
      */
     public function populate(StateInterface $state): void
     {
-        if (!$this->request === null) {
+        if (!$this->request === null)
+        {
             return;
         }
 
@@ -48,11 +49,13 @@ 
 
         $state->setVariable('headers', $this->request->getHeaders());
 
-        if ($this->request->getQueryParams() !== []) {
+        if ($this->request->getQueryParams() !== [])
+        {
             $state->setVariable('query', $this->request->getQueryParams());
         }
 
-        if ($this->request->getParsedBody() !== null) {
+        if ($this->request->getParsedBody() !== null)
+        {
             $state->setVariable('data', $this->request->getParsedBody());
         }
     }

src/Console/Logger/DebugListener.php

Spacing +9 added lines, -9 removed lines

@@ -51,11 +51,11 @@ 
      */
     public function __invoke(LogEvent $event): void
     {
-        if (empty($this->output)) {
+        if (empty($this->output)){
             return;
         }
 
-        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE) {
+        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE){
             return;
         }
 
@@ -91,7 +91,7 @@ 
      */
     public function enable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry)){
             $this->listenerRegistry->addListener($this);
         }
 
@@ -105,7 +105,7 @@ 
      */
     public function disable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry)){
             $this->listenerRegistry->removeListener($this);
         }
 
@@ -128,13 +128,13 @@ 
      */
     private function getChannel(string $channel): string
     {
-        if (!class_exists($channel, false)) {
+        if (!class_exists($channel, false)){
             return "[{$channel}]";
         }
 
-        try {
+        try{
             $reflection = new \ReflectionClass($channel);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return $channel;
         }
 
@@ -150,10 +150,10 @@ 
      */
     private function getMessage(bool $decorated, string $message)
     {
-        if (!$decorated) {
+        if (!$decorated){
             return $message;
         }
 
-        return Color::GRAY . $message . Color::RESET;
+        return Color::GRAY.$message.Color::RESET;
     }
 }

Braces +17 added lines, -8 removed lines

@@ -51,11 +51,13 @@ 
      */
     public function __invoke(LogEvent $event): void
     {
-        if (empty($this->output)) {
+        if (empty($this->output))
+        {
             return;
         }
 
-        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE) {
+        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE)
+        {
             return;
         }
 
@@ -91,7 +93,8 @@ 
      */
     public function enable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry))
+        {
             $this->listenerRegistry->addListener($this);
         }
 
@@ -105,7 +108,8 @@ 
      */
     public function disable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry))
+        {
             $this->listenerRegistry->removeListener($this);
         }
 
@@ -128,13 +132,17 @@ 
      */
     private function getChannel(string $channel): string
     {
-        if (!class_exists($channel, false)) {
+        if (!class_exists($channel, false))
+        {
             return "[{$channel}]";
         }
 
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($channel);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return $channel;
         }
 
@@ -150,7 +158,8 @@ 
      */
     private function getMessage(bool $decorated, string $message)
     {
-        if (!$decorated) {
+        if (!$decorated)
+        {
             return $message;
         }
 

src/Bootloader/DebugBootloader.php

Spacing +4 added lines, -4 removed lines

@@ -70,16 +70,16 @@
     {
         $state = new State();
 
-        foreach ($this->collectors as $collector) {
-            if (is_string($collector)) {
+        foreach ($this->collectors as $collector){
+            if (is_string($collector)){
                 $collector = $this->factory->make($collector);
             }
 
-            if ($collector instanceof Autowire) {
+            if ($collector instanceof Autowire){
                 $collector = $collector->resolve($this->factory);
             }
 
-            if (!$collector instanceof StateCollectorInterface) {
+            if (!$collector instanceof StateCollectorInterface){
                 throw new StateException(sprintf(
                     'Unable to populate state, invalid state collector %s',
                     is_object($collector) ? get_class($collector) : gettype($collector)

Braces +8 added lines, -4 removed lines

@@ -70,16 +70,20 @@
     {
         $state = new State();
 
-        foreach ($this->collectors as $collector) {
-            if (is_string($collector)) {
+        foreach ($this->collectors as $collector)
+        {
+            if (is_string($collector))
+            {
                 $collector = $this->factory->make($collector);
             }
 
-            if ($collector instanceof Autowire) {
+            if ($collector instanceof Autowire)
+            {
                 $collector = $collector->resolve($this->factory);
             }
 
-            if (!$collector instanceof StateCollectorInterface) {
+            if (!$collector instanceof StateCollectorInterface)
+            {
                 throw new StateException(sprintf(
                     'Unable to populate state, invalid state collector %s',
                     is_object($collector) ? get_class($collector) : gettype($collector)

src/Snapshots/FileSnapshooter.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
                 }
             }

src/Bootloader/SnapshotsBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
         DirectoriesInterface $dirs,
         FilesInterface $files,
         LoggerInterface $logger = null
-    ) {
+    ){
         return new FileSnapshooter(
-            $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/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/Http/Middleware/ErrorHandlerMiddleware.php

Spacing +13 added lines, -13 removed lines

@@ -57,7 +57,7 @@ 
         RendererInterface $renderer,
         ResponseFactoryInterface $responseFactory,
         ContainerInterface $container
-    ) {
+    ){
         $this->suppressErrors = $suppressErrors;
         $this->renderer = $renderer;
         $this->responseFactory = $responseFactory;
@@ -71,22 +71,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) {
+        }catch (\Throwable $e){
             $snapshotter = $this->getOptional(SnapshotterInterface::class);
-            if ($snapshotter !== null) {
+            if ($snapshotter !== null){
                 /** @var SnapshotterInterface $snapshotter */
                 $snapshotter->register($e);
             }
 
-            if (!$this->suppressErrors) {
+            if (!$this->suppressErrors){
                 return $this->renderError($request, $e);
             }
 
@@ -109,7 +109,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(
@@ -119,10 +119,10 @@ 
                     true
                 )
             ));
-        } else {
+        }else{
             $handler = new HtmlHandler();
             $state = $this->getOptional(StateInterface::class);
-            if ($state !== null) {
+            if ($state !== null){
                 $handler = $handler->withState($state);
             }
 
@@ -156,9 +156,9 @@ 
      */
     private function getOptional(string $class)
     {
-        try {
+        try{
             return $this->container->get($class);
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }catch (\Throwable | ContainerExceptionInterface $se){
             return null;
         }
     }

Braces +29 added lines, -12 removed lines

@@ -71,22 +71,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) {
+        }
+        catch (\Throwable $e)
+        {
             $snapshotter = $this->getOptional(SnapshotterInterface::class);
-            if ($snapshotter !== null) {
+            if ($snapshotter !== null)
+            {
                 /** @var SnapshotterInterface $snapshotter */
                 $snapshotter->register($e);
             }
 
-            if (!$this->suppressErrors) {
+            if (!$this->suppressErrors)
+            {
                 return $this->renderError($request, $e);
             }
 
@@ -109,7 +119,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(
@@ -119,10 +130,13 @@ 
                     true
                 )
             ));
-        } else {
+        }
+        else
+        {
             $handler = new HtmlHandler();
             $state = $this->getOptional(StateInterface::class);
-            if ($state !== null) {
+            if ($state !== null)
+            {
                 $handler = $handler->withState($state);
             }
 
@@ -156,9 +170,12 @@ 
      */
     private function getOptional(string $class)
     {
-        try {
+        try
+        {
             return $this->container->get($class);
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }
+        catch (\Throwable | ContainerExceptionInterface $se)
+        {
             return null;
         }
     }

src/Http/ErrorHandler/PlainRenderer.php

Spacing +2 added lines, -2 removed lines

@@ -40,9 +40,9 @@
     public function renderException(Request $request, int $code, string $message): Response
     {
         $response = $this->responseFactory->createResponse($code);
-        if ($request->getHeaderLine('Accept') == 'application/json') {
+        if ($request->getHeaderLine('Accept') == 'application/json'){
             $response->getBody()->write(json_encode(['status' => $code, 'error' => $message]));
-        } else {
+        }else{
             $response->getBody()->write("Error code: {$code}");
         }
 

Braces +5 added lines, -2 removed lines

@@ -40,9 +40,12 @@
     public function renderException(Request $request, int $code, string $message): Response
     {
         $response = $this->responseFactory->createResponse($code);
-        if ($request->getHeaderLine('Accept') == 'application/json') {
+        if ($request->getHeaderLine('Accept') == 'application/json')
+        {
             $response->getBody()->write(json_encode(['status' => $code, 'error' => $message]));
-        } else {
+        }
+        else
+        {
             $response->getBody()->write("Error code: {$code}");
         }
 

tests/Framework/GRPC/DispatcherTest.php

Spacing +13 added lines, -13 removed lines

@@ -23,14 +23,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);
@@ -39,7 +39,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
@@ -48,12 +48,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');
         }
     }
 
@@ -79,7 +79,7 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "service": "service.Echo",
                   "method": "Ping",
@@ -91,7 +91,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());
@@ -103,7 +103,7 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = null;
                 return true;
             })
@@ -123,7 +123,7 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "service": "service.Echo",
                   "method": "Invalid",
@@ -135,7 +135,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;
             })
@@ -143,7 +143,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

@@ -23,7 +23,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');
         }
 
@@ -48,11 +49,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');
         }
     }
@@ -79,7 +82,8 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "service": "service.Echo",
                   "method": "Ping",
@@ -91,7 +95,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());
@@ -103,7 +108,8 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = null;
                 return true;
             })
@@ -123,7 +129,8 @@ 
         $msg->setMsg('hello');
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "service": "service.Echo",
                   "method": "Invalid",
@@ -135,7 +142,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;
             })
@@ -143,7 +151,8 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = null;
                 return true;
             })