Merge pull request #16 from spiral/analysis-yrvn3o

Apply fixes from StyleCI
spiral · Jun 28, 2022 · ce8aa38 · ce8aa38
2 parents 7191894 + 77f0e31
commit ce8aa38
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 29 deletions.
diff --git a/src/Config/TcpConfig.php b/src/Config/TcpConfig.php
@@ -13,15 +13,15 @@ final class TcpConfig extends InjectableConfig
     public const CONFIG = 'tcp';
 
     /**
-     * @return array<object>|array<class-string<ServiceInterface>>
+     * @return array<class-string<ServiceInterface>>|array<object>
      */
     public function getServices(): array
     {
         return (array) ($this->config['services'] ?? []);
     }
 
     /**
-     * @return array<object>|array<class-string<CoreInterceptorInterface>>
+     * @return array<class-string<CoreInterceptorInterface>>|array<object>
      */
     public function getInterceptors(): array
     {

diff --git a/src/Console/Command/Cache/ClearCommand.php b/src/Console/Command/Cache/ClearCommand.php
@@ -6,7 +6,6 @@
 
 use Spiral\Cache\CacheStorageProviderInterface;
 use Spiral\Console\Command;
-use Symfony\Component\Console\Input\InputArgument;
 
 final class ClearCommand extends Command
 {

diff --git a/src/Console/Command/GRPC/GenerateCommand.php b/src/Console/Command/GRPC/GenerateCommand.php
@@ -11,11 +11,10 @@
 use Spiral\Files\FilesInterface;
 use Spiral\RoadRunnerBridge\Config\GRPCConfig;
 use Spiral\RoadRunnerBridge\GRPC\ProtoCompiler;
-use Symfony\Component\Console\Input\InputArgument;
 
 final class GenerateCommand extends Command
 {
-    protected const SIGNATURE = 'grpc:generate 
+    protected const SIGNATURE = 'grpc:generate
                                          {path=auto : Base path for generated service code}
                                          {namespace=auto : Base namespace for generated service code}';
     protected const DESCRIPTION = 'Generate GPRC service code using protobuf specification';

diff --git a/src/Console/Command/Queue/PauseCommand.php b/src/Console/Command/Queue/PauseCommand.php
@@ -6,7 +6,6 @@
 
 use Spiral\Console\Command;
 use Spiral\RoadRunner\Jobs\JobsInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 final class PauseCommand extends Command
 {

diff --git a/src/Console/Command/Queue/ResumeCommand.php b/src/Console/Command/Queue/ResumeCommand.php
@@ -6,7 +6,6 @@
 
 use Spiral\Console\Command;
 use Spiral\RoadRunner\Jobs\JobsInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 final class ResumeCommand extends Command
 {

diff --git a/tests/app/config/queue.php b/tests/app/config/queue.php
@@ -48,7 +48,7 @@
                     'connector' => new MemoryCreateInfo('local'),
                     'serializerFormat' => 'serializer',
                     'consume' => true,
-                ]
+                ],
                 // 'amqp' => [
                 //     'connector' => new AMQPCreateInfo('bus', ...),
                 //     // Don't consume jobs for this pipeline on start

diff --git a/tests/src/Bootloader/BroadcastingBootloaderTest.php b/tests/src/Bootloader/BroadcastingBootloaderTest.php
@@ -4,7 +4,6 @@
 
 namespace Spiral\Tests\Bootloader;
 
-use Mockery as m;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Spiral\Goridge\RPC\RPCInterface;
 use Spiral\RoadRunner\Broadcast\Broadcast;

diff --git a/tests/src/Bootloader/GRPCBootloaderTest.php b/tests/src/Bootloader/GRPCBootloaderTest.php
@@ -4,7 +4,6 @@
 
 namespace Spiral\Tests\Bootloader;
 
-use Spiral\Boot\KernelInterface;
 use Spiral\Core\ConfigsInterface;
 use Spiral\RoadRunner\GRPC\Invoker;
 use Spiral\RoadRunner\GRPC\InvokerInterface;
@@ -56,10 +55,10 @@ public function testConfigShouldBeDefined()
         $config = $configurator->getConfig('grpc');
 
         $this->assertSame([
-            'binaryPath' => $this->getDirectoryByAlias('app').'../protoc-gen-php-grpc',
+            'binaryPath' => $this->getDirectoryByAlias('app') . '../protoc-gen-php-grpc',
             'services' => [
-                $this->getDirectoryByAlias('app').'proto/echo.proto',
-                $this->getDirectoryByAlias('app').'proto/foo.proto',
+                $this->getDirectoryByAlias('app') . 'proto/echo.proto',
+                $this->getDirectoryByAlias('app') . 'proto/foo.proto',
             ],
         ], $config);
     }

diff --git a/tests/src/Bootloader/QueueBootloaderTest.php b/tests/src/Bootloader/QueueBootloaderTest.php
@@ -146,9 +146,9 @@ public function testFormatIsDefined(): void
             'connections' => [
                 'roadrunner' => [
                     'driver' => 'roadrunner',
-                    'serializerFormat' => 'defined'
-                ]
-            ]
+                    'serializerFormat' => 'defined',
+                ],
+            ],
         ]));
 
         $serializer = $this->getContainer()->get(JobsAdapterSerializer::class);

diff --git a/tests/src/Console/Command/GRPC/GenerateCommandTest.php b/tests/src/Console/Command/GRPC/GenerateCommandTest.php
@@ -19,20 +19,20 @@ public function testGenerateServices()
         ];
 
         $this->assertStringContainsString(
-            sprintf('Compiling `%s`:', $this->getDirectoryByAlias('app').'proto/echo.proto'),
+            sprintf('Compiling `%s`:', $this->getDirectoryByAlias('app') . 'proto/echo.proto'),
             $result
         );
 
         foreach ($files as $file) {
-            $this->assertFileExists($this->getDirectoryByAlias('app').$file);
+            $this->assertFileExists($this->getDirectoryByAlias('app') . $file);
             $this->assertStringContainsString(
                 $file,
                 $result
             );
         }
 
         $this->assertStringContainsString(
-            sprintf('Proto file `%s` not found.', $this->getDirectoryByAlias('app').'proto/foo.proto'),
+            sprintf('Proto file `%s` not found.', $this->getDirectoryByAlias('app') . 'proto/foo.proto'),
             $result
         );
     }

diff --git a/tests/src/ConsoleTestCase.php b/tests/src/ConsoleTestCase.php
@@ -5,9 +5,6 @@
 namespace Spiral\Tests;
 
 use Spiral\Files\Files;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\BufferedOutput;
-use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class ConsoleTestCase extends TestCase
 {
@@ -17,7 +14,7 @@ public function generateGRPCService(): string
 
         $result = $this->runCommand('grpc:generate', [
             'path' => $appPath,
-            'namespace' => 'Spiral\\App'
+            'namespace' => 'Spiral\\App',
         ]);
 
         $files = [
@@ -27,7 +24,7 @@ public function generateGRPCService(): string
         ];
 
         foreach ($files as $file) {
-            require_once $appPath.$file;
+            require_once $appPath . $file;
         }
 
         return $result;
@@ -36,8 +33,8 @@ public function generateGRPCService(): string
     public function deleteGRPCService(): void
     {
         $fs = new Files();
-        if ($fs->isDirectory($this->getDirectoryByAlias('app').'GRPC/EchoService')) {
-            $fs->deleteDirectory($this->getDirectoryByAlias('app').'GRPC/EchoService');
+        if ($fs->isDirectory($this->getDirectoryByAlias('app') . 'GRPC/EchoService')) {
+            $fs->deleteDirectory($this->getDirectoryByAlias('app') . 'GRPC/EchoService');
         }
     }
 }
diff --git a/tests/src/Queue/ConsumerTest.php b/tests/src/Queue/ConsumerTest.php
@@ -19,7 +19,7 @@ public function testGetPayloadWithDefaultSerializer(): void
         // default json serializer
         $payload = new Payload(\json_encode([
             'test' => 'test',
-            'other' => 'data'
+            'other' => 'data',
         ]));
 
         $result = $ref->invoke($consumer, $payload, 'memory');
@@ -36,7 +36,7 @@ public function testGetPayloadWithConfiguredSerializer(): void
         // php serialize from config
         $payload = new Payload(\serialize([
             'test' => 'test',
-            'other' => 'data'
+            'other' => 'data',
         ]));
 
         $result = $ref->invoke($consumer, $payload, 'withSerializer');

diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
@@ -38,7 +38,7 @@ public function defineBootloaders(): array
 
     public function rootDirectory(): string
     {
-        return __DIR__.'/../';
+        return __DIR__ . '/../';
     }
 
     protected function tearDown(): void