fix: improve php library tutorial

Author: ramunasd

php/README.md

@@ -7,12 +7,12 @@ To successfully use the examples you will need a running RabbitMQ server.
 
 ## Requirements
 
-### PHP 7.0+
+### PHP 7.2+
 
-You need `PHP 7.0` and `php-amqplib`. To get these
+You need `PHP 7.2` and `php-amqplib`. To get these
 dependencies on Ubuntu type:
 
-    sudo apt-get install git-core php5-cli
+    sudo apt-get install git-core php-cli
 
 
 ### Composer
@@ -27,11 +27,11 @@ Then you can install `php-amqplib` using [Composer](https://getcomposer.org).
 To do that install Composer and add it to your path, then run the following command
 inside this project folder:
 
-    composer.phar install
+    php composer.phar install
 
 Or you can require it to the existing project using a command:
 
-    composer.phar require php-amqplib/php-amqplib
+    php composer.phar require php-amqplib/php-amqplib
 
 ## Code
 

php/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "php-amqplib/php-amqplib": ">=3.0"
+        "php-amqplib/php-amqplib": "^3.2"
     }
 }

php/receive.php

@@ -11,15 +11,16 @@
 echo " [*] Waiting for messages. To exit press CTRL+C\n";
 
 $callback = function ($msg) {
-    echo ' [x] Received ', $msg->body, "\n";
+    echo ' [x] Received ', $msg->getBody(), "\n";
 };
 
 $channel->basic_consume('hello', '', false, true, false, false, $callback);
 
-while ($channel->is_open()) {
-    $channel->wait();
+try {
+    $channel->consume();
+} catch (\Throwable $exception) {
+    echo $exception->getMessage();
 }
 
 $channel->close();
 $connection->close();
-?>

php/receive_logs.php

@@ -15,15 +15,16 @@
 echo " [*] Waiting for logs. To exit press CTRL+C\n";
 
 $callback = function ($msg) {
-    echo ' [x] ', $msg->body, "\n";
+    echo ' [x] ', $msg->getBody(), "\n";
 };
 
 $channel->basic_consume($queue_name, '', false, true, false, false, $callback);
 
-while ($channel->is_open()) {
-    $channel->wait();
+try {
+    $channel->consume();
+} catch (\Throwable $exception) {
+    echo $exception->getMessage();
 }
 
 $channel->close();
 $connection->close();
-?>

php/receive_logs_direct.php

@@ -23,15 +23,16 @@
 echo " [*] Waiting for logs. To exit press CTRL+C\n";
 
 $callback = function ($msg) {
-    echo ' [x] ', $msg->delivery_info['routing_key'], ':', $msg->body, "\n";
+    echo ' [x] ', $msg->getRoutingKey(), ':', $msg->getBody(), "\n";
 };
 
 $channel->basic_consume($queue_name, '', false, true, false, false, $callback);
 
-while ($channel->is_open()) {
-    $channel->wait();
+try {
+    $channel->consume();
+} catch (\Throwable $exception) {
+    echo $exception->getMessage();
 }
 
 $channel->close();
 $connection->close();
-?>

php/receive_logs_topic.php

@@ -23,15 +23,16 @@
 echo " [*] Waiting for logs. To exit press CTRL+C\n";
 
 $callback = function ($msg) {
-    echo ' [x] ', $msg->delivery_info['routing_key'], ':', $msg->body, "\n";
+    echo ' [x] ', $msg->getRoutingKey(), ':', $msg->getBody(), "\n";
 };
 
 $channel->basic_consume($queue_name, '', false, true, false, false, $callback);
 
-while ($channel->is_open()) {
-    $channel->wait();
+try {
+    $channel->consume();
+} catch (\Throwable $exception) {
+    echo $exception->getMessage();
 }
 
 $channel->close();
 $connection->close();
-?>

php/rpc_client.php

@@ -45,7 +45,7 @@ public function __construct()
     public function onResponse($rep)
     {
         if ($rep->get('correlation_id') == $this->corr_id) {
-            $this->response = $rep->body;
+            $this->response = $rep->getBody();
         }
     }
 

php/rpc_server.php

@@ -22,29 +22,30 @@ function fib($n)
 
 echo " [x] Awaiting RPC requests\n";
 $callback = function ($req) {
-    $n = intval($req->body);
+    $n = intval($req->getBody());
     echo ' [.] fib(', $n, ")\n";
 
     $msg = new AMQPMessage(
         (string) fib($n),
         array('correlation_id' => $req->get('correlation_id'))
     );
 
-    $req->delivery_info['channel']->basic_publish(
+    $req->getChannel()->basic_publish(
         $msg,
         '',
         $req->get('reply_to')
     );
     $req->ack();
 };
 
-$channel->basic_qos(null, 1, null);
+$channel->basic_qos(null, 1, false);
 $channel->basic_consume('rpc_queue', '', false, false, false, false, $callback);
 
-while ($channel->is_open()) {
-    $channel->wait();
+try {
+    $channel->consume();
+} catch (\Throwable $exception) {
+    echo $exception->getMessage();
 }
 
 $channel->close();
 $connection->close();
-?>

php/worker.php

@@ -11,19 +11,20 @@
 echo " [*] Waiting for messages. To exit press CTRL+C\n";
 
 $callback = function ($msg) {
-    echo ' [x] Received ', $msg->body, "\n";
-    sleep(substr_count($msg->body, '.'));
+    echo ' [x] Received ', $msg->getBody(), "\n";
+    sleep(substr_count($msg->getBody(), '.'));
     echo " [x] Done\n";
     $msg->ack();
 };
 
-$channel->basic_qos(null, 1, null);
+$channel->basic_qos(null, 1, false);
 $channel->basic_consume('task_queue', '', false, false, false, false, $callback);
 
-while ($channel->is_open()) {
-    $channel->wait();
+try {
+    $channel->consume();
+} catch (\Throwable $exception) {
+    echo $exception->getMessage();
 }
 
 $channel->close();
 $connection->close();
-?>