From 8dd52f084445de1fb46ec7072f3d28f4403f45cd Mon Sep 17 00:00:00 2001
From: Alvaro Videla <videlalvaro@gmail.com>
Date: Wed, 31 Jul 2013 18:02:48 +0200
Subject: [PATCH] updates PHP code to new php-amqplib

---
 php/emit_log_direct.php     |  5 +++--
 php/emit_log_topic.php      |  4 +++-
 php/receive_logs_direct.php | 13 +++++++------
 php/receive_logs_topic.php  |  7 ++++---
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/php/emit_log_direct.php b/php/emit_log_direct.php
index d6c1a2f..9629897 100644
--- a/php/emit_log_direct.php
+++ b/php/emit_log_direct.php
@@ -1,11 +1,12 @@
 <?php
 
-require_once(__DIR__ . '/lib/php-amqplib/amqp.inc');
+require_once __DIR__ . '/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Message\AMQPMessage;
 
 $connection = new AMQPConnection('localhost', 5672, 'guest', 'guest');
 $channel = $connection->channel();
 
-
 $channel->exchange_declare('direct_logs', 'direct', false, false, false);
 
 $severity = $argv[1];
diff --git a/php/emit_log_topic.php b/php/emit_log_topic.php
index d1cd72c..e1a39ef 100644
--- a/php/emit_log_topic.php
+++ b/php/emit_log_topic.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once(__DIR__ . '/lib/php-amqplib/amqp.inc');
+require_once __DIR__ . '/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Message\AMQPMessage;
 
 $connection = new AMQPConnection('localhost', 5672, 'guest', 'guest');
 $channel = $connection->channel();
diff --git a/php/receive_logs_direct.php b/php/receive_logs_direct.php
index 355621b..221b0fa 100644
--- a/php/receive_logs_direct.php
+++ b/php/receive_logs_direct.php
@@ -1,23 +1,24 @@
 <?php
 
-require_once(__DIR__ . '/lib/php-amqplib/amqp.inc');
+require_once __DIR__ . '/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPConnection;
 
 $connection = new AMQPConnection('localhost', 5672, 'guest', 'guest');
 $channel = $connection->channel();
 
-
 $channel->exchange_declare('direct_logs', 'direct', false, false, false);
 
 list($queue_name, ,) = $channel->queue_declare("", false, false, true, false);
 
-$serverities = array_slice($argv, 1);
-if(empty($serverities )) {
+$severities = array_slice($argv, 1);
+if(empty($severities )) {
 	file_put_contents('php://stderr', "Usage: $argv[0] [info] [warning] [error]\n");
 	exit(1);
 }
 
-foreach( $serverities as & $severity)
-	$channel->queue_bind($queue_name, 'direct_logs', $severity);
+foreach($severities as $severity) {
+    $channel->queue_bind($queue_name, 'direct_logs', $severity);
+}
 
 echo ' [*] Waiting for logs. To exit press CTRL+C', "\n";
 
diff --git a/php/receive_logs_topic.php b/php/receive_logs_topic.php
index 94bda0e..881d70a 100644
--- a/php/receive_logs_topic.php
+++ b/php/receive_logs_topic.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once(__DIR__ . '/lib/php-amqplib/amqp.inc');
+require_once __DIR__ . '/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPConnection;
 
 $connection = new AMQPConnection('localhost', 5672, 'guest', 'guest');
 $channel = $connection->channel();
 
-
 $channel->exchange_declare('topic_logs', 'topic', false, false, false);
 
 list($queue_name, ,) = $channel->queue_declare("", false, false, true, false);
@@ -16,8 +16,9 @@ if( empty($binding_keys )) {
 	exit(1);
 }
 
-foreach( $binding_keys as & $binding_key)
+foreach($binding_keys as $binding_key) {
 	$channel->queue_bind($queue_name, 'topic_logs', $binding_key);
+}
 
 echo ' [*] Waiting for logs. To exit press CTRL+C', "\n";