spiral / framework

src/Broadcast/Middleware/WebsocketsMiddleware.php

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
         ScopeInterface $scope,
         ResolverInterface $resolver,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->config = $config;
         $this->scope = $scope;
         $this->resolver = $resolver;
@@ -66,13 +66,13 @@ 
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if ($request->getUri()->getPath() !== $this->config->getPath()) {
+        if ($request->getUri()->getPath() !== $this->config->getPath()){
             return $handler->handle($request);
         }
 
         // server authorization
-        if ($request->getAttribute('ws:joinServer', null) !== null) {
-            if (!$this->authorizeServer($request)) {
+        if ($request->getAttribute('ws:joinServer', null) !== null){
+            if (!$this->authorizeServer($request)){
                 return $this->responseFactory->createResponse(403);
             }
 
@@ -80,9 +80,9 @@ 
         }
 
         // topic authorization
-        if (is_string($request->getAttribute('ws:joinTopics', null))) {
+        if (is_string($request->getAttribute('ws:joinTopics', null))){
             $topics = explode(',', $request->getAttribute('ws:joinTopics'));
-            if (!$this->authorizeTopics($request, $topics)) {
+            if (!$this->authorizeTopics($request, $topics)){
                 return $this->responseFactory->createResponse(403);
             }
 
@@ -101,7 +101,7 @@ 
     private function authorizeServer(ServerRequestInterface $request): bool
     {
         $callback = $this->config->getServerCallback();
-        if ($callback === null) {
+        if ($callback === null){
             return true;
         }
 
@@ -115,7 +115,7 @@ 
      */
     private function authorizeTopics(ServerRequestInterface $request, array $topics): bool
     {
-        foreach ($topics as $topic) {
+        foreach ($topics as $topic){
             // todo: match
             return false;
         }
@@ -133,7 +133,7 @@ 
     {
         /** @var \ReflectionFunctionAbstract $call */
         $call = null;
-        switch (true) {
+        switch (true){
             case $callback instanceof \Closure || is_string($callback):
                 $call = new \ReflectionFunction($callback);
                 break;

Braces +18 added lines, -9 removed lines

@@ -66,13 +66,16 @@ 
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if ($request->getUri()->getPath() !== $this->config->getPath()) {
+        if ($request->getUri()->getPath() !== $this->config->getPath())
+        {
             return $handler->handle($request);
         }
 
         // server authorization
-        if ($request->getAttribute('ws:joinServer', null) !== null) {
-            if (!$this->authorizeServer($request)) {
+        if ($request->getAttribute('ws:joinServer', null) !== null)
+        {
+            if (!$this->authorizeServer($request))
+            {
                 return $this->responseFactory->createResponse(403);
             }
 
@@ -80,9 +83,11 @@ 
         }
 
         // topic authorization
-        if (is_string($request->getAttribute('ws:joinTopics', null))) {
+        if (is_string($request->getAttribute('ws:joinTopics', null)))
+        {
             $topics = explode(',', $request->getAttribute('ws:joinTopics'));
-            if (!$this->authorizeTopics($request, $topics)) {
+            if (!$this->authorizeTopics($request, $topics))
+            {
                 return $this->responseFactory->createResponse(403);
             }
 
@@ -101,7 +106,8 @@ 
     private function authorizeServer(ServerRequestInterface $request): bool
     {
         $callback = $this->config->getServerCallback();
-        if ($callback === null) {
+        if ($callback === null)
+        {
             return true;
         }
 
@@ -115,7 +121,8 @@ 
      */
     private function authorizeTopics(ServerRequestInterface $request, array $topics): bool
     {
-        foreach ($topics as $topic) {
+        foreach ($topics as $topic)
+        {
             // todo: match
             return false;
         }
@@ -133,7 +140,8 @@ 
     {
         /** @var \ReflectionFunctionAbstract $call */
         $call = null;
-        switch (true) {
+        switch (true)
+        {
             case $callback instanceof \Closure || is_string($callback):
                 $call = new \ReflectionFunction($callback);
                 break;
@@ -151,7 +159,8 @@ 
             [
                 ServerRequestInterface::class => $request
             ],
-            function () use ($call, $parameters) {
+            function () use ($call, $parameters)
+            {
                 $arguments = $this->resolver->resolveArguments($call, $parameters);
                 return $call->invokeArgs($arguments);
             }

src/Bootloader/Http/WebsocketsBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -49,13 +49,13 @@
     {
         $this->config->setDefaults('websockets', [
             'path'            => $env->get('RR_BROADCAST_PATH', null),
-            'authorizeServer' => static function () {
+            'authorizeServer' => static function (){
                 return true;
             },
             'authorizeTopics' => []
         ]);
 
-        if ($env->get('RR_BROADCAST_PATH', null) !== null) {
+        if ($env->get('RR_BROADCAST_PATH', null) !== null){
             $http->addMiddleware(WebsocketsMiddleware::class);
         }
     }

Braces +4 added lines, -2 removed lines

@@ -49,13 +49,15 @@
     {
         $this->config->setDefaults('websockets', [
             'path'            => $env->get('RR_BROADCAST_PATH', null),
-            'authorizeServer' => static function () {
+            'authorizeServer' => static function ()
+            {
                 return true;
             },
             'authorizeTopics' => []
         ]);
 
-        if ($env->get('RR_BROADCAST_PATH', null) !== null) {
+        if ($env->get('RR_BROADCAST_PATH', null) !== null)
+        {
             $http->addMiddleware(WebsocketsMiddleware::class);
         }
     }

tests/Framework/Http/WebsocketsTest.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 
     public function testAllowServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function (){
             return true;
         });
 
@@ -47,7 +47,7 @@ 
 
     public function testDenyServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function (){
             return false;
         });
 
@@ -59,7 +59,7 @@ 
 
     public function testServerAccessWithDependency(): void
     {
-        $this->init(static function (ServerRequestInterface $request) {
+        $this->init(static function (ServerRequestInterface $request){
             return $request instanceof ServerRequestInterface;
         });
 

Braces +6 added lines, -3 removed lines

@@ -35,7 +35,8 @@ 
 
     public function testAllowServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function ()
+        {
             return true;
         });
 
@@ -47,7 +48,8 @@ 
 
     public function testDenyServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function ()
+        {
             return false;
         });
 
@@ -59,7 +61,8 @@ 
 
     public function testServerAccessWithDependency(): void
     {
-        $this->init(static function (ServerRequestInterface $request) {
+        $this->init(static function (ServerRequestInterface $request)
+        {
             return $request instanceof ServerRequestInterface;
         });
 

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

tests/Framework/HttpTest.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
         array $attributes
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], [], []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v){
             $r = $r->withAttribute($k, $v);
         }
 
@@ -85,7 +85,7 @@ 
     protected function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line){
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

Braces +4 added lines, -2 removed lines

@@ -44,7 +44,8 @@ 
         array $attributes
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], [], []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v)
+        {
             $r = $r->withAttribute($k, $v);
         }
 
@@ -85,7 +86,8 @@ 
     protected function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line)
+        {
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

tests/app/src/Bootloader/WSBootloader.php

Spacing +3 added lines, -3 removed lines

@@ -21,17 +21,17 @@
 
     public function boot(WebsocketsBootloader $ws, EnvironmentInterface $env): void
     {
-        if ($env->get('RR_BROADCAST_PATH') === null) {
+        if ($env->get('RR_BROADCAST_PATH') === null){
             return;
         }
 
         $ws->setServerCallback($env->get('WS_SERVER_CALLBACK'));
 
-        if ($env->get('WS_TOPIC_CALLBACK') !== null) {
+        if ($env->get('WS_TOPIC_CALLBACK') !== null){
             $ws->addTopicCallback('topic', $env->get('WS_TOPIC_CALLBACK'));
         }
 
-        if ($env->get('WS_TOPIC_WILDCARD_CALLBACK') !== null) {
+        if ($env->get('WS_TOPIC_WILDCARD_CALLBACK') !== null){
             $ws->addTopicCallback('wildcard.{id}', $env->get('WS_TOPIC_WILDCARD_CALLBACK'));
         }
     }

Braces +6 added lines, -3 removed lines

@@ -21,17 +21,20 @@
 
     public function boot(WebsocketsBootloader $ws, EnvironmentInterface $env): void
     {
-        if ($env->get('RR_BROADCAST_PATH') === null) {
+        if ($env->get('RR_BROADCAST_PATH') === null)
+        {
             return;
         }
 
         $ws->setServerCallback($env->get('WS_SERVER_CALLBACK'));
 
-        if ($env->get('WS_TOPIC_CALLBACK') !== null) {
+        if ($env->get('WS_TOPIC_CALLBACK') !== null)
+        {
             $ws->addTopicCallback('topic', $env->get('WS_TOPIC_CALLBACK'));
         }
 
-        if ($env->get('WS_TOPIC_WILDCARD_CALLBACK') !== null) {
+        if ($env->get('WS_TOPIC_WILDCARD_CALLBACK') !== null)
+        {
             $ws->addTopicCallback('wildcard.{id}', $env->get('WS_TOPIC_WILDCARD_CALLBACK'));
         }
     }