spiral / framework

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());
             }
         }

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/Http/RrDispacher.php

Spacing +8 added lines, -8 removed lines

@@ -49,7 +49,7 @@ 
         FinalizerInterface $finalizer,
         ContainerInterface $container,
         FactoryInterface $factory
-    ) {
+    ){
         $this->env = $env;
         $this->finalizer = $finalizer;
         $this->container = $container;
@@ -75,12 +75,12 @@ 
 
         /** @var Http $http */
         $http = $this->container->get(Http::class);
-        while ($request = $client->acceptRequest()) {
-            try {
+        while ($request = $client->acceptRequest()){
+            try{
                 $client->respond($http->handle($request));
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 $this->handleException($client, $e);
-            } finally {
+            }finally{
                 $this->finalizer->finalize(false);
             }
         }
@@ -94,17 +94,17 @@ 
     {
         $handler = new HtmlHandler();
 
-        try {
+        try{
             /** @var SnapshotInterface $snapshot */
             $snapshot = $this->container->get(SnapshotterInterface::class)->register($e);
             error_log($snapshot->getMessage());
 
             // 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){
             error_log((string)$e);
         }
 

Braces +17 added lines, -7 removed lines

@@ -75,12 +75,18 @@ 
 
         /** @var Http $http */
         $http = $this->container->get(Http::class);
-        while ($request = $client->acceptRequest()) {
-            try {
+        while ($request = $client->acceptRequest())
+        {
+            try
+            {
                 $client->respond($http->handle($request));
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 $this->handleException($client, $e);
-            } finally {
+            }
+            finally
+            {
                 $this->finalizer->finalize(false);
             }
         }
@@ -94,17 +100,21 @@ 
     {
         $handler = new HtmlHandler();
 
-        try {
+        try
+        {
             /** @var SnapshotInterface $snapshot */
             $snapshot = $this->container->get(SnapshotterInterface::class)->register($e);
             error_log($snapshot->getMessage());
 
             // 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)
+        {
             error_log((string)$e);
         }
 

src/Http/SapiDispatcher.php

Spacing +6 added lines, -6 removed lines

@@ -62,12 +62,12 @@ 
         $http = $this->container->get(Http::class);
         $emitter = $emitter ?? $this->container->get(EmitterInterface::class);
 
-        try {
+        try{
             $response = $http->handle($this->initRequest());
             $emitter->emit($response);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $this->handleException($emitter, $e);
-        } finally {
+        }finally{
             $this->finalizer->finalize(false);
         }
     }
@@ -88,16 +88,16 @@ 
     {
         $handler = new HtmlHandler();
 
-        try {
+        try{
             /** @var SnapshotInterface $snapshot */
             $this->container->get(SnapshotterInterface::class)->register($e);
 
             // 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){
             // nothing to report
         }
 

Braces +15 added lines, -6 removed lines

@@ -62,12 +62,17 @@ 
         $http = $this->container->get(Http::class);
         $emitter = $emitter ?? $this->container->get(EmitterInterface::class);
 
-        try {
+        try
+        {
             $response = $http->handle($this->initRequest());
             $emitter->emit($response);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $this->handleException($emitter, $e);
-        } finally {
+        }
+        finally
+        {
             $this->finalizer->finalize(false);
         }
     }
@@ -88,16 +93,20 @@ 
     {
         $handler = new HtmlHandler();
 
-        try {
+        try
+        {
             /** @var SnapshotInterface $snapshot */
             $this->container->get(SnapshotterInterface::class)->register($e);
 
             // 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)
+        {
             // nothing to report
         }
 

src/Debug/StateCollector/EnvironmentCollector.php

Spacing +2 added lines, -2 removed lines

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

Braces +4 added lines, -2 removed lines

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

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/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/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;
             })