Style CI

Author: petermein

composer.json

@@ -16,7 +16,8 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^5.5",
-    "mockery/mockery": "^0.9.5"
+    "mockery/mockery": "^0.9.5",
+    "sllh/php-cs-fixer-styleci-bridge": "^2.1"
   },
   "autoload": {
     "psr-4": {

config/kafka.php

@@ -7,7 +7,7 @@
  */
 return [
 
-    /**
+    /*
      * Driver name
      */
     'driver' => 'kafka',
@@ -17,12 +17,12 @@
      */
     'queue' => env('KAFKA_QUEUE', 'default'),
 
-    /**
+    /*
      * The group of where the consumer in resides.
      */
     'consumer_group_id' => env('KAFKA_CONSUMER_GROUP_ID', 'laravel_queue'),
 
-    /**
+    /*
      * Address of the Kafka broker
      */
     'brokers' => env('KAFKA_BROKERS', 'localhost'),

src/LaravelQueueKafkaServiceProvider.php

@@ -10,22 +10,18 @@ class LaravelQueueKafkaServiceProvider extends ServiceProvider
 {
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__.'/../config/kafka.php', 'queue.connections.kafka'
+            __DIR__ . '/../config/kafka.php', 'queue.connections.kafka'
         );
 
         $this->registerDependencies();
     }
 
     /**
      * Register the application's event listeners.
-     *
-     * @return void
      */
     public function boot()
     {

src/Queue/Jobs/KafkaJob.php

@@ -28,15 +28,16 @@ class KafkaJob extends Job implements JobContract
 
     /**
      * KafkaJob constructor.
-     * @param KafkaQueue    $connection
-     * @param Message       $message
+     *
+     * @param KafkaQueue $connection
+     * @param Message $message
      * @param               $queue
      */
     public function __construct(
         KafkaQueue $connection,
         Message $message,
         $queue
-    ){
+    ) {
         $this->connection = $connection;
         $this->queue = $queue;
         $this->message = $message;
@@ -46,8 +47,6 @@ public function __construct(
      * Fire the job.
      *
      * @throws Exception
-     *
-     * @return void
      */
     public function fire()
     {
@@ -93,8 +92,6 @@ public function getRawBody()
 
     /**
      * Delete the job from the queue.
-     *
-     * @return void
      */
     public function delete()
     {
@@ -108,8 +105,6 @@ public function delete()
      * @param int $delay
      *
      * @throws Exception
-     *
-     * @return void
      */
     public function release($delay = 0)
     {
@@ -142,8 +137,6 @@ public function release($delay = 0)
      * Sets the count of attempts at processing this job.
      *
      * @param int $count
-     *
-     * @return void
      */
     private function setAttempts($count)
     {
@@ -164,8 +157,6 @@ public function getJobId()
      * Sets the job identifier.
      *
      * @param string $id
-     *
-     * @return void
      */
     public function setJobId($id)
     {

src/Queue/KafkaQueue.php

@@ -33,9 +33,9 @@ class KafkaQueue extends Queue implements QueueContract
     private $consumer;
 
     /**
-     * @param \RdKafka\Producer      $producer
+     * @param \RdKafka\Producer $producer
      * @param \RdKafka\KafkaConsumer $consumer
-     * @param array                  $config
+     * @param array $config
      */
     public function __construct(\RdKafka\Producer $producer, \RdKafka\KafkaConsumer $consumer, $config)
     {
@@ -64,7 +64,7 @@ public function size($queue = null)
      * Push a new job onto the queue.
      *
      * @param string $job
-     * @param mixed  $data
+     * @param mixed $data
      * @param string $queue
      *
      * @return bool
@@ -79,7 +79,7 @@ public function push($job, $data = '', $queue = null)
      *
      * @param string $payload
      * @param string $queue
-     * @param array  $options
+     * @param array $options
      *
      * @return mixed
      */
@@ -102,9 +102,9 @@ public function pushRaw($payload, $queue = null, array $options = [])
      * Push a new job onto the queue after a delay.
      *
      * @param \DateTime|int $delay
-     * @param string        $job
-     * @param mixed         $data
-     * @param string        $queue
+     * @param string $job
+     * @param mixed $data
+     * @param string $queue
      *
      * @return mixed
      */
@@ -191,27 +191,29 @@ public function getCorrelationId()
     /**
      * Create a payload array from the given job and data.
      *
-     * @param  string  $job
-     * @param  mixed   $data
-     * @param  string  $queue
+     * @param  string $job
+     * @param  mixed $data
+     * @param  string $queue
+     *
      * @return array
      */
-    protected function createPayloadArray($job, $data = '', $queue = null){
-           return array_merge(parent::createPayloadArray($job, $data), [
+    protected function createPayloadArray($job, $data = '', $queue = null)
+    {
+        return array_merge(parent::createPayloadArray($job, $data), [
             'id' => $this->getCorrelationId(),
             'attempts' => 0,
         ]);
     }
 
     /**
-     * @param string    $action
+     * @param string $action
      * @param Exception $e
      *
      * @throws Exception
      */
     protected function reportConnectionError($action, Exception $e)
     {
-        Log::error('Kafka error while attempting '.$action.': '.$e->getMessage());
+        Log::error('Kafka error while attempting ' . $action . ': ' . $e->getMessage());
 
         // If it's set to false, throw an error rather than waiting
         if ($this->sleepOnError === false) {

tests/KafkaConnectorTest.php

@@ -14,7 +14,7 @@ public function test_connect()
             'queue' => 'queue_name',
             'consumer_group_id' => 'php-pubsub',
             'brokers' => 'localhost',
-            'sleep_on_error' => 5
+            'sleep_on_error' => 5,
         ];
 
         $container = Mockery::mock(\Illuminate\Container\Container::class);
@@ -48,7 +48,6 @@ public function test_connect()
             ->withArgs(['queue.kafka.conf', []])
             ->andReturn($conf);
 
-
         $connector = new KafkaConnector($container);
         $queue = $connector->connect($config);
 

tests/KafkaQueueTest.php

@@ -19,7 +19,6 @@ public function setUp()
         $this->producer = Mockery::mock(\RdKafka\Producer::class);
         $this->consumer = Mockery::mock(\RdKafka\KafkaConsumer::class);
 
-
         $this->config = [
             'queue' => str_random(),
             'sleep_error' => true,
@@ -56,7 +55,6 @@ public function test_later()
         $delay = 5;
         $job = new TestJob();
 
-
         $this->expectException(\Exception::class);
 
         $this->queue->later($delay, $job);

tests/stubs/Consumer.php

@@ -0,0 +1,5 @@
+<?php
+
+class ConsumerStub extends \RdKafka\Consumer
+{
+}

tests/stubs/ConsumerStub.php

@@ -6,4 +6,4 @@ public function addBrokers($broker_list)
     {
         //Do nothing
     }
-}
+}