Merge branch 'php-enqueue:master' into master

Author: mordilion

.github/workflows/ci.yml

@@ -78,11 +78,13 @@ jobs:
       fail-fast: false
       matrix:
         php: ['7.3', '7.4', '8.0']
-        symfony_version: ['4.4.*', '5.2.*']
+        symfony_version: ['5.2.*', '6.0.*']
         dependencies: ['--prefer-lowest', '--prefer-dist']
         exclude:
-          - php: '8.0'
-            symfony_version: '4.4.*'
+          - php: '7.3'
+            symfony_version: '6.0.*'
+          - php: '7.4'
+            symfony_version: '6.0.*'
 
     name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
 
@@ -122,12 +124,14 @@ jobs:
       fail-fast: false
       matrix:
         php: ['7.4', '8.0'] # same as in the container
-        symfony_version: ['4.4.*', '5.2.*']
+        symfony_version: ['5.2.*', '6.0.*']
         dependencies: ['--prefer-lowest', '--prefer-dist']
         rdkafka_action: ['exclude-group', 'group']
         exclude:
-          - php: '8.0'
-            symfony_version: '4.4.*'
+          - php: '7.3'
+            symfony_version: '6.0.*'
+          - php: '7.4'
+            symfony_version: '6.0.*'
 
     name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }}
 

.php_cs.php

@@ -1,24 +1,28 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules(array(
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'short'),
         'combine_consecutive_unsets' => true,
         // one should use PHPUnit methods to set up expected exception instead of annotations
-        'general_phpdoc_annotation_remove' => array('expectedException', 'expectedExceptionMessage', 'expectedExceptionMessageRegExp'),
+        'general_phpdoc_annotation_remove' => ['annotations' =>
+            ['expectedException', 'expectedExceptionMessage', 'expectedExceptionMessageRegExp']
+        ],
         'heredoc_to_nowdoc' => true,
-        'no_extra_consecutive_blank_lines' => array('break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'),
+        'no_extra_blank_lines' => ['tokens' => [
+            'break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']
+        ],
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_order' => true,
-        'psr4' => true,
+        'psr_autoloading' => true,
         'strict_param' => true,
         'native_function_invocation' => false,
     ))

composer.json

@@ -8,19 +8,13 @@
     "cs-lint": "bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff",
     "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git"
-    }
-  ],
   "require": {
     "php": "^7.3|^8.0",
 
     "ext-amqp": "^1.9.3",
     "ext-gearman": "^2.0",
     "ext-mongodb": "^1.5",
-    "ext-rdkafka": "^4.0|^5.0",
+    "ext-rdkafka": "^4.0|^5.0|^6.0",
 
     "queue-interop/amqp-interop": "^0.8.2",
     "queue-interop/queue-interop": "^0.8.1",
@@ -29,7 +23,7 @@
     "doctrine/dbal": "^2.12|^3.1",
     "ramsey/uuid": "^3.5|^4",
     "psr/log": "^1.1 || ^2.0 || ^3.0",
-    "psr/container": "^1 || ^2.0",
+    "psr/container": "^1.1 || ^2.0",
     "makasim/temp-file": "^0.2",
     "google/cloud-pubsub": "^1.4.3",
     "doctrine/orm": "^2.7.4",
@@ -40,13 +34,14 @@
     "stomp-php/stomp-php": "^4.5|^5",
     "php-http/guzzle7-adapter": "^0.1.1",
     "php-http/client-common": "^2.2.1",
-    "richardfullmer/rabbitmq-management-api": "^2.1.1",
+    "andrewmy/rabbitmq-management-api": "^2.1.2",
     "predis/predis": "^1.1",
     "thruway/client": "^0.5.5",
     "thruway/pawl-transport": "^0.5.1",
     "influxdb/influxdb-php": "^1.14",
     "datadog/php-datadogstatsd": "^1.3",
     "guzzlehttp/guzzle": "^7.0.1",
+    "guzzlehttp/psr7": "^1.0",
     "php-http/discovery": "^1.13",
     "voryx/thruway-common": "^1.0.1",
     "react/dns": "^1.4",
@@ -58,23 +53,23 @@
     "phpunit/phpunit": "^9.5",
     "phpstan/phpstan": "^0.12",
     "queue-interop/queue-spec": "^0.6.2",
-    "symfony/browser-kit": "^4.3|^5",
-    "symfony/config": "^4.3|^5",
-    "symfony/process": "^4.3|^5",
-    "symfony/console": "^4.3|^5",
-    "symfony/dependency-injection": "^4.3|^5",
-    "symfony/event-dispatcher": "^4.3|^5",
-    "symfony/expression-language": "^4.3|^5",
-    "symfony/http-kernel": "^4.3|^5",
-    "symfony/filesystem": "^4.3|^5",
-    "symfony/framework-bundle": "^4.3|^5",
-    "symfony/yaml": "^4.3|^5",
+    "symfony/browser-kit": "^5.1|^6.0",
+    "symfony/config": "^5.1|^6.0",
+    "symfony/process": "^5.1|^6.0",
+    "symfony/console": "^5.1|^6.0",
+    "symfony/dependency-injection": "^5.1|^6.0",
+    "symfony/event-dispatcher": "^5.1|^6.0",
+    "symfony/expression-language": "^5.1|^6.0",
+    "symfony/http-kernel": "^5.1|^6.0",
+    "symfony/filesystem": "^5.1|^6.0",
+    "symfony/framework-bundle": "^5.1|^6.0",
+    "symfony/yaml": "^5.1|^6.0",
     "empi89/php-amqp-stubs": "*@dev",
     "doctrine/doctrine-bundle": "^2.0",
     "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^2.0.3",
-    "friendsofphp/php-cs-fixer": "^2",
+    "friendsofphp/php-cs-fixer": "^3.4",
     "dms/phpunit-arraysubset-asserts": "^0.2.1",
     "phpspec/prophecy-phpunit": "^2.0"
   },
@@ -132,7 +127,8 @@
       "ext-mongodb": "1.5",
       "ext-bcmath": "1",
       "ext-mbstring": "1",
-      "ext-mongo": "1.6.14"
+      "ext-mongo": "1.6.14",
+      "ext-sockets": "1"
     },
     "prefer-stable": true
   }

docker/Dockerfile

@@ -22,13 +22,22 @@ RUN set -x && \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-mysql \
         php${PHP_VERSION}-curl \
-        libgearman-dev \
-        php-pear \
         make \
+        g++ \
         unzip \
     && \
-    pecl channel-update pecl.php.net && \
-    pecl install gearman && \
+    update-alternatives --install /usr/bin/php php /usr/bin/php${PHP_VERSION} 100
+
+## gearman
+RUN set -x && \
+    apt-get install -y --no-install-recommends --no-install-suggests \
+        libgearman-dev \
+    && \
+    mkdir -p $HOME/gearman && \
+    cd $HOME/gearman && \
+    git clone https://github.com/php/pecl-networking-gearman.git . && \
+    git checkout gearman-2.1.0 && \
+    phpize && ./configure && make && make install && \
     if [ ! -f /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini ]; then \
         echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini && \
         echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/20-gearman.ini \
@@ -37,16 +46,19 @@ RUN set -x && \
 
 ## librdkafka
 RUN set -x && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests \
-        g++ \
-    && \
     mkdir -p $HOME/librdkafka && \
     cd $HOME/librdkafka && \
     git clone https://github.com/edenhill/librdkafka.git . && \
     git checkout v1.0.0 && \
-    ./configure && make && make install && \
-    pecl install rdkafka && \
+    ./configure && make && make install
+
+## php-rdkafka
+RUN set -x && \
+    mkdir -p $HOME/php-rdkafka && \
+    cd $HOME/php-rdkafka && \
+    git clone https://github.com/arnaud-lb/php-rdkafka.git . && \
+    git checkout 5.0.1 && \
+    phpize && ./configure && make all && make install && \
     echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-rdkafka.ini && \
     echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-rdkafka.ini
 

docker/thruway/Dockerfile

@@ -1,4 +1,4 @@
-FROM makasim/nginx-php-fpm:latest-all-exts
+FROM makasim/nginx-php-fpm:7.4-all-exts
 
 RUN mkdir -p /thruway
 WORKDIR /thruway

docs/bundle/async_events.md

@@ -39,7 +39,7 @@ enqueue:
 
 ## Usage
 
-To make your listener async you have add `async: true` attribute to the tag `kernel.event_listener`, like this:
+To make your listener async you have add `async: true` and `dispatcher: 'enqueue.events.event_dispatcher'` attributes to the tag `kernel.event_listener`, like this:
 
 ```yaml
 # app/config/config.yml
@@ -48,7 +48,7 @@ services:
     acme.foo_listener:
         class: 'AcmeBundle\Listener\FooListener'
         tags:
-            - { name: 'kernel.event_listener', async: true, event: 'foo', method: 'onEvent' }
+            - { name: 'kernel.event_listener', async: true, event: 'foo', method: 'onEvent', dispatcher: 'enqueue.events.event_dispatcher' }
 ```
 
 or to `kernel.event_subscriber`:
@@ -60,7 +60,7 @@ services:
     test_async_subscriber:
         class: 'AcmeBundle\Listener\TestAsyncSubscriber'
         tags:
-            - { name: 'kernel.event_subscriber', async: true }
+            - { name: 'kernel.event_subscriber', async: true, dispatcher: 'enqueue.events.event_dispatcher' }
 ```
 
 That's basically it. The rest of the doc describes advanced features.
@@ -78,7 +78,7 @@ services:
         public: false
         arguments: ['@enqueue.transport.default.context', '@enqueue.events.registry', 'a_queue_name']
         tags:
-          - { name: 'kernel.event_listener', event: 'foo', method: 'onEvent' }
+          - { name: 'kernel.event_listener', event: 'foo', method: 'onEvent', dispatcher: 'enqueue.events.event_dispatcher' }
 ```
 
 

pkg/async-command/composer.json

@@ -9,16 +9,16 @@
         "php": "^7.3|^8.0",
         "enqueue/enqueue": "^0.10",
         "queue-interop/queue-interop": "^0.8",
-        "symfony/console": "^4.3|^5",
-        "symfony/process": "^4.3|^5"
+        "symfony/console": "^5.1|^6.0",
+        "symfony/process": "^5.1|^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "symfony/dependency-injection": "^4.3|^5",
-        "symfony/config": "^4.3|^5",
-        "symfony/http-kernel": "^4.3|^5",
-        "symfony/filesystem": "^4.3|^5",
-        "symfony/yaml": "^4.3|^5",
+        "symfony/dependency-injection": "^5.1|^6.0",
+        "symfony/config": "^5.1|^6.0",
+        "symfony/http-kernel": "^5.1|^6.0",
+        "symfony/filesystem": "^5.1|^6.0",
+        "symfony/yaml": "^5.1|^6.0",
         "enqueue/null": "0.10.x-dev",
         "enqueue/fs": "0.10.x-dev",
         "enqueue/test": "0.10.x-dev"
@@ -31,7 +31,7 @@
         "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
     },
     "suggest": {
-        "symfony/dependency-injection": "^4.3|^5 If you'd like to use async event dispatcher container extension."
+        "symfony/dependency-injection": "^5.1|^6.0 If you'd like to use async event dispatcher container extension."
     },
     "autoload": {
         "psr-4": { "Enqueue\\AsyncCommand\\": "" },

pkg/async-event-dispatcher/AsyncEventDispatcher.php

@@ -2,48 +2,17 @@
 
 namespace Enqueue\AsyncEventDispatcher;
 
-use Symfony\Component\EventDispatcher\Event;
-
-if (class_exists(Event::class)) {
-    /**
-     * Symfony < 5.0.
-     */
-    class AsyncEventDispatcher extends AbstractAsyncEventDispatcher
+class AsyncEventDispatcher extends AbstractAsyncEventDispatcher
+{
+    public function dispatch(object $event, string $eventName = null): object
     {
-        /**
-         * {@inheritdoc}
-         */
-        public function dispatch($event, $eventName = null)
-        {
-            $this->parentDispatch($event, $eventName);
-
-            return $this->trueEventDispatcher->dispatch($event, $eventName);
-        }
+        $this->parentDispatch($event, $eventName);
 
-        protected function parentDispatch($event, $eventName)
-        {
-            parent::dispatch($event, $eventName);
-        }
+        return $this->trueEventDispatcher->dispatch($event, $eventName);
     }
-} else {
-    /**
-     * Symfony >= 5.0.
-     */
-    class AsyncEventDispatcher extends AbstractAsyncEventDispatcher
-    {
-        /**
-         * {@inheritdoc}
-         */
-        public function dispatch(object $event, string $eventName = null): object
-        {
-            $this->parentDispatch($event, $eventName);
 
-            return $this->trueEventDispatcher->dispatch($event, $eventName);
-        }
-
-        protected function parentDispatch($event, $eventName)
-        {
-            return parent::dispatch($event, $eventName);
-        }
+    protected function parentDispatch($event, $eventName)
+    {
+        return parent::dispatch($event, $eventName);
     }
 }