Merge pull request vyuldashev#109 from vladimir-yuldashev/analysis-qygKrY

vyuldashev · web-flow · commit e9769060588a · 2017-02-22T19:50:41.000+03:00
Apply fixes from StyleCI
diff --git a/src/VladimirYuldashev/LaravelQueueRabbitMQ/LaravelQueueRabbitMQServiceProvider.php b/src/VladimirYuldashev/LaravelQueueRabbitMQ/LaravelQueueRabbitMQServiceProvider.php
@@ -29,7 +29,7 @@ public function boot()
     {
         /** @var QueueManager $queue */
         $queue = $this->app['queue'];
-        $connector = new RabbitMQConnector;
+        $connector = new RabbitMQConnector();
 
         $queue->stopping(function () use ($connector) {
             $connector->connection()->close();
diff --git a/src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php b/src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php
@@ -8,7 +8,6 @@
 
 class RabbitMQConnector implements ConnectorInterface
 {
-
     /** @var AMQPStreamConnection */
     private $connection;
 
@@ -40,5 +39,4 @@ public function connection()
     {
         return $this->connection;
     }
-
 }
diff --git a/src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php b/src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php
@@ -5,9 +5,9 @@
 use DateTime;
 use ErrorException;
 use Exception;
-use Log;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\Queue;
+use Log;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use PhpAmqpLib\Message\AMQPMessage;
@@ -130,8 +130,6 @@ public function pushRaw($payload, $queue = null, array $options = [])
         } catch (ErrorException $exception) {
             $this->reportConnectionError('pushRaw', $exception);
         }
-
-        return null;
     }
 
     /**
@@ -170,12 +168,9 @@ public function pop($queue = null)
             if ($message instanceof AMQPMessage) {
                 return new RabbitMQJob($this->container, $this, $this->channel, $queue, $message);
             }
-        }
-        catch(ErrorException $exception) {
+        } catch (ErrorException $exception) {
             $this->reportConnectionError('pop', $exception);
         }
-
-        return null;
     }
 
     /**
@@ -326,9 +321,8 @@ public function getCorrelationId()
      */
     private function reportConnectionError($action, Exception $e)
     {
-        Log::error('AMQP error while attempting ' . $action . ': ' . $e->getMessage());
+        Log::error('AMQP error while attempting '.$action.': '.$e->getMessage());
         // Sleep so that we don't flood the log file
         sleep($this->sleepOnError);
     }
-
 }
diff --git a/src/config/rabbitmq.php b/src/config/rabbitmq.php
@@ -12,8 +12,8 @@
     'host' => env('RABBITMQ_HOST', '127.0.0.1'),
     'port' => env('RABBITMQ_PORT', 5672),
 
-    'vhost' => env('RABBITMQ_VHOST', '/'),
-    'login' => env('RABBITMQ_LOGIN', 'guest'),
+    'vhost'    => env('RABBITMQ_VHOST', '/'),
+    'login'    => env('RABBITMQ_LOGIN', 'guest'),
     'password' => env('RABBITMQ_PASSWORD', 'guest'),
 
     'queue' => env('RABBITMQ_QUEUE'),
@@ -25,9 +25,9 @@
     // create the queue if not exists and bind to the exchange
 
     'queue_params' => [
-        'passive' => env('RABBITMQ_QUEUE_PASSIVE', false),
-        'durable' => env('RABBITMQ_QUEUE_DURABLE', true),
-        'exclusive' => env('RABBITMQ_QUEUE_EXCLUSIVE', false),
+        'passive'     => env('RABBITMQ_QUEUE_PASSIVE', false),
+        'durable'     => env('RABBITMQ_QUEUE_DURABLE', true),
+        'exclusive'   => env('RABBITMQ_QUEUE_EXCLUSIVE', false),
         'auto_delete' => env('RABBITMQ_QUEUE_AUTODELETE', false),
     ],
     'exchange_params' => [
diff --git a/tests/RabbitMQConnectorTest.php b/tests/RabbitMQConnectorTest.php
@@ -10,27 +10,27 @@ class RabbitMQConnectorTest extends TestCase
     public function test_connect()
     {
         $config = [
-            'host' => getenv('HOST'),
-            'port' => getenv('PORT'),
-            'login' => 'guest',
+            'host'     => getenv('HOST'),
+            'port'     => getenv('PORT'),
+            'login'    => 'guest',
             'password' => 'guest',
-            'vhost' => '/',
+            'vhost'    => '/',
 
-            'queue' => 'queue_name',
-            'exchange_declare' => true,
+            'queue'              => 'queue_name',
+            'exchange_declare'   => true,
             'queue_declare_bind' => true,
 
             'queue_params' => [
-                'passive' => false,
-                'durable' => true,
-                'exclusive' => false,
+                'passive'     => false,
+                'durable'     => true,
+                'exclusive'   => false,
                 'auto_delete' => false,
             ],
             'exchange_params' => [
-                'name' => null,
-                'type' => 'direct',
-                'passive' => false,
-                'durable' => true,
+                'name'        => null,
+                'type'        => 'direct',
+                'passive'     => false,
+                'durable'     => true,
                 'auto_delete' => false,
             ],
         ];
diff --git a/tests/RabbitMQQueueTest.php b/tests/RabbitMQQueueTest.php
@@ -5,7 +5,6 @@
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use PhpAmqpLib\Message\AMQPMessage;
 use PHPUnit\Framework\TestCase;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 /**
@@ -26,21 +25,21 @@ public function setUp()
         $this->connection->shouldReceive('channel')->andReturn($this->channel);
 
         $this->config = [
-            'queue' => str_random(),
+            'queue'        => str_random(),
             'queue_params' => [
-                'passive' => false,
-                'durable' => true,
-                'exclusive' => false,
+                'passive'     => false,
+                'durable'     => true,
+                'exclusive'   => false,
                 'auto_delete' => false,
             ],
             'exchange_params' => [
-                'name' => 'exchange_name',
-                'type' => 'direct',
-                'passive' => false,
-                'durable' => true,
+                'name'        => 'exchange_name',
+                'type'        => 'direct',
+                'passive'     => false,
+                'durable'     => true,
                 'auto_delete' => false,
             ],
-            'exchange_declare' => true,
+            'exchange_declare'   => true,
             'queue_declare_bind' => true,
         ];
 
@@ -111,9 +110,9 @@ public function test_later()
 
         // delayed queue
         $this->channel->shouldReceive('queue_bind')->with(
-            $this->config['queue'] . '_deferred_' . $delay,
+            $this->config['queue'].'_deferred_'.$delay,
             $this->config['exchange_params']['name'],
-            $this->config['queue'] . '_deferred_' . $delay
+            $this->config['queue'].'_deferred_'.$delay
         )->once();
 
         $this->channel->shouldReceive('basic_publish')->once();

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function boot()`
`29`	`29`	`{`
`30`	`30`	`/** @var QueueManager $queue */`
`31`	`31`	`$queue = $this->app['queue'];`
`32`		`- $connector = new RabbitMQConnector;`
	`32`	`+ $connector = new RabbitMQConnector();`
`33`	`33`
`34`	`34`	`$queue->stopping(function () use ($connector) {`
`35`	`35`	`$connector->connection()->close();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`class RabbitMQConnector implements ConnectorInterface`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`/** @var AMQPStreamConnection */`
`13`	`12`	`private $connection;`
`14`	`13`
`@@ -40,5 +39,4 @@ public function connection()`
`40`	`39`	`{`
`41`	`40`	`return $this->connection;`
`42`	`41`	`}`
`43`		`-`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`use DateTime;`
`6`	`6`	`use ErrorException;`
`7`	`7`	`use Exception;`
`8`		`-use Log;`
`9`	`8`	`use Illuminate\Contracts\Queue\Queue as QueueContract;`
`10`	`9`	`use Illuminate\Queue\Queue;`
	`10`	`+use Log;`
`11`	`11`	`use PhpAmqpLib\Channel\AMQPChannel;`
`12`	`12`	`use PhpAmqpLib\Connection\AMQPStreamConnection;`
`13`	`13`	`use PhpAmqpLib\Message\AMQPMessage;`
`@@ -130,8 +130,6 @@ public function pushRaw($payload, $queue = null, array $options = [])`
`130`	`130`	`} catch (ErrorException $exception) {`
`131`	`131`	`$this->reportConnectionError('pushRaw', $exception);`
`132`	`132`	`}`
`133`		`-`
`134`		`- return null;`
`135`	`133`	`}`
`136`	`134`
`137`	`135`	`/**`
`@@ -170,12 +168,9 @@ public function pop($queue = null)`
`170`	`168`	`if ($message instanceof AMQPMessage) {`
`171`	`169`	`return new RabbitMQJob($this->container, $this, $this->channel, $queue, $message);`
`172`	`170`	`}`
`173`		`- }`
`174`		`- catch(ErrorException $exception) {`
	`171`	`+ } catch (ErrorException $exception) {`
`175`	`172`	`$this->reportConnectionError('pop', $exception);`
`176`	`173`	`}`
`177`		`-`
`178`		`- return null;`
`179`	`174`	`}`
`180`	`175`
`181`	`176`	`/**`
`@@ -326,9 +321,8 @@ public function getCorrelationId()`
`326`	`321`	`*/`
`327`	`322`	`private function reportConnectionError($action, Exception $e)`
`328`	`323`	`{`
`329`		`- Log::error('AMQP error while attempting ' . $action . ': ' . $e->getMessage());`
	`324`	`+ Log::error('AMQP error while attempting '.$action.': '.$e->getMessage());`
`330`	`325`	`// Sleep so that we don't flood the log file`
`331`	`326`	`sleep($this->sleepOnError);`
`332`	`327`	`}`
`333`		`-`
`334`	`328`	`}`