fix issue on empty array

mammutgroup · Nov 29, 2016 · 4600135 · 4600135
1 parent 1bc0c8d
commit 4600135
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config/amqp.php b/config/amqp.php
@@ -25,6 +25,7 @@
             'connect_options' 		=> [],
             'ssl_options'     		=> [],
 
+            'exchange_declare'      => env('RABBITMQ_EXCHANGE_DECLARE', true), // create the exchange if not exists
             'exchange'             	=> 'amq.'.env('RABBITMQ_EXCHANGE_TYPE', 'direct'),
             'exchange_type'        	=> env('RABBITMQ_EXCHANGE_TYPE', 'direct'),
             'exchange_passive'     	=> env('RABBITMQ_EXCHANGE_PASSIVE', false),

diff --git a/src/Amqp.php b/src/Amqp.php
@@ -24,7 +24,10 @@ public function publish($routing, $message, array $properties = [])
             ->setup();
 
         $messageProperties = ['content_type' => 'text/plain', 'delivery_mode' => 2];
-        $messageProperties = array_merge($messageProperties, $publisher->getProperty('message_properties'));
+        $mP = $publisher->getProperty('message_properties');
+        if(!empty($mP)){
+            $messageProperties = array_merge($messageProperties,$mP );
+        }
 
         if (is_string($message)) {
             $message = new Message($message, $messageProperties);