Merge pull request bschmitt#30 from blanxii/refactor-to-follow-psr2

Add standard for PSR2 support

composer.json

@@ -31,7 +31,8 @@
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",
-    "mockery/mockery": "~0.9"
+    "mockery/mockery": "~0.9",
+    "squizlabs/php_codesniffer": "^3.0@dev"
   },
   "autoload": {
     "psr-4": {

src/Amqp.php

@@ -1,4 +1,6 @@
-<?php namespace Bschmitt\Amqp;
+<?php
+
+namespace Bschmitt\Amqp;
 
 use Closure;
 use Bschmitt\Amqp\Request;
@@ -62,5 +64,4 @@ public function message($body, $properties = [])
     {
         return new Message($body, $properties);
     }
-
 }

src/AmqpServiceProvider.php

@@ -1,4 +1,6 @@
-<?php namespace Bschmitt\Amqp;
+<?php
+
+namespace Bschmitt\Amqp;
 
 use Bschmitt\Amqp\Consumer;
 use Bschmitt\Amqp\Publisher;
@@ -40,7 +42,6 @@ public function register()
         $this->app->singleton('Bschmitt\Amqp\Consumer', function ($app) {
             return new Consumer(config());
         });
-
     }
 
     /**
@@ -52,5 +53,4 @@ public function provides()
     {
         return ['Amqp', 'Bschmitt\Amqp\Publisher', 'Bschmitt\Amqp\Consumer'];
     }
-
 }

src/Consumer.php

@@ -1,4 +1,6 @@
-<?php namespace Bschmitt\Amqp;
+<?php
+
+namespace Bschmitt\Amqp;
 
 use Illuminate\Config\Repository;
 use Closure;
@@ -24,7 +26,6 @@ class Consumer extends Request
     public function consume($queue, Closure $closure)
     {
         try {
-
             $this->messageCount = $this->getQueueMessageCount();
 
             if (!$this->getProperty('persistent') && $this->messageCount == 0) {
@@ -57,11 +58,13 @@ function ($message) use ($closure, $object) {
 
             // consume
             while (count($this->getChannel()->callbacks)) {
-                $this->getChannel()->wait(NULL, !$this->getProperty('blocking'), $this->getProperty('timeout') ? $this->getProperty('timeout') : 0);
+                $this->getChannel()->wait(
+                    null,
+                    !$this->getProperty('blocking'),
+                    $this->getProperty('timeout') ? $this->getProperty('timeout') : 0
+                );
             }
-
         } catch (\Exception $e) {
-
             if ($e instanceof Exception\Stop) {
                 return true;
             }
@@ -112,5 +115,4 @@ public function stopWhenProcessed()
             throw new Exception\Stop();
         }
     }
-
 }

src/Context.php

@@ -1,7 +1,8 @@
-<?php namespace Bschmitt\Amqp;
+<?php
+
+namespace Bschmitt\Amqp;
 
 use Illuminate\Config\Repository;
-use PhpAmqpLib\Connection\AMQPStreamConnection;
 
 /**
  * @author Björn Schmitt <[email protected]>
@@ -61,12 +62,11 @@ public function getProperties()
      */
     public function getProperty($key)
     {
-        return array_key_exists($key, $this->properties) ? $this->properties[$key] : NULL;
+        return array_key_exists($key, $this->properties) ? $this->properties[$key] : null;
     }
 
     /**
      * @return mixed
      */
-    abstract function setup();
-
+    abstract public function setup();
 }

src/Exception/Configuration.php

@@ -1,4 +1,6 @@
-<?php namespace Bschmitt\Amqp\Exception;
+<?php
+
+namespace Bschmitt\Amqp\Exception;
 
 /**
  * @author Björn Schmitt <[email protected]>

src/Exception/Stop.php

@@ -1,9 +1,11 @@
-<?php namespace Bschmitt\Amqp\Exception;
+<?php
+
+namespace Bschmitt\Amqp\Exception;
 
 /**
  * @author Björn Schmitt <[email protected]>
  */
 class Stop extends \Exception
 {
 
-}
+}

src/Facades/Amqp.php

@@ -1,4 +1,6 @@
-<?php namespace Bschmitt\Amqp\Facades;
+<?php
+
+namespace Bschmitt\Amqp\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
@@ -16,5 +18,4 @@ protected static function getFacadeAccessor()
     {
         return 'Amqp';
     }
-
-}
+}

src/LumenServiceProvider.php

@@ -1,4 +1,6 @@
-<?php namespace Bschmitt\Amqp;
+<?php
+
+namespace Bschmitt\Amqp;
 
 use Illuminate\Support\ServiceProvider;
 
@@ -17,7 +19,6 @@ class LumenServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-
     }
 
     /**
@@ -41,5 +42,4 @@ public function register()
             class_alias('Bschmitt\Amqp\Facades\Amqp', 'Amqp');
         }
     }
-
-}
+}

src/Message.php

@@ -1,6 +1,8 @@
-<?php namespace Bschmitt\Amqp;
+<?php
 
-use \PhpAmqpLib\Message\AMQPMessage;
+namespace Bschmitt\Amqp;
+
+use PhpAmqpLib\Message\AMQPMessage;
 
 /**
  * @author Björn Schmitt <[email protected]>

src/Publisher.php

@@ -1,6 +1,6 @@
-<?php namespace Bschmitt\Amqp;
+<?php
 
-use Illuminate\Config\Repository;
+namespace Bschmitt\Amqp;
 
 /**
  * @author Björn Schmitt <[email protected]>
@@ -17,5 +17,4 @@ public function publish($routing, $message)
     {
         $this->getChannel()->basic_publish($message, $this->getProperty('exchange'), $routing);
     }
-
 }

src/Request.php

@@ -1,6 +1,7 @@
-<?php namespace Bschmitt\Amqp;
+<?php
+
+namespace Bschmitt\Amqp;
 
-use Illuminate\Config\Repository;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use PhpAmqpLib\Connection\AMQPSSLConnection;
 use PhpAmqpLib\Channel\AMQPChannel;
@@ -64,7 +65,6 @@ public function setup()
             durable: true // the exchange will survive server restarts
             auto_delete: false //the exchange won't be deleted once the channel is closed.
         */
-
         $this->channel->exchange_declare(
             $exchange,
             $this->getProperty('exchange_type'),
@@ -79,7 +79,6 @@ public function setup()
         $queue = $this->getProperty('queue');
 
         if (!empty($queue) || $this->getProperty('queue_force_declare')) {
-
             /*
                 name: $queue
                 passive: false
@@ -101,10 +100,12 @@ public function setup()
                 $this->getProperty('queue_properties')
             );
 
-            $this->channel->queue_bind($queue ?: $this->queueInfo[0], $exchange, $this->getProperty('routing'));
-
+            $this->channel->queue_bind(
+                $queue ?: $this->queueInfo[0],
+                $exchange,
+                $this->getProperty('routing')
+            );
         }
-
         // clear at shutdown
         register_shutdown_function([get_class(), 'shutdown'], $this->channel, $this->connection);
     }
@@ -145,5 +146,4 @@ public static function shutdown(AMQPChannel $channel, AMQPStreamConnection $conn
         $channel->close();
         $connection->close();
     }
-
 }

test/SimpleTest.php

@@ -1,4 +1,6 @@
-<?php namespace Bschmitt\Amqp\Test;
+<?php
+
+namespace Bschmitt\Amqp\Test;
 
 /**
  * @author Björn Schmitt <[email protected]>