Converted coroutines to futures

.editorconfig

@@ -4,5 +4,5 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
-indent_style = spaces
+indent_style = space
 charset = utf-8

.github/workflows/Tests.yaml

@@ -0,0 +1,59 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  Test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - 8.1
+        dependencies:
+          - hi
+          - lo
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Beanstalk
+        run: sudo apt-get install --yes beanstalkd
+
+      - name: Setup PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+
+      - name: Validate composer.json
+        run: composer validate
+
+      - name: Cache dependencies
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: php-${{ matrix.php }}-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}
+          restore-keys: php-${{ matrix.php }}-${{ matrix.dependencies }}-
+
+      - name: Install dependencies ${{ matrix.dependencies == 'lo' && '(lowest)' || '' }}
+        run: composer update --no-interaction --no-progress
+          ${{ matrix.dependencies == 'lo' && '--prefer-lowest' || '' }}
+
+      - name: Run test suite with coverage
+        run: composer test -- --coverage-clover=build/logs/clover.xml
+        env:
+          AMP_TEST_BEANSTALK_INTEGRATION: 1
+
+      - name: Check code style
+        run: composer cs
+
+      - name: Upload test coverage
+        run: composer global require php-coveralls/php-coveralls && php-coveralls -v
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,8 @@
+/.*/
+!/.github/
 /coverage/
 /composer.lock
 /vendor/
 /protocol.txt
-/.php_cs.cache
+/.php-cs-fixer.cache
+.phpunit.result.cache

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,19 +1,18 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
     ->setRiskyAllowed(true)
     ->setRules([
         "@PSR1" => true,
         "@PSR2" => true,
         "braces" => [
             "allow_single_line_closure" => true,
-            "position_after_functions_and_oop_constructs" => "same",
         ],
         "array_syntax" => ["syntax" => "short"],
         "cast_spaces" => true,
         "combine_consecutive_unsets" => true,
         "function_to_constant" => true,
-        "no_multiline_whitespace_before_semicolons" => true,
+        "multiline_whitespace_before_semicolons" => true,
         "no_unused_imports" => true,
         "no_useless_else" => true,
         "no_useless_return" => true,
@@ -27,7 +26,7 @@
         "php_unit_fqcn_annotation" => true,
         "phpdoc_summary" => true,
         "phpdoc_types" => true,
-        "psr4" => true,
+        "psr_autoloading" => true,
         "return_type_declaration" => ["space_before" => "none"],
         "short_scalar_cast" => true,
         "single_blank_line_before_namespace" => true,

composer.json

@@ -13,20 +13,25 @@
             "Amp\\Beanstalk\\": "src"
         }
     },
+    "minimum-stability": "beta",
+    "prefer-stable": true,
     "require": {
-        "amphp/amp": "^2",
-        "amphp/socket": "^1.0",
-        "amphp/uri": "^0.1",
+        "php": "^8.1",
+        "amphp/amp": "^v3.0.0-beta.9",
+        "amphp/socket": "^v2.0.0-beta.6",
+        "amphp/uri": "^0.1.4",
         "symfony/yaml": "^3.3|^4|^5"
     },
     "require-dev": {
-        "amphp/phpunit-util": "^1",
-        "phpunit/phpunit": "^6",
-        "friendsofphp/php-cs-fixer": "^2.3"
+        "amphp/phpunit-util": "^v3.0.0-beta.3",
+        "friendsofphp/php-cs-fixer": "^3.12",
+        "phpunit/phpunit": "^9.5.23"
+    },
+    "scripts": {
+        "test": "phpunit",
+        "cs": "php-cs-fixer fix --dry-run --diff --verbose"
     },
     "config": {
-        "platform": {
-            "php": "7.1.0"
-        }
+        "sort-packages": true
     }
 }

examples/consumer.php

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

examples/producer.php

@@ -3,21 +3,18 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 use Amp\Beanstalk\BeanstalkClient;
-use Amp\Loop;
 
-Loop::run(function () {
-    $beanstalk = new BeanstalkClient("tcp://127.0.0.1:11300");
-    yield $beanstalk->use('foobar');
+$beanstalk = new BeanstalkClient('tcp://127.0.0.1:11300');
+$beanstalk->use('foobar');
 
-    $payload = json_encode([
-        "job" => bin2hex(random_bytes(16)),
-        "type" => "compress-image",
-        "path" => "/path/to/image.png"
-    ]);
+$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);
 
-    echo "Inserted job id: $jobId\n";
+echo "Inserted job id: $jobId\n";
 
-    $beanstalk->quit();
-});
+$beanstalk->quit();

examples/stats.php

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

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<phpunit colors="true">
     <testsuites>
         <testsuite name="Tests">
             <directory>./test</directory>

src/BadFormatException.php

@@ -2,5 +2,6 @@
 
 namespace Amp\Beanstalk;
 
-class BadFormatException extends BeanstalkException {
+class BadFormatException extends BeanstalkException
+{
 }