AMPHP v3

.gitignore

@@ -3,3 +3,4 @@
 /vendor/
 /protocol.txt
 /.php_cs.cache
+/.idea/

composer.json

@@ -14,19 +14,19 @@
         }
     },
     "require": {
-        "amphp/amp": "^2",
-        "amphp/socket": "^1.0",
+        "amphp/amp": "^3",
+        "amphp/socket": "^2",
         "amphp/uri": "^0.1",
         "symfony/yaml": "^3.3|^4|^5"
     },
     "require-dev": {
-        "amphp/phpunit-util": "^1",
-        "phpunit/phpunit": "^6",
+        "amphp/phpunit-util": "^v3.0.0",
+        "phpunit/phpunit": "^9",
         "friendsofphp/php-cs-fixer": "^2.3"
     },
     "config": {
         "platform": {
-            "php": "7.1.0"
+            "php": "8.1.0"
         }
     }
 }

docs/index.md

@@ -20,7 +20,7 @@ $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 // can connect to the server with an additional tube query parameter.
 // $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300?tube=foobar");
 
-$systemStats = yield $beanstalk->getSystemStats();
+$systemStats = $beanstalk->getSystemStats()->await();
 
 $readyJobs = $systemStats->currentJobsReady;
 ```

docs/jobs.md

@@ -12,34 +12,34 @@ permalink: /jobs
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
 // This step not required if you included a tube query parameter when creating the client
-$beanstalk->use('foobar');
+$beanstalk->use('foobar')->await();
 
 $payload = json_encode([
     "job" => bin2hex(random_bytes(16)),
     "type" => "compress-image"
     "path" => "/path/to/image.png"
 ]);
 
-$jobId = yield $beanstalk->put($payload);
+$jobId = $beanstalk->put($payload)->await();
 ```
 
 ## Pulling Jobs off a Queue
 
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-$beanstalk->watch('foobar');
+$beanstalk->watch('foobar')->await();
 
-while([$jobId, $jobData] = yield $beanstalk->reserve()) {
+while([$jobId, $jobData] = $beanstalk->reserve()->await()) {
     // Work the job using $jobData
     // Once you're finished, delete the job
-    yield $beanstalk->delete($jobId);
+    $beanstalk->delete($jobId)->await();
 
     // If there was an error, you can bury the job for inspection later
-    yield $beanstalk->bury($jobId);
+    $beanstalk->bury($jobId)->await();
 
     // Of you can release the job, to be picked up by a new worker
-    yield $beanstalk->release($jobId);
+    $beanstalk->release($jobId)->await();
 }
 ```
 
@@ -48,12 +48,12 @@ while([$jobId, $jobData] = yield $beanstalk->reserve()) {
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-$beanstalk->watch('foobar');
+$beanstalk->watch('foobar')->await();
 
-while([$jobId, $jobData] = yield $beanstalk->reserve()) {
+while([$jobId, $jobData] = $beanstalk->reserve()->await()) {
     // Work the job
     // If you still need time to work the job, you can utilize the touch command
-    yield $beantstalk->touch($jobId);
+    $beantstalk->touch($jobId)->await();
 }
 ```
 
@@ -62,6 +62,6 @@ while([$jobId, $jobData] = yield $beanstalk->reserve()) {
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-$jobStats = yield $beanstalk->getJobStats($jobId = 42);
+$jobStats = $beanstalk->getJobStats($jobId = 42)->await();
 $jobStats->state; // ready
 ```

docs/misc.md

@@ -13,7 +13,7 @@ To see what stats are available for the system, checkout the [System](classes/sy
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-$stats = yield $beanstalk->getSystemStats();
+$stats = $beanstalk->getSystemStats()->await();
 ```
 
 ## Close the Connection

docs/tubes.md

@@ -14,20 +14,20 @@ By default Beanstalk will use the default tube for reserving and storing new job
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
 // This will store the job on the "default" tube.
-$jobId = yield $beanstalk->put($payload = json_encode([
+$jobId = $beanstalk->put($payload = json_encode([
     "job" => bin2hex(random_bytes(16)),
     "type" => "compress-image"
     "path" => "/path/to/image.png"
-]););
+]))->await();
 
-$beanstalk->use('foobar');
+$beanstalk->use('foobar')->await();
 
 // This will store the job on the "foobar" tube.
-$jobId = yield $beanstalk->put($payload = json_encode([
+$jobId = $beanstalk->put($payload = json_encode([
     "job" => bin2hex(random_bytes(16)),
     "type" => "compress-image"
     "path" => "/path/to/image.png"
-]));
+]))->await();
 ```
 
 ## Pausing a Tube
@@ -37,7 +37,7 @@ If you need to pause a tube, preventing any new jobs from being reserved, you ca
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-yield $beanstalk->pause($tube = 'foobar');
+$beanstalk->pause($tube = 'foobar')->await();
 ```
 
 ## Watching and Ignoring Tubes
@@ -47,9 +47,9 @@ By default when you reserve a job you'll either pull from the `default` tube, or
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-yield $beanstalk->watch($tube = 'foobar');
-yield $beanstalk->watch($tube = 'barbaz');
-yield $beanstalk->ignore($tube = 'default');
+ $beanstalk->watch($tube = 'foobar')->await();
+ $beanstalk->watch($tube = 'barbaz')->await();
+ $beanstalk->ignore($tube = 'default')->await();
 // Watchlist will contain "foobar" and "barbaz"
 ```
 
@@ -60,11 +60,11 @@ To find out which tubes your connection is currently watching.
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-yield $beanstalk->watch($tube = 'foobar');
-yield $beanstalk->watch($tube = 'barbaz');
-yield $beanstalk->ignore($tube = 'default');
+ $beanstalk->watch($tube = 'foobar')->await();
+ $beanstalk->watch($tube = 'barbaz')->await();
+ $beanstalk->ignore($tube = 'default')->await();
 
-$watchlist = $beanstalk->listWatchedTubes();
+$watchlist = $beanstalk->listWatchedTubes()->await();
 ```
 
 ## Get a List of All Existing Tubes
@@ -74,7 +74,7 @@ If you need to see a list of all the tubes that exist on the server.
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-$tubes = yield $beanstalk->listTubes();
+$tubes =  $beanstalk->listTubes()->await();
 ```
 
 ## Get the Tube Being Used
@@ -84,7 +84,7 @@ To determine which tube your client is currently using.
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-$tube = yield $beanstalk->getUsedTube();
+$tube = $beanstalk->getUsedTube()->await();
 ```
 
 ## Get Tube Stats
@@ -94,5 +94,5 @@ To see what stats are available for a tube, checkout the [Tube](classes/tube) cl
 ```php
 $beanstalk = new Amp\Beanstalk\BeanstalkClient("tcp://127.0.0.1:11300");
 
-$stats = yield $beanstalk->getTubeStats($tube = 'default');
+$stats =  $beanstalk->getTubeStats($tube = 'default')->await();
 ```

examples/consumer.php

@@ -3,16 +3,16 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 use Amp\Beanstalk\BeanstalkClient;
-use Amp\Loop;
+use Revolt\EventLoop;
 
-Loop::run(function () {
+EventLoop::queue(function () {
     $beanstalk = new BeanstalkClient("tcp://127.0.0.1:11300");
-    yield $beanstalk->watch('foobar');
+    $beanstalk->watch('foobar')->await();
 
-    while (list($jobId, $payload) = yield $beanstalk->reserve()) {
+    while (list($jobId, $payload) = $beanstalk->reserve()->await()) {
         echo "Job id: $jobId\n";
         echo "Payload: $payload\n";
 
-        $beanstalk->delete($jobId);
+        $beanstalk->delete($jobId)->await();
     }
 });

examples/producer.php

@@ -3,19 +3,18 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 use Amp\Beanstalk\BeanstalkClient;
-use Amp\Loop;
 
-Loop::run(function () {
+Revolt\EventLoop::queue(function () {
     $beanstalk = new BeanstalkClient("tcp://127.0.0.1:11300");
-    yield $beanstalk->use('foobar');
+    $beanstalk->use('foobar')->await();
 
     $payload = json_encode([
         "job" => bin2hex(random_bytes(16)),
         "type" => "compress-image",
         "path" => "/path/to/image.png"
     ]);
 
-    $jobId = yield $beanstalk->put($payload);
+    $jobId =  $beanstalk->put($payload)->await();
 
     echo "Inserted job id: $jobId\n";
 

examples/stats.php

@@ -4,15 +4,15 @@
 
 use Amp\Beanstalk\BeanstalkClient;
 use Amp\Beanstalk\Stats\System;
-use Amp\Loop;
 
-Loop::run(function () {
+
+Revolt\EventLoop::queue(function () {
     $beanstalk = new BeanstalkClient("tcp://127.0.0.1:11300");
 
     /**
      * @var System $systemStats
      */
-    $systemStats = yield $beanstalk->getSystemStats();
+    $systemStats = $beanstalk->getSystemStats()->await();
     echo "Active connections: {$systemStats->currentConnections}\n";
     echo "Jobs ready: {$systemStats->currentJobsReady}\n";
 

phpunit.xml.dist

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-    <testsuites>
-        <testsuite name="Tests">
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Tests">
+      <directory>./test</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>