Merge pull request vyuldashev#77 from vladimir-yuldashev/analysis-ze6D0K

Applied fixes from StyleCI

Author: vyuldashev

src/VladimirYuldashev/LaravelQueueRabbitMQ/LaravelQueueRabbitMQServiceProvider.php

@@ -7,7 +7,6 @@
 
 class LaravelQueueRabbitMQServiceProvider extends ServiceProvider
 {
-
     /**
      * Register the service provider.
      *
@@ -28,12 +27,11 @@ public function register()
     public function boot()
     {
         /**
-         * @var \Illuminate\Queue\QueueManager $manager
+         * @var \Illuminate\Queue\QueueManager
          */
         $manager = $this->app['queue'];
         $manager->addConnector('rabbitmq', function () {
             return new RabbitMQConnector;
         });
     }
-
-}
+}

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php

@@ -8,24 +8,22 @@
 
 class RabbitMQConnector implements ConnectorInterface
 {
+    /**
+     * Establish a queue connection.
+     *
+     * @param  array $config
+     *
+     * @return \Illuminate\Contracts\Queue\Queue
+     */
+    public function connect(array $config)
+    {
+        // create connection with AMQP
+        $connection = new AMQPStreamConnection($config['host'], $config['port'], $config['login'], $config['password'],
+                $config['vhost']);
 
-	/**
-	 * Establish a queue connection.
-	 *
-	 * @param  array $config
-	 *
-	 * @return \Illuminate\Contracts\Queue\Queue
-	 */
-	public function connect(array $config)
-	{
-		// create connection with AMQP
-		$connection = new AMQPStreamConnection($config['host'], $config['port'], $config['login'], $config['password'],
-				$config['vhost']);
-
-		return new RabbitMQQueue(
-			$connection,
-			$config
-		);
-	}
-
-}
+        return new RabbitMQQueue(
+            $connection,
+            $config
+        );
+    }
+}

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php

@@ -12,7 +12,7 @@
 class RabbitMQJob extends Job implements JobContract
 {
     /**
-     * Same as RabbitMQQueue, used for attempt counts
+     * Same as RabbitMQQueue, used for attempt counts.
      */
     const ATTEMPT_COUNT_HEADERS_KEY = 'attempts_count';
 
@@ -29,7 +29,6 @@ class RabbitMQJob extends Job implements JobContract
      * @param PhpAmqpLib\Channel\AMQPChannel $channel
      * @param string $queue
      * @param PhpAmqpLib\Message\AMQPMessage $message
-     *
      */
     public function __construct(
         Container $container,
@@ -110,7 +109,7 @@ public function release($delay = 0)
 
         $body = $this->getParsedBody();
 
-        /**
+        /*
          * Some jobs don't have the command set, so fall back to just sending it the job name string
          */
         if (isset($body['data']['command']) === true) {
@@ -142,6 +141,7 @@ public function attempts()
                 return $headers[self::ATTEMPT_COUNT_HEADERS_KEY];
             }
         }
+
         return 0;
     }
 

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -14,7 +14,7 @@
 class RabbitMQQueue extends Queue implements QueueContract
 {
     /**
-     * Used for retry logic, to set the retries on the message metadata instead of the message body
+     * Used for retry logic, to set the retries on the message metadata instead of the message body.
      */
     const ATTEMPT_COUNT_HEADERS_KEY = 'attempts_count';
 
@@ -143,8 +143,6 @@ public function pop($queue = null)
         if ($message instanceof AMQPMessage) {
             return new RabbitMQJob($this->container, $this, $this->channel, $queue, $message);
         }
-
-        return null;
     }
 
     /**
@@ -213,7 +211,7 @@ private function declareDelayedQueue($destination, $delay)
         $delay = $this->getSeconds($delay);
         $destination = $this->getQueueName($destination);
         $destinationExchange = $this->configExchange['name'] ?: $destination;
-        $name = $this->getQueueName($destination) . '_deferred_' . $delay;
+        $name = $this->getQueueName($destination).'_deferred_'.$delay;
         $exchange = $this->configExchange['name'] ?: $destination;
 
         // declare exchange
@@ -247,7 +245,7 @@ private function declareDelayedQueue($destination, $delay)
     }
 
     /**
-     * Sets the attempts member variable to be used in message generation
+     * Sets the attempts member variable to be used in message generation.
      *
      * @param int $count
      *

src/config/rabbitmq.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * default configuration for laravel-queue-rabbitmq merged with project config to base key 'queue'
+ * default configuration for laravel-queue-rabbitmq merged with project config to base key 'queue'.
  * @see \MapleSyrupGroup\AMQPEvents\Providers\AMQPEventServiceProvider
  */
 return [
@@ -34,4 +34,4 @@
         'auto_delete' => env('RABBITMQ_EXCHANGE_AUTODELETE', false),
     ],
 
-];
+];

src/examples/app.php

@@ -2,8 +2,8 @@
 
 return [
 
-	'providers' => append_config([
-			VladimirYuldashev\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider::class,
-	]),
+    'providers' => append_config([
+            VladimirYuldashev\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider::class,
+    ]),
 
-];
+];