fix rebase namespace

Author: shustrik

RabbitMq/BaseAmqp.php

@@ -1,11 +1,8 @@
 <?php
 
 namespace OldSound\RabbitMqBundle\RabbitMq;
-<<<<<<< 5818690e0890fb32c1d873645f59b33c73e3598c
-use OldSound\RabbitMqBundle\Event\AMQPEvent;
-=======
 
->>>>>>> add shutdown method. When called kernel shutdown, we must close opened connection
+use OldSound\RabbitMqBundle\Event\AMQPEvent;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AbstractConnection;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
@@ -23,35 +20,35 @@ abstract class BaseAmqp
     protected $queueDeclared = false;
     protected $routingKey = '';
     protected $autoSetupFabric = true;
-    protected $basicProperties = ['content_type' => 'text/plain', 'delivery_mode' => 2];
+    protected $basicProperties = array('content_type' => 'text/plain', 'delivery_mode' => 2);
 
     /**
      * @var LoggerInterface
      */
     protected $logger;
 
-    protected $exchangeOptions = [
-        'passive'     => false,
-        'durable'     => true,
+    protected $exchangeOptions = array(
+        'passive' => false,
+        'durable' => true,
         'auto_delete' => false,
-        'internal'    => false,
-        'nowait'      => false,
-        'arguments'   => null,
-        'ticket'      => null,
-        'declare'     => true,
-    ];
-
-    protected $queueOptions = [
-        'name'        => '',
-        'passive'     => false,
-        'durable'     => true,
-        'exclusive'   => false,
+        'internal' => false,
+        'nowait' => false,
+        'arguments' => null,
+        'ticket' => null,
+        'declare' => true,
+    );
+
+    protected $queueOptions = array(
+        'name' => '',
+        'passive' => false,
+        'durable' => true,
+        'exclusive' => false,
         'auto_delete' => false,
-        'nowait'      => false,
-        'arguments'   => null,
-        'ticket'      => null,
-        'declare'     => true,
-    ];
+        'nowait' => false,
+        'arguments' => null,
+        'ticket' => null,
+        'declare' => true,
+    );
 
     /**
      * @var EventDispatcherInterface
@@ -72,11 +69,7 @@ public function __construct(AbstractConnection $conn, AMQPChannel $ch = null, $c
             $this->getChannel();
         }
 
-        $this->consumerTag = empty($consumerTag) ? sprintf(
-            "PHPPROCESS_%s_%s",
-            gethostname(),
-            getmypid()
-        ) : $consumerTag;
+        $this->consumerTag = empty($consumerTag) ? sprintf("PHPPROCESS_%s_%s", gethostname(), getmypid()) : $consumerTag;
 
         $this->logger = new NullLogger();
     }
@@ -138,12 +131,10 @@ public function setChannel(AMQPChannel $ch)
 
     /**
      * @throws \InvalidArgumentException
-     *
-     * @param  array $options
-     *
+     * @param  array                     $options
      * @return void
      */
-    public function setExchangeOptions(array $options = [])
+    public function setExchangeOptions(array $options = array())
     {
         if (!isset($options['name'])) {
             throw new \InvalidArgumentException('You must provide an exchange name');
@@ -158,17 +149,15 @@ public function setExchangeOptions(array $options = [])
 
     /**
      * @param  array $options
-     *
      * @return void
      */
-    public function setQueueOptions(array $options = [])
+    public function setQueueOptions(array $options = array())
     {
         $this->queueOptions = array_merge($this->queueOptions, $options);
     }
 
     /**
      * @param  string $routingKey
-     *
      * @return void
      */
     public function setRoutingKey($routingKey)
@@ -218,8 +207,7 @@ protected function exchangeDeclare()
                 $this->exchangeOptions['internal'],
                 $this->exchangeOptions['nowait'],
                 $this->exchangeOptions['arguments'],
-                $this->exchangeOptions['ticket']
-            );
+                $this->exchangeOptions['ticket']);
 
             $this->exchangeDeclared = true;
         }
@@ -231,16 +219,10 @@ protected function exchangeDeclare()
     protected function queueDeclare()
     {
         if ($this->queueOptions['declare']) {
-            list($queueName, ,) = $this->getChannel()->queue_declare(
-                $this->queueOptions['name'],
-                $this->queueOptions['passive'],
-                $this->queueOptions['durable'],
-                $this->queueOptions['exclusive'],
-                $this->queueOptions['auto_delete'],
-                $this->queueOptions['nowait'],
-                $this->queueOptions['arguments'],
-                $this->queueOptions['ticket']
-            );
+            list($queueName, ,) = $this->getChannel()->queue_declare($this->queueOptions['name'], $this->queueOptions['passive'],
+                $this->queueOptions['durable'], $this->queueOptions['exclusive'],
+                $this->queueOptions['auto_delete'], $this->queueOptions['nowait'],
+                $this->queueOptions['arguments'], $this->queueOptions['ticket']);
 
             if (isset($this->queueOptions['routing_keys']) && count($this->queueOptions['routing_keys']) > 0) {
                 foreach ($this->queueOptions['routing_keys'] as $routingKey) {
@@ -269,32 +251,6 @@ protected function queueBind($queue, $exchange, $routing_key)
         }
     }
 
-    public function setupFabric()
-    {
-        if (!$this->exchangeDeclared) {
-            $this->exchangeDeclare();
-        }
-
-        if (!$this->queueDeclared) {
-            $this->queueDeclare();
-        }
-    }
-
-    /**
-     * disables the automatic SetupFabric when using a consumer or producer
-     */
-    public function disableAutoSetupFabric() {
-        $this->autoSetupFabric = false;
-    }
-
-    /**
-     * @param LoggerInterface $logger
-     */
-    public function setLogger($logger)
-    {
-        $this->logger = $logger;
-    }
-
     /**
      * @param EventDispatcherInterface $eventDispatcher
      *