Apply fixes from StyleCI (#5)

Author: matthewgoslett

config/pubsub.php

@@ -1,7 +1,6 @@
 <?php
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | Default
@@ -50,7 +49,7 @@
         'kafka' => [
             'driver' => 'kafka',
             'consumer_group_id' => 'php-pubsub',
-            'brokers' => env('KAFKA_BROKERS', 'localhost')
+            'brokers' => env('KAFKA_BROKERS', 'localhost'),
         ],
 
         'gcloud' => [

phpunit.php

@@ -1,3 +1,3 @@
 <?php
 
-include __DIR__ . '/vendor/autoload.php';
+include __DIR__ . '/vendor/autoload.php';

src/PubSubConnectionFactory.php

@@ -31,6 +31,7 @@ public function __construct(Container $container)
      *
      * @param string $driver
      * @param array $config
+     *
      * @return PubSubAdapterInterface
      */
     public function make($driver, array $config = [])
@@ -55,6 +56,7 @@ public function make($driver, array $config = [])
      * Factory a RedisPubSubAdapter.
      *
      * @param array $config
+     *
      * @return RedisPubSubAdapter
      */
     protected function makeRedisAdapter(array $config)
@@ -72,6 +74,7 @@ protected function makeRedisAdapter(array $config)
      * Factory a KafkaPubSubAdapter.
      *
      * @param array $config
+     *
      * @return KafkaPubSubAdapter
      */
     protected function makeKafkaAdapter(array $config)
@@ -100,6 +103,7 @@ protected function makeKafkaAdapter(array $config)
      * Factory a GoogleCloudPubSubAdapter.
      *
      * @param array $config
+     *
      * @return GoogleCloudPubSubAdapter
      */
     protected function makeGoogleCloudAdapter(array $config)

src/PubSubManager.php

@@ -42,6 +42,7 @@ public function __construct(Application $app, PubSubConnectionFactory $factory)
      * Return a pub-sub adapter instance.
      *
      * @param string $name
+     *
      * @return PubSubAdapterInterface
      */
     public function connection($name = null)
@@ -61,6 +62,7 @@ public function connection($name = null)
      * Make an instance of a pub-sub adapter interface.
      *
      * @param string $name
+     *
      * @return PubSubAdapterInterface
      */
     protected function makeConnection($name)
@@ -84,6 +86,7 @@ protected function makeConnection($name)
      * Return the pubsub config for the given connection.
      *
      * @param string $name
+     *
      * @return array
      */
     protected function getConnectionConfig($name)
@@ -105,7 +108,7 @@ protected function getConnectionConfig($name)
      */
     protected function getConfig()
     {
-        $config = $this->app->make('config'); /** @var \Illuminate\Contracts\Config\Repository $config */
+        $config = $this->app->make('config'); /* @var \Illuminate\Contracts\Config\Repository $config */
         return $config->get('pubsub');
     }
 
@@ -126,7 +129,7 @@ public function getDefaultConnection()
      */
     public function setDefaultConnection($name)
     {
-        $config = $this->app->make('config'); /** @var \Illuminate\Contracts\Config\Repository $config */
+        $config = $this->app->make('config'); /* @var \Illuminate\Contracts\Config\Repository $config */
         $config->set('pubsub.default', $name);
     }
 
@@ -166,6 +169,7 @@ public function getConnections()
      *
      * @param string $method
      * @param array $parameters
+     *
      * @return mixed
      */
     public function __call($method, $parameters)

src/PubSubServiceProvider.php

@@ -37,7 +37,7 @@ public function register()
         $this->app->bind('pubsub.connection', PubSubAdapterInterface::class);
 
         $this->app->bind(PubSubAdapterInterface::class, function ($app) {
-            $manager = $app['pubsub']; /** @var PubSubManager $manager */
+            $manager = $app['pubsub']; /* @var PubSubManager $manager */
             return $manager->connection();
         });
 

src/SubscriberMakeCommand.php

@@ -3,8 +3,8 @@
 namespace Superbalist\LaravelPubSub;
 
 use Illuminate\Console\GeneratorCommand;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
 
 class SubscriberMakeCommand extends GeneratorCommand
 {
@@ -34,6 +34,7 @@ class SubscriberMakeCommand extends GeneratorCommand
      *
      * @param  string  $stub
      * @param  string  $name
+     *
      * @return string
      */
     protected function replaceClass($stub, $name)
@@ -57,11 +58,12 @@ protected function getStub()
      * Get the default namespace for the class.
      *
      * @param  string  $rootNamespace
+     *
      * @return string
      */
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace.'\Console\Commands';
+        return $rootNamespace . '\Console\Commands';
     }
 
     /**
@@ -89,7 +91,7 @@ protected function getOptions()
                 null,
                 InputOption::VALUE_OPTIONAL,
                 'The terminal command that should be assigned.',
-                'subscriber:name'
+                'subscriber:name',
             ],
         ];
     }

tests/PubSubConnectionFactoryTest.php

@@ -51,7 +51,7 @@ public function testMakeRedisAdapter()
         $container->shouldReceive('make')
             ->withArgs([
                 'pubsub.redis.redis_client',
-                ['config' => $config]
+                ['config' => $config],
             ])
             ->once()
             ->andReturn(Mockery::mock(RedisClient::class));
@@ -97,25 +97,25 @@ public function testMakeKafkaAdapter()
         $conf->shouldReceive('set')
             ->withArgs([
                 'metadata.broker.list',
-                'localhost'
+                'localhost',
             ])
             ->once();
         $conf->shouldReceive('set')
             ->withArgs([
                 'group.id',
-                'php-pubsub'
+                'php-pubsub',
             ])
             ->once();
         $conf->shouldReceive('set')
             ->withArgs([
                 'enable.auto.commit',
-                'false'
+                'false',
             ])
             ->once();
         $conf->shouldReceive('set')
             ->withArgs([
                 'offset.store.method',
-                'broker'
+                'broker',
             ])
             ->once();
         $conf->shouldReceive('setDefaultTopicConf')
@@ -132,7 +132,7 @@ public function testMakeKafkaAdapter()
         $container->shouldReceive('make')
             ->withArgs([
                 'pubsub.kafka.consumer',
-                ['conf' => $conf]
+                ['conf' => $conf],
             ])
             ->once()
             ->andReturn($consumer);
@@ -153,8 +153,8 @@ public function testMakeGoogleCloudAdapter()
                     'config' => [
                         'projectId' => 12345,
                         'keyFilePath' => 'my_key_file.json',
-                    ]
-                ]
+                    ],
+                ],
             ])
             ->andReturn(Mockery::mock(GoogleCloudPubSubClient::class));
 
@@ -169,7 +169,7 @@ public function testMakeGoogleCloudAdapter()
         $adapter = $factory->make('gcloud', $config);
         $this->assertInstanceOf(GoogleCloudPubSubAdapter::class, $adapter);
 
-        $adapter = $factory->make('gcloud', $config); /** @var GoogleCloudPubSubAdapter $adapter */
+        $adapter = $factory->make('gcloud', $config); /* @var GoogleCloudPubSubAdapter $adapter */
         $this->assertInstanceOf(GoogleCloudPubSubAdapter::class, $adapter);
         $this->assertEquals('blah', $adapter->getClientIdentifier());
         $this->assertFalse($adapter->areTopicsAutoCreated());

tests/PubSubManagerTest.php

@@ -31,7 +31,7 @@ public function testConnectionWithNullNameReturnsDefaultConnection()
         $factory->shouldReceive('make')
             ->withArgs([
                 '/dev/null',
-                []
+                [],
             ])
             ->once()
             ->andReturn(PubSubAdapterInterface::class);
@@ -114,7 +114,7 @@ public function testConnectionWithNameReturnsSpecifiedConnection()
                 [
                     'consumer_group_id' => 'php-pubsub',
                     'brokers' => 'localhost',
-                ]
+                ],
             ])
             ->once()
             ->andReturn(PubSubAdapterInterface::class);
@@ -148,7 +148,7 @@ public function testConnectionWithExistingConnectionReturnsThatConnection()
         $factory->shouldReceive('make')
             ->withArgs([
                 '/dev/null',
-                []
+                [],
             ])
             ->once()
             ->andReturn($adapter);
@@ -228,7 +228,7 @@ public function testSetDefaultConnection()
         $config->shouldReceive('set')
             ->withArgs([
                 'pubsub.default',
-                '/dev/null'
+                '/dev/null',
             ])
             ->once();