spiral / framework

src/GRPC/ProtoCompiler.php

Spacing +5 added lines, -5 removed lines

@@ -58,14 +58,14 @@ 
 
         $output = trim(join("\n", $output), "\n ,");
 
-        if ($output !== '') {
+        if ($output !== ''){
             $this->files->deleteDirectory($tmpDir);
             throw new CompileException($output);
         }
 
         // copying files (using relative path and namespace)
         $result = [];
-        foreach ($this->files->getFiles($tmpDir) as $file) {
+        foreach ($this->files->getFiles($tmpDir) as $file){
             $result[] = $this->copy($tmpDir, $file);
         }
 
@@ -82,11 +82,11 @@ 
     private function copy(string $tmpDir, string $file): string
     {
         $source = ltrim($this->files->relativePath($file, $tmpDir), '\\/');
-        if (strpos($source, $this->baseNamespace) === 0) {
+        if (strpos($source, $this->baseNamespace) === 0){
             $source = ltrim(substr($source, strlen($this->baseNamespace)), '\\/');
         }
 
-        $target = $this->files->normalizePath($this->basePath . '/' . $source);
+        $target = $this->files->normalizePath($this->basePath.'/'.$source);
 
         $this->files->ensureDirectory(dirname($target));
         $this->files->copy($file, $target);
@@ -99,7 +99,7 @@ 
      */
     private function tmpDir(): string
     {
-        $directory = sys_get_temp_dir() . '/' . spl_object_hash($this);
+        $directory = sys_get_temp_dir().'/'.spl_object_hash($this);
         $this->files->ensureDirectory($directory);
 
         return $this->files->normalizePath($directory, true);

Braces +6 added lines, -3 removed lines

@@ -58,14 +58,16 @@ 
 
         $output = trim(join("\n", $output), "\n ,");
 
-        if ($output !== '') {
+        if ($output !== '')
+        {
             $this->files->deleteDirectory($tmpDir);
             throw new CompileException($output);
         }
 
         // copying files (using relative path and namespace)
         $result = [];
-        foreach ($this->files->getFiles($tmpDir) as $file) {
+        foreach ($this->files->getFiles($tmpDir) as $file)
+        {
             $result[] = $this->copy($tmpDir, $file);
         }
 
@@ -82,7 +84,8 @@ 
     private function copy(string $tmpDir, string $file): string
     {
         $source = ltrim($this->files->relativePath($file, $tmpDir), '\\/');
-        if (strpos($source, $this->baseNamespace) === 0) {
+        if (strpos($source, $this->baseNamespace) === 0)
+        {
             $source = ltrim(substr($source, strlen($this->baseNamespace)), '\\/');
         }
 

tests/Framework/GRPC/ListTest.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
     public function setUp()
     {
         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');
             return;
         }
@@ -27,7 +27,7 @@ 
         parent::setUp();
 
         $fs = new Files();
-        $this->proto = $fs->normalizePath($this->app->dir('app') . 'proto/service.proto');
+        $this->proto = $fs->normalizePath($this->app->dir('app').'proto/service.proto');
 
         // protoc can't figure relative paths
         $this->proto = str_replace('Framework/../', '', $this->proto);
@@ -39,12 +39,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');
         }
     }
 
@@ -61,7 +61,7 @@ 
             'proto' => $this->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);
 
         $out = $this->runCommandDebug('grpc:services');
 

Braces +6 added lines, -3 removed lines

@@ -19,7 +19,8 @@ 
     public function setUp()
     {
         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');
             return;
         }
@@ -39,11 +40,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');
         }
     }

tests/Framework/GRPC/DispatcherTest.php

Spacing +13 added lines, -13 removed lines

@@ -21,14 +21,14 @@ 
     public function setUp()
     {
         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);
@@ -37,7 +37,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()
@@ -46,12 +46,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');
         }
     }
 
@@ -77,7 +77,7 @@ 
         $msg->setMsg("hello");
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "service": "service.Echo",
                   "method": "Ping"               
@@ -88,7 +88,7 @@ 
         )->andReturn($msg->serializeToString());
 
         $w->shouldReceive('send')->once()->with(
-            \Mockery::on(function ($out) {
+            \Mockery::on(function ($out){
 
                 $msg = new Message();
                 $msg->mergeFromString($out);
@@ -100,7 +100,7 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = null;
                 return true;
             })
@@ -120,7 +120,7 @@ 
         $msg->setMsg("hello");
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "service": "service.Echo",
                   "method": "Invalid"               
@@ -131,7 +131,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;
             })
@@ -139,7 +139,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

@@ -21,7 +21,8 @@ 
     public function setUp()
     {
         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');
         }
 
@@ -46,11 +47,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');
         }
     }
@@ -77,7 +80,8 @@ 
         $msg->setMsg("hello");
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "service": "service.Echo",
                   "method": "Ping"               
@@ -88,7 +92,8 @@ 
         )->andReturn($msg->serializeToString());
 
         $w->shouldReceive('send')->once()->with(
-            \Mockery::on(function ($out) {
+            \Mockery::on(function ($out)
+            {
 
                 $msg = new Message();
                 $msg->mergeFromString($out);
@@ -100,7 +105,8 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = null;
                 return true;
             })
@@ -120,7 +126,8 @@ 
         $msg->setMsg("hello");
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "service": "service.Echo",
                   "method": "Invalid"               
@@ -131,7 +138,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;
             })
@@ -139,7 +147,8 @@ 
 
         // one command only
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = null;
                 return true;
             })

tests/Framework/GRPC/GenerateTest.php

Spacing +9 added lines, -9 removed lines

@@ -32,14 +32,14 @@ 
     public function setUp()
     {
         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();
-        $this->proto = $fs->normalizePath($this->app->dir('app') . 'proto/service.proto');
+        $this->proto = $fs->normalizePath($this->app->dir('app').'proto/service.proto');
 
         // protoc can't figure relative paths
         $this->proto = str_replace('Framework/../', '', $this->proto);
@@ -51,12 +51,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');
         }
     }
 
@@ -84,8 +84,8 @@ 
             'proto' => $this->proto
         ]);
 
-        $this->assertFileExists($this->app->dir('app') . 'src/Service/EchoInterface.php');
-        $this->assertFileExists($this->app->dir('app') . 'src/Service/Message.php');
-        $this->assertFileExists($this->app->dir('app') . 'src/GPBMetadata/Service.php');
+        $this->assertFileExists($this->app->dir('app').'src/Service/EchoInterface.php');
+        $this->assertFileExists($this->app->dir('app').'src/Service/Message.php');
+        $this->assertFileExists($this->app->dir('app').'src/GPBMetadata/Service.php');
     }
 }
\ No newline at end of file

Braces +6 added lines, -3 removed lines

@@ -32,7 +32,8 @@ 
     public function setUp()
     {
         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');
         }
 
@@ -51,11 +52,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');
         }
     }