Rebuild into async only with sync API

0.6.md

@@ -0,0 +1,154 @@
+Breaking changes:
+* Raised minimum PHP version to 8.1+
+* Dropped Event Loop injection and replaced it with the global loop accessor
+
+* Merged `Async` and `Sync` clients into `Client` utilizing fibers
+
+### Sync
+
+`receive.php`:
+```diff
+<?php
+
+use Bunny\Channel;
+use Bunny\Client;
+use Bunny\Message;
+
+require dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+-$client = (new Client())->connect();
++$client = new Client();
+$channel = $client->channel();
+
+$channel->queueDeclare('hello', false, false, false, false);
+
+echo ' [*] Waiting for messages. To exit press CTRL+C', "\n";
+
+-$channel->run(
++$channel->consume(
+    function (Message $message, Channel $channel) {
+        echo " [x] Received ", $message->content, "\n";
+    },
+    'hello',
+    '',
+    false,
+    true,
+);
+```
+
+`send.php`:
+```diff
+<?php
+
+use Bunny\Client;
+
+require dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+-$client = (new Client())->connect();
++$client = new Client();
+$channel = $client->channel();
+$channel->queueDeclare('hello', false, false, false, false);
+$channel->close();
+
+$channel->publish('Hello World!', [], '', 'hello');
+echo " [x] Sent 'Hello World!'\n";
+
+$channel->close();
+$client->disconnect();
+```
+
+### Async
+
+`receive_async.php`:
+```diff
+<?php
+
+use Bunny\Channel;
+-use Bunny\Async\Client;
++use Bunny\Client;
+use Bunny\Message;
+-use React\EventLoop\Factory;
+
+require dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+-$loop = Factory::create();
+
+-(new Client($loop))->connect()->then(function (Client $client) {
+-    return $client->channel();
+-})->then(function (Channel $channel) {
+-    return $channel->queueDeclare('hello', false, false, false, false)->then(function () use ($channel) {
+-        return $channel;
+-    });
+-})->then(function (Channel $channel) {
+-    echo ' [*] Waiting for messages. To exit press CTRL+C', "\n";
+-    $channel->consume(
+-        function (Message $message, Channel $channel, Client $client) {
+-            echo " [x] Received ", $message->content, "\n";
+-        },
+-        'hello',
+-        '',
+-        false,
+-        true
+-    );
+-});
+
++$client = new Client();
++$channel = $client->channel();
+
++$channel->queueDeclare('hello', false, false, false, false);
+
++echo ' [*] Waiting for messages. To exit press CTRL+C', "\n";
+
++$channel->consume(
++    function (Message $message, Channel $channel) {
++        echo " [x] Received ", $message->content, "\n";
++    },
++    'hello',
++    '',
++    false,
++    true,
++);
+
+-$loop->run();
+```
+
+`send.php`:
+```diff
+<?php
+
+use Bunny\Client;
+
+require dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+-$client = (new Client())->connect();
++$client = new Client();
+$channel = $client->channel();
+$channel->queueDeclare('hello', false, false, false, false);
+$channel->close();
+
+$channel->publish('Hello World!', [], '', 'hello');
+echo " [x] Sent 'Hello World!'\n";
+
+$channel->close();
+$client->disconnect();
+```
+
+* Channel::queueBind arguments `string $queue` and `string $exchange` switched argument locations
+```diff
+<?php
+
+use Bunny\Channel;
+use Bunny\Client;
+use Bunny\Message;
+
+require dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+
+$client = new Client();
+$channel = $client->channel();
+
+$channel->exchangeDeclare('logs', 'fanout');
+$queue = $channel->queueDeclare('', false, false, true, false);
+-$channel->queueBind($queue->queue, 'logs');
++$channel->queueBind('logs', $queue->queue);
+```

README.md

@@ -193,26 +193,7 @@ $channel->qos(
 
 ### Asynchronous usage
 
-Bunny supports both synchronous and asynchronous usage utilizing [ReactPHP](https://github.com/reactphp). The following example shows setting up a client and consuming a queue indefinitely.
-
-```php
-(new Async\Client($eventLoop, $options))->connect()->then(function (Async\Client $client) {
-   return $client->channel();
-})->then(function (Channel $channel) {
-   return $channel->qos(0, 5)->then(function () use ($channel) {
-       return $channel;
-   });
-})->then(function (Channel $channel) use ($event) {
-   $channel->consume(
-       function (Message $message, Channel $channel, Async\Client $client) use ($event) {
-           // Handle message
-
-           $channel->ack($message);
-       },
-       'queue_name'
-   );
-});
-```
+**Node: Up to version `v0.5.x` Bunny had two different clients, one sync, and one async. As of `v0.6` both clients have been folder into one: An async client with a sync API.**
 
 ## AMQP interop
 

benchmark/consumer.php

@@ -1,30 +1,30 @@
 <?php
 namespace Bunny;
 
+use Bunny\Message;
+
 require_once __DIR__ . "/../vendor/autoload.php";
 
 $c = new Client();
 $ch = $c->connect()->channel();
 
 $ch->queueDeclare("bench_queue");
 $ch->exchangeDeclare("bench_exchange");
-$ch->queueBind("bench_queue", "bench_exchange");
+$ch->queueBind("bench_exchange", "bench_queue");
 
 $t = null;
 $count = 0;
 
-$ch->run(function (Message $msg, Channel $ch, Client $c) use (&$t, &$count) {
+$ch->consume(function (Message $msg, Channel $ch, Client $c) use (&$t, &$count) {
     if ($t === null) {
         $t = microtime(true);
     }
 
     if ($msg->content === "quit") {
         printf("Pid: %s, Count: %s, Time: %.4f\n", getmypid(), $count, microtime(true) - $t);
-        $c->stop();
+        $c->disconnect();
     } else {
         ++$count;
     }
 
 }, "bench_queue", "", false, true);
-
-$c->disconnect();

benchmark/producer.php

@@ -1,6 +1,8 @@
 <?php
 namespace Bunny;
 
+use Bunny\Client;
+
 require_once __DIR__ . "/../vendor/autoload.php";
 
 $c = new Client();
@@ -9,7 +11,7 @@
 
 $ch->queueDeclare("bench_queue");
 $ch->exchangeDeclare("bench_exchange");
-$ch->queueBind("bench_queue", "bench_exchange");
+$ch->queueBind("bench_exchange", "bench_queue");
 
 $body = <<<EOT
 abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bunny/bunny",
     "type": "library",
-    "description": "Performant pure-PHP AMQP (RabbitMQ) sync/async (ReactPHP) library",
+    "description": "Performant pure-PHP AMQP (RabbitMQ) non-blocking ReactPHP library",
     "keywords": [
         "rabbitmq",
         "rabbit",
@@ -25,29 +25,32 @@
         }
     ],
     "require": {
-        "php": "^7.1 || ^8.0",
-        "react/event-loop": "^1.0 || ^0.5 || ^0.4",
-        "react/promise": "~2.2"
+        "php": "^8.1",
+        "react/event-loop": "^1.5",
+        "react/promise": "^3.1",
+        "react/stream": "^1.3",
+        "react/async": "^4.2",
+        "react/socket": "^1.15",
+        "react/promise-timer": "^1.10",
+        "evenement/evenement": "^3",
+        "react/promise-stream": "^1.7"
     },
     "require-dev": {
         "ext-pcntl": "*",
-        "phpunit/phpunit": "^9.5 || ^7.5.20",
-        "symfony/process": "^6.1 || ^4.4",
-        "phpstan/phpstan": "^1.10"
-    },
-    "suggest": {
-        "ext-pcntl": "For using synchronous AMQP/RabbitMQ client"
+        "phpunit/phpunit": "^9.6",
+        "phpstan/phpstan": "^1.10",
+        "react/child-process": "^0.6.5",
+        "wyrihaximus/react-phpunit-run-tests-in-fiber": "^1"
     },
     "autoload": {
         "psr-4": {
-            "Bunny\\": "src/Bunny/"
+            "Bunny\\": "src/"
         }
     },
     "autoload-dev": {
         "files": ["test/Library/functions.php"],
         "psr-4": {
-            "Bunny\\": "test/Bunny/",
-            "Bunny\\Test\\Library\\": "test/Library/"
+            "Bunny\\Test\\": "test/"
         }
     }
 }