Merge 3.x into master

Backend/AMQPBackendDispatcher.php

@@ -53,7 +53,7 @@ public function __construct(array $settings, array $queues, $defaultQueue, array
     }
 
     /**
-     * @return AMQPChannelannel
+     * @return AMQPChannel
      */
     public function getChannel()
     {
@@ -115,15 +115,19 @@ public function getBackend($type)
      */
     public function getIterator()
     {
-        throw new \RuntimeException('You need to use a specific rabbitmq backend supporting the selected queue to run a consumer.');
+        throw new \RuntimeException(
+            'You need to use a specific rabbitmq backend supporting the selected queue to run a consumer.'
+        );
     }
 
     /**
      * {@inheritdoc}
      */
     public function handle(MessageInterface $message, EventDispatcherInterface $dispatcher)
     {
-        throw new \RuntimeException('You need to use a specific rabbitmq backend supporting the selected queue to run a consumer.');
+        throw new \RuntimeException(
+            'You need to use a specific rabbitmq backend supporting the selected queue to run a consumer.'
+        );
     }
 
     /**
@@ -149,11 +153,16 @@ public function getStatus()
             }
 
             if ($checked !== count($this->queues)) {
-                return new Failure('Not all queues for the available notification types registered in the rabbitmq broker. Are the consumer commands running?');
+                return new Failure(
+                    'Not all queues for the available notification types registered in the rabbitmq broker. '
+                    .'Are the consumer commands running?'
+                );
             }
 
             if (count($missingConsumers) > 0) {
-                return new Failure('There are no rabbitmq consumers running for the queues: '.implode(', ', $missingConsumers));
+                return new Failure(
+                    'There are no rabbitmq consumers running for the queues: '.implode(', ', $missingConsumers)
+                );
             }
         } catch (\Exception $e) {
             return new Failure($e->getMessage());
@@ -167,7 +176,9 @@ public function getStatus()
      */
     public function cleanup()
     {
-        throw new \RuntimeException('You need to use a specific rabbitmq backend supporting the selected queue to run a consumer.');
+        throw new \RuntimeException(
+            'You need to use a specific rabbitmq backend supporting the selected queue to run a consumer.'
+        );
     }
 
     public function shutdown()
@@ -198,7 +209,10 @@ public function initialize()
     protected function getApiQueueStatus()
     {
         if (class_exists('Guzzle\Http\Client') === false) {
-            throw new \RuntimeException('The guzzle http client library is required to run rabbitmq health checks. Make sure to add guzzle/guzzle to your composer.json.');
+            throw new \RuntimeException(
+                'The guzzle http client library is required to run rabbitmq health checks. '
+                .'Make sure to add guzzlehttp/guzzle to your composer.json.'
+            );
         }
 
         $client = new \Guzzle\Http\Client();

Consumer/LoggerConsumer.php

@@ -42,7 +42,7 @@ class LoggerConsumer implements ConsumerInterface
     public function __construct($logger)
     {
         if ($logger instanceof LegacyLoggerInterface) {
-            trigger_error(sprintf('Using an instance of "%s" is deprecated since version 2.3. Use Psr\Log\LoggerInterface instead.', get_class($logger)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Using an instance of "%s" is deprecated since version 2.3. Use Psr\Log\LoggerInterface instead.', get_class($logger)), E_USER_DEPRECATED);
         }
         $this->logger = $logger;
     }

composer.json

@@ -35,13 +35,13 @@
     "suggest": {
         "sonata-project/admin-bundle": "To be able to use MessageAdmin.",
         "sonata-project/doctrine-orm-admin-bundle": "^3.0",
-        "guzzle/guzzle" : "^3.9",
+        "guzzlehttp/guzzle" : "If you want to get a status report when using the rabbitMQ backend.",
         "liip/monitor-bundle": "^1.0",
         "php-amqplib/php-amqplib": "^2.0"
     },
     "require-dev": {
         "sonata-project/doctrine-orm-admin-bundle": "^3.0",
-        "guzzle/guzzle" : "^3.8",
+        "guzzlehttp/guzzle" : "^3.8",
         "php-amqplib/php-amqplib": "^2.0",
         "liip/monitor-bundle": "^2.0",
         "symfony/phpunit-bridge": "^2.7 || ^3.0",