spiral / framework

src/Framework/Http/RrDispatcher.php

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
         PSR7WorkerInterface $worker,
         ContainerInterface $container,
         FinalizerInterface $finalizer
-    ) {
+    ){
         $this->env = $env;
         $this->worker = $worker;
         $this->container = $container;
@@ -81,14 +81,14 @@ 
         /** @var Http $http */
         $http = $this->container->get(Http::class);
 
-        while ($request = $this->worker->waitRequest()) {
-            try {
+        while ($request = $this->worker->waitRequest()){
+            try{
                 $response = $http->handle($request);
 
                 $this->worker->respond($response);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 $this->worker->respond($this->errorToResponse($e));
-            } finally {
+            }finally{
                 $this->finalizer->finalize(false);
             }
         }
@@ -102,7 +102,7 @@ 
     {
         $handler = new HtmlHandler();
 
-        try {
+        try{
             /** @var SnapshotInterface $snapshot */
             $snapshot = $this->container->get(SnapshotterInterface::class)->register($e);
             \file_put_contents('php://stderr', $snapshot->getMessage());
@@ -110,10 +110,10 @@ 
             // on demand
             $state = $this->container->get(StateInterface::class);
 
-            if ($state !== null) {
+            if ($state !== null){
                 $handler = $handler->withState($state);
             }
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }catch (\Throwable | ContainerExceptionInterface $se){
             \file_put_contents('php://stderr', (string)$e);
         }
 

Braces +17 added lines, -7 removed lines

@@ -81,14 +81,20 @@ 
         /** @var Http $http */
         $http = $this->container->get(Http::class);
 
-        while ($request = $this->worker->waitRequest()) {
-            try {
+        while ($request = $this->worker->waitRequest())
+        {
+            try
+            {
                 $response = $http->handle($request);
 
                 $this->worker->respond($response);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 $this->worker->respond($this->errorToResponse($e));
-            } finally {
+            }
+            finally
+            {
                 $this->finalizer->finalize(false);
             }
         }
@@ -102,7 +108,8 @@ 
     {
         $handler = new HtmlHandler();
 
-        try {
+        try
+        {
             /** @var SnapshotInterface $snapshot */
             $snapshot = $this->container->get(SnapshotterInterface::class)->register($e);
             \file_put_contents('php://stderr', $snapshot->getMessage());
@@ -110,10 +117,13 @@ 
             // on demand
             $state = $this->container->get(StateInterface::class);
 
-            if ($state !== null) {
+            if ($state !== null)
+            {
                 $handler = $handler->withState($state);
             }
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }
+        catch (\Throwable | ContainerExceptionInterface $se)
+        {
             \file_put_contents('php://stderr', (string)$e);
         }
 

src/Framework/Debug/StateCollector/EnvironmentCollector.php

Spacing +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
     {
         $state->setTag('php', phpversion());
 
-        if ($this->container->has(DispatcherInterface::class)) {
-            switch (get_class($this->container->get(DispatcherInterface::class))) {
+        if ($this->container->has(DispatcherInterface::class)){
+            switch (get_class($this->container->get(DispatcherInterface::class))){
                 case LegacyRrDispatcher::class:
                     $state->setTag('dispatcher', 'roadrunner');
                     break;

Braces +4 added lines, -2 removed lines

@@ -43,8 +43,10 @@
     {
         $state->setTag('php', phpversion());
 
-        if ($this->container->has(DispatcherInterface::class)) {
-            switch (get_class($this->container->get(DispatcherInterface::class))) {
+        if ($this->container->has(DispatcherInterface::class))
+        {
+            switch (get_class($this->container->get(DispatcherInterface::class)))
+            {
                 case LegacyRrDispatcher::class:
                     $state->setTag('dispatcher', 'roadrunner');
                     break;

src/Framework/Bootloader/Server/LegacyRoadRunnerBootloader.php

Spacing +12 added lines, -12 removed lines

@@ -39,15 +39,15 @@ 
      */
     public function boot(Container $container)
     {
-        $container->bindSingleton(RPC::class, function (EnvironmentInterface $env) {
+        $container->bindSingleton(RPC::class, function (EnvironmentInterface $env){
             return $this->rpc($env);
         });
 
-        $container->bindSingleton(Worker::class, function (EnvironmentInterface $env) {
+        $container->bindSingleton(Worker::class, function (EnvironmentInterface $env){
             return $this->worker($env);
         });
 
-        $container->bindSingleton(MetricsInterface::class, function (RPC $rpc) {
+        $container->bindSingleton(MetricsInterface::class, function (RPC $rpc){
             return new Metrics($rpc);
         });
     }
@@ -60,21 +60,21 @@ 
     {
         $conn = $env->get('RR_RPC', self::RPC_DEFAULT);
 
-        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) {
+        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)){
             throw new BootException(
                 "Unable to configure RPC connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if (!in_array($parts[1], ['tcp', 'unix'])) {
+        if (!in_array($parts[1], ['tcp', 'unix'])){
             throw new BootException(
                 "Unable to configure RPC connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if ($parts[1] == 'unix') {
+        if ($parts[1] == 'unix'){
             $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX);
-        } else {
+        }else{
             $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP);
         }
 
@@ -89,25 +89,25 @@ 
     {
         $conn = $env->get('RR_RELAY', self::WORKER_DEFAULT);
 
-        if ($conn === 'pipes' || empty($conn)) {
+        if ($conn === 'pipes' || empty($conn)){
             return new Worker(new StreamRelay(STDIN, STDOUT));
         }
 
-        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) {
+        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)){
             throw new BootException(
                 "Unable to configure Worker connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if (!in_array($parts[1], ['tcp', 'unix'])) {
+        if (!in_array($parts[1], ['tcp', 'unix'])){
             throw new BootException(
                 "Unable to configure Worker connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if ($parts[1] == 'unix') {
+        if ($parts[1] == 'unix'){
             $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX);
-        } else {
+        }else{
             $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP);
         }
 

Braces +26 added lines, -12 removed lines

@@ -39,15 +39,18 @@ 
      */
     public function boot(Container $container)
     {
-        $container->bindSingleton(RPC::class, function (EnvironmentInterface $env) {
+        $container->bindSingleton(RPC::class, function (EnvironmentInterface $env)
+        {
             return $this->rpc($env);
         });
 
-        $container->bindSingleton(Worker::class, function (EnvironmentInterface $env) {
+        $container->bindSingleton(Worker::class, function (EnvironmentInterface $env)
+        {
             return $this->worker($env);
         });
 
-        $container->bindSingleton(MetricsInterface::class, function (RPC $rpc) {
+        $container->bindSingleton(MetricsInterface::class, function (RPC $rpc)
+        {
             return new Metrics($rpc);
         });
     }
@@ -60,21 +63,26 @@ 
     {
         $conn = $env->get('RR_RPC', self::RPC_DEFAULT);
 
-        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) {
+        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts))
+        {
             throw new BootException(
                 "Unable to configure RPC connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if (!in_array($parts[1], ['tcp', 'unix'])) {
+        if (!in_array($parts[1], ['tcp', 'unix']))
+        {
             throw new BootException(
                 "Unable to configure RPC connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if ($parts[1] == 'unix') {
+        if ($parts[1] == 'unix')
+        {
             $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX);
-        } else {
+        }
+        else
+        {
             $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP);
         }
 
@@ -89,25 +97,31 @@ 
     {
         $conn = $env->get('RR_RELAY', self::WORKER_DEFAULT);
 
-        if ($conn === 'pipes' || empty($conn)) {
+        if ($conn === 'pipes' || empty($conn))
+        {
             return new Worker(new StreamRelay(STDIN, STDOUT));
         }
 
-        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) {
+        if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts))
+        {
             throw new BootException(
                 "Unable to configure Worker connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if (!in_array($parts[1], ['tcp', 'unix'])) {
+        if (!in_array($parts[1], ['tcp', 'unix']))
+        {
             throw new BootException(
                 "Unable to configure Worker connection, invalid DSN given `{$conn}`."
             );
         }
 
-        if ($parts[1] == 'unix') {
+        if ($parts[1] == 'unix')
+        {
             $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX);
-        } else {
+        }
+        else
+        {
             $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP);
         }
 

src/Framework/Bootloader/Http/HttpBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -76,11 +76,11 @@
 
         $kernel->addDispatcher($factory->make(SapiDispatcher::class));
 
-        if (class_exists(PSR7Client::class)) {
+        if (class_exists(PSR7Client::class)){
             $kernel->addDispatcher($factory->make(LegacyRrDispatcher::class));
         }
 
-        if (class_exists(PSR7Worker::class)) {
+        if (class_exists(PSR7Worker::class)){
             $kernel->addDispatcher($factory->make(RrDispatcher::class));
         }
     }

Braces +4 added lines, -2 removed lines

@@ -76,11 +76,13 @@
 
         $kernel->addDispatcher($factory->make(SapiDispatcher::class));
 
-        if (class_exists(PSR7Client::class)) {
+        if (class_exists(PSR7Client::class))
+        {
             $kernel->addDispatcher($factory->make(LegacyRrDispatcher::class));
         }
 
-        if (class_exists(PSR7Worker::class)) {
+        if (class_exists(PSR7Worker::class))
+        {
             $kernel->addDispatcher($factory->make(RrDispatcher::class));
         }
     }

src/Framework/Bootloader/ServerBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     private function isLegacy(): bool
     {
-        if (\class_exists(InstalledVersions::class)) {
+        if (\class_exists(InstalledVersions::class)){
             $version = InstalledVersions::getVersion('spiral/roadrunner');
 
             return \str_starts_with($version, '1.');

Braces +2 added lines, -1 removed lines

@@ -42,7 +42,8 @@
      */
     private function isLegacy(): bool
     {
-        if (\class_exists(InstalledVersions::class)) {
+        if (\class_exists(InstalledVersions::class))
+        {
             $version = InstalledVersions::getVersion('spiral/roadrunner');
 
             return \str_starts_with($version, '1.');

src/Framework/Bootloader/Jobs/JobsBootloader.php

Spacing +4 added lines, -4 removed lines

@@ -47,12 +47,12 @@
     {
         $kernel->addDispatcher($jobs);
 
-        if (\class_exists(LegacyRPC::class)) {
-            $container->bindSingleton(QueueInterface::class, function (LegacyRPC $rpc, JobRegistry $registry) {
+        if (\class_exists(LegacyRPC::class)){
+            $container->bindSingleton(QueueInterface::class, function (LegacyRPC $rpc, JobRegistry $registry){
                 return new JobQueue($rpc, $registry);
             });
-        } else {
-            $container->bindSingleton(QueueInterface::class, function (RPC $rpc, JobRegistry $registry) {
+        }else{
+            $container->bindSingleton(QueueInterface::class, function (RPC $rpc, JobRegistry $registry){
                 return new JobQueue($rpc, $registry);
             });
         }

Braces +9 added lines, -4 removed lines

@@ -47,12 +47,17 @@
     {
         $kernel->addDispatcher($jobs);
 
-        if (\class_exists(LegacyRPC::class)) {
-            $container->bindSingleton(QueueInterface::class, function (LegacyRPC $rpc, JobRegistry $registry) {
+        if (\class_exists(LegacyRPC::class))
+        {
+            $container->bindSingleton(QueueInterface::class, function (LegacyRPC $rpc, JobRegistry $registry)
+            {
                 return new JobQueue($rpc, $registry);
             });
-        } else {
-            $container->bindSingleton(QueueInterface::class, function (RPC $rpc, JobRegistry $registry) {
+        }
+        else
+        {
+            $container->bindSingleton(QueueInterface::class, function (RPC $rpc, JobRegistry $registry)
+            {
                 return new JobQueue($rpc, $registry);
             });
         }

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->assertStringContainsString('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(LegacyRrDispatcher::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->assertStringContainsString('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(LegacyRrDispatcher::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);