spiral / framework

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

src/Bootloader/Http/WebsocketsBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             'authorizeTopics' => []
         ]);
 
-        if ($env->get('RR_BROADCAST_PATH', null) !== null) {
+        if ($env->get('RR_BROADCAST_PATH', null) !== null){
             $http->addMiddleware(WebsocketsMiddleware::class);
         }
     }

Braces +2 added lines, -1 removed lines

@@ -53,7 +53,8 @@
             '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 +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
 
     public function testAllowServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function (){
             return true;
         });
 
@@ -50,7 +50,7 @@ 
 
     public function testDenyServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function (){
             return false;
         });
 
@@ -62,7 +62,7 @@ 
 
     public function testServerAccessWithDependency(): void
     {
-        $this->init(static function (ServerRequestInterface $request) {
+        $this->init(static function (ServerRequestInterface $request){
             return $request instanceof ServerRequestInterface;
         });
 
@@ -124,7 +124,7 @@ 
 
     public function testTopicAccessOK(): void
     {
-        $this->init(null, function () {
+        $this->init(null, function (){
             return true;
         });
 
@@ -136,7 +136,7 @@ 
 
     public function testTopicWildcardAccessFail(): void
     {
-        $this->init(null, function () {
+        $this->init(null, function (){
             return true;
         });
 
@@ -151,7 +151,7 @@ 
         $this->init(
             null,
             null,
-            function () {
+            function (){
                 return true;
             }
         );
@@ -167,7 +167,7 @@ 
         $this->init(
             null,
             null,
-            function ($id) {
+            function ($id){
                 return $id === '1';
             }
         );
@@ -183,7 +183,7 @@ 
         $this->init(
             null,
             null,
-            function ($id) {
+            function ($id){
                 return $id === '1';
             }
         );
@@ -204,7 +204,7 @@ 
             'CYCLE_AUTH'                 => true,
             'RR_BROADCAST_PATH'          => '/ws/',
             'WS_SERVER_CALLBACK'         => null,
-            'WS_TOPIC_CALLBACK'          => function (AuthContextInterface $authContext) {
+            'WS_TOPIC_CALLBACK'          => function (AuthContextInterface $authContext){
                 return $authContext->getToken() !== null;
             },
             'WS_TOPIC_WILDCARD_CALLBACK' => null,

Braces +18 added lines, -9 removed lines

@@ -38,7 +38,8 @@ 
 
     public function testAllowServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function ()
+        {
             return true;
         });
 
@@ -50,7 +51,8 @@ 
 
     public function testDenyServerAccess(): void
     {
-        $this->init(static function () {
+        $this->init(static function ()
+        {
             return false;
         });
 
@@ -62,7 +64,8 @@ 
 
     public function testServerAccessWithDependency(): void
     {
-        $this->init(static function (ServerRequestInterface $request) {
+        $this->init(static function (ServerRequestInterface $request)
+        {
             return $request instanceof ServerRequestInterface;
         });
 
@@ -124,7 +127,8 @@ 
 
     public function testTopicAccessOK(): void
     {
-        $this->init(null, function () {
+        $this->init(null, function ()
+        {
             return true;
         });
 
@@ -136,7 +140,8 @@ 
 
     public function testTopicWildcardAccessFail(): void
     {
-        $this->init(null, function () {
+        $this->init(null, function ()
+        {
             return true;
         });
 
@@ -151,7 +156,8 @@ 
         $this->init(
             null,
             null,
-            function () {
+            function ()
+            {
                 return true;
             }
         );
@@ -167,7 +173,8 @@ 
         $this->init(
             null,
             null,
-            function ($id) {
+            function ($id)
+            {
                 return $id === '1';
             }
         );
@@ -183,7 +190,8 @@ 
         $this->init(
             null,
             null,
-            function ($id) {
+            function ($id)
+            {
                 return $id === '1';
             }
         );
@@ -204,7 +212,8 @@ 
             'CYCLE_AUTH'                 => true,
             'RR_BROADCAST_PATH'          => '/ws/',
             'WS_SERVER_CALLBACK'         => null,
-            'WS_TOPIC_CALLBACK'          => function (AuthContextInterface $authContext) {
+            'WS_TOPIC_CALLBACK'          => function (AuthContextInterface $authContext)
+            {
                 return $authContext->getToken() !== null;
             },
             'WS_TOPIC_WILDCARD_CALLBACK' => null,

tests/Framework/HttpTest.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v){
             $r = $r->withAttribute($k, $v);
         }
 
@@ -86,7 +86,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

@@ -45,7 +45,8 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v)
+        {
             $r = $r->withAttribute($k, $v);
         }
 
@@ -86,7 +87,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], ';')));
         }

src/Broadcast/Middleware/WebsocketsMiddleware.php

Spacing +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
         ScopeInterface $scope,
         ResolverInterface $resolver,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->config = $config;
         $this->scope = $scope;
         $this->resolver = $resolver;
@@ -67,13 +67,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);
             }
 
@@ -81,10 +81,10 @@ 
         }
 
         // topic authorization
-        if (is_string($request->getAttribute('ws:joinTopics', null))) {
+        if (is_string($request->getAttribute('ws:joinTopics', null))){
             $topics = explode(',', $request->getAttribute('ws:joinTopics'));
-            foreach ($topics as $topic) {
-                if (!$this->authorizeTopic($request, $topic)) {
+            foreach ($topics as $topic){
+                if (!$this->authorizeTopic($request, $topic)){
                     return $this->responseFactory->createResponse(403);
                 }
             }
@@ -104,7 +104,7 @@ 
     private function authorizeServer(ServerRequestInterface $request): bool
     {
         $callback = $this->config->getServerCallback();
-        if ($callback === null) {
+        if ($callback === null){
             return true;
         }
 
@@ -122,7 +122,7 @@ 
     {
         $parameters = [];
         $callback = $this->config->findTopicCallback($topic, $parameters);
-        if ($callback === null) {
+        if ($callback === null){
             return false;
         }
 
@@ -141,7 +141,7 @@ 
     {
         /** @var \ReflectionFunctionAbstract $reflection */
         $reflection = null;
-        switch (true) {
+        switch (true){
             case $callback instanceof \Closure || is_string($callback):
                 $reflection = new \ReflectionFunction($callback);
                 break;

Braces +20 added lines, -10 removed lines

@@ -67,13 +67,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);
             }
 
@@ -81,10 +84,13 @@ 
         }
 
         // topic authorization
-        if (is_string($request->getAttribute('ws:joinTopics', null))) {
+        if (is_string($request->getAttribute('ws:joinTopics', null)))
+        {
             $topics = explode(',', $request->getAttribute('ws:joinTopics'));
-            foreach ($topics as $topic) {
-                if (!$this->authorizeTopic($request, $topic)) {
+            foreach ($topics as $topic)
+            {
+                if (!$this->authorizeTopic($request, $topic))
+                {
                     return $this->responseFactory->createResponse(403);
                 }
             }
@@ -104,7 +110,8 @@ 
     private function authorizeServer(ServerRequestInterface $request): bool
     {
         $callback = $this->config->getServerCallback();
-        if ($callback === null) {
+        if ($callback === null)
+        {
             return true;
         }
 
@@ -122,7 +129,8 @@ 
     {
         $parameters = [];
         $callback = $this->config->findTopicCallback($topic, $parameters);
-        if ($callback === null) {
+        if ($callback === null)
+        {
             return false;
         }
 
@@ -141,7 +149,8 @@ 
     {
         /** @var \ReflectionFunctionAbstract $reflection */
         $reflection = null;
-        switch (true) {
+        switch (true)
+        {
             case $callback instanceof \Closure || is_string($callback):
                 $reflection = new \ReflectionFunction($callback);
                 break;
@@ -159,7 +168,8 @@ 
             [
                 ServerRequestInterface::class => $request
             ],
-            function () use ($reflection, $parameters, $callback) {
+            function () use ($reflection, $parameters, $callback)
+            {
                 return call_user_func_array(
                     $callback,
                     $this->resolver->resolveArguments($reflection, $parameters)

src/Broadcast/Config/WebsocketsConfig.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
     {
         parent::__construct($config);
 
-        foreach ($config['authorizeTopics'] as $topic => $callback) {
+        foreach ($config['authorizeTopics'] as $topic => $callback){
             $this->patterns[$this->compilePattern($topic)] = $callback;
         }
     }
@@ -62,8 +62,8 @@ 
      */
     public function findTopicCallback(string $topic, array &$matches): ?callable
     {
-        foreach ($this->patterns as $pattern => $callback) {
-            if (preg_match($pattern, $topic, $matches)) {
+        foreach ($this->patterns as $pattern => $callback){
+            if (preg_match($pattern, $topic, $matches)){
                 return $callback;
             }
         }
@@ -78,13 +78,13 @@ 
     private function compilePattern(string $topic): string
     {
         $replaces = [];
-        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)) {
+        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)){
             $variables = array_combine($matches[1], $matches[2]);
-            foreach ($variables as $key => $segment) {
-                $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)';
+            foreach ($variables as $key => $segment){
+                $replaces['{'.$key.'}'] = '(?P<'.$key.'>[^\/\.]+)';
             }
         }
 
-        return '/^' . strtr($topic, $replaces + ['/' => '\\/', '[' => '(?:', ']' => ')?', '.' => '\.']) . '$/iu';
+        return '/^'.strtr($topic, $replaces + ['/' => '\\/', '[' => '(?:', ']' => ')?', '.' => '\.']).'$/iu';
     }
 }

Braces +10 added lines, -5 removed lines

@@ -34,7 +34,8 @@ 
     {
         parent::__construct($config);
 
-        foreach ($config['authorizeTopics'] as $topic => $callback) {
+        foreach ($config['authorizeTopics'] as $topic => $callback)
+        {
             $this->patterns[$this->compilePattern($topic)] = $callback;
         }
     }
@@ -62,8 +63,10 @@ 
      */
     public function findTopicCallback(string $topic, array &$matches): ?callable
     {
-        foreach ($this->patterns as $pattern => $callback) {
-            if (preg_match($pattern, $topic, $matches)) {
+        foreach ($this->patterns as $pattern => $callback)
+        {
+            if (preg_match($pattern, $topic, $matches))
+            {
                 return $callback;
             }
         }
@@ -78,9 +81,11 @@ 
     private function compilePattern(string $topic): string
     {
         $replaces = [];
-        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)) {
+        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches))
+        {
             $variables = array_combine($matches[1], $matches[2]);
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment)
+            {
                 $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)';
             }
         }

tests/app/src/TestApp.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         // HTTP extensions
         Bootloader\Http\DiactorosBootloader::class,
         Bootloader\Http\RouterBootloader::class,
-       // Bootloader\Http\ErrorHandlerBootloader::class,
+        // Bootloader\Http\ErrorHandlerBootloader::class,
         Bootloader\Http\JsonPayloadsBootloader::class,
         Bootloader\Http\CookiesBootloader::class,
         Bootloader\Http\SessionBootloader::class,

tests/app/src/Bootloader/AuthBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         EnvironmentInterface $env,
         BootloadManager $bootloadManager
     ): void {
-        if ($env->get('CYCLE_AUTH')) {
+        if ($env->get('CYCLE_AUTH')){
             $bootloadManager->bootload([CycleTokensBootloader::class]);
             return;
         }

Braces +2 added lines, -1 removed lines

@@ -23,7 +23,8 @@
         EnvironmentInterface $env,
         BootloadManager $bootloadManager
     ): void {
-        if ($env->get('CYCLE_AUTH')) {
+        if ($env->get('CYCLE_AUTH'))
+        {
             $bootloadManager->bootload([CycleTokensBootloader::class]);
             return;
         }