diff --git a/.travis.yml b/.travis.yml index 4c6c24e54..8e62e69a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,8 @@ matrix: env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true - php: 7.0 env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true + - php: 7.1 + env: SYMFONY_VERSION=v4.0.0-BETA4 UNIT_TESTS=true - php: 7.1 services: docker env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true @@ -31,6 +33,9 @@ matrix: - php: 7.1 services: docker env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + - php: 7.1 + services: docker + env: SYMFONY_VERSION=v4.0.0-BETA4 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.1 services: docker env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true diff --git a/CHANGELOG.md b/CHANGELOG.md index aa91288d8..458a90c15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change Log +## [0.8.9](https://github.com/php-enqueue/enqueue-dev/tree/0.8.9) (2017-11-21) +[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.8.8...0.8.9) + +- \[rdkafka\] Introduce KeySerializer [\#255](https://github.com/php-enqueue/enqueue-dev/issues/255) +- \[amqp-lib\]\[RabbitMQ\] Publisher Confirms [\#206](https://github.com/php-enqueue/enqueue-dev/issues/206) +- \[client\]\[amqp\] Idea. Add support of dead queues [\#39](https://github.com/php-enqueue/enqueue-dev/issues/39) +- \[docker\] Incorporate amqp ext compilation to docker build process. [\#275](https://github.com/php-enqueue/enqueue-dev/pull/275) ([makasim](https://github.com/makasim)) +- \[fs\] Copy past Symfony's LockHandler \(not awailable in Sf4\). [\#272](https://github.com/php-enqueue/enqueue-dev/pull/272) ([makasim](https://github.com/makasim)) +- Add Symfony4 support [\#269](https://github.com/php-enqueue/enqueue-dev/pull/269) ([makasim](https://github.com/makasim)) +- \[bundle\] use enqueue logo in profiler panel. [\#268](https://github.com/php-enqueue/enqueue-dev/pull/268) ([makasim](https://github.com/makasim)) + +- \[bundle\] Apparently the use case tests have never worked properly. [\#273](https://github.com/php-enqueue/enqueue-dev/pull/273) ([makasim](https://github.com/makasim)) +- \[rdkafka\] do not pass config if it was not set explisitly. [\#263](https://github.com/php-enqueue/enqueue-dev/pull/263) ([makasim](https://github.com/makasim)) + +- \[amqp-ext\] Problem with consume messages [\#274](https://github.com/php-enqueue/enqueue-dev/issues/274) + ## [0.8.8](https://github.com/php-enqueue/enqueue-dev/tree/0.8.8) (2017-11-13) [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.8.7...0.8.8) diff --git a/bin/build-enqueue-dev-image.sh b/bin/build-enqueue-dev-image.sh new file mode 100755 index 000000000..117d547f7 --- /dev/null +++ b/bin/build-enqueue-dev-image.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -e +set -x + +(cd docker && docker build --rm --force-rm --no-cache --pull --squash --tag "enqueue/dev:latest" -f Dockerfile .) +(cd docker && docker login --username="$DOCKER_USER" --password="$DOCKER_PASSWORD") +(cd docker && docker push "enqueue/dev:latest") \ No newline at end of file diff --git a/composer.json b/composer.json index c6aee1200..d92658557 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,8 @@ { "name": "enqueue/enqueue-dev", "type": "project", - "minimum-stability": "stable", + "minimum-stability": "beta", + "homepage": "https://github.com/php-enqueue/enqueue-dev", "require": { "php": ">=5.6", "enqueue/enqueue": "*@dev", @@ -33,13 +34,14 @@ "phpunit/phpunit": "^5", "doctrine/doctrine-bundle": "~1.2", "predis/predis": "^1.1", - "symfony/monolog-bundle": "^2.8|^3", - "symfony/browser-kit": "^2.8|^3", - "symfony/expression-language": "^2.8|^3", - "symfony/event-dispatcher": "^2.8|^3", - "symfony/console": "^2.8|^3", + "symfony/monolog-bundle": "^2.8|^3|^4", + "symfony/browser-kit": "^2.8|^3|^4", + "symfony/expression-language": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.8|^3|^4", + "symfony/console": "^2.8|^3|^4", "friendsofphp/php-cs-fixer": "^2", - "empi89/php-amqp-stubs": "*@dev" + "empi89/php-amqp-stubs": "*@dev", + "php-http/client-common": "^1.7@dev" }, "autoload": { "files": [ @@ -56,7 +58,7 @@ "config": { "bin-dir": "bin", "platform": { - "ext-amqp": "1.7", + "ext-amqp": "1.9.3", "ext-gearman": "1.1", "ext-rdkafka": "3.3" } diff --git a/docker-compose.yml b/docker-compose.yml index a25178854..cf4c3cb2c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,6 @@ version: '2' services: dev: image: enqueue/dev:latest - # build: { context: docker, dockerfile: Dockerfile } depends_on: - rabbitmq - mysql @@ -20,23 +19,23 @@ services: - AMQP_DSN=amqp://guest:guest@rabbitmq:5672/mqdev - AMQPS_DSN=amqps://guest:guest@rabbitmqssl:5671 - DOCTINE_DSN=mysql://root:rootpass@mysql/mqdev - - SYMFONY__RABBITMQ__HOST=rabbitmq - - SYMFONY__RABBITMQ__USER=guest - - SYMFONY__RABBITMQ__PASSWORD=guest - - SYMFONY__RABBITMQ__VHOST=mqdev - - SYMFONY__RABBITMQ__AMQP__PORT=5672 - - SYMFONY__RABBITMQ__STOMP__PORT=61613 - - SYMFONY__DB__DRIVER=pdo_mysql - - SYMFONY__DB__HOST=mysql - - SYMFONY__DB__PORT=3306 - - SYMFONY__DB__NAME=mqdev - - SYMFONY__DB__USER=root - - SYMFONY__DB__PASSWORD=rootpass - - SYMFONY__REDIS__HOST=redis - - SYMFONY__REDIS__PORT=6379 - - AWS__SQS__KEY=$ENQUEUE_AWS__SQS__KEY - - AWS__SQS__SECRET=$ENQUEUE_AWS__SQS__SECRET - - AWS__SQS__REGION=$ENQUEUE_AWS__SQS__REGION + - RABBITMQ_HOST=rabbitmq + - RABBITMQ_USER=guest + - RABBITMQ_PASSWORD=guest + - RABBITMQ_VHOST=mqdev + - RABBITMQ_AMQP__PORT=5672 + - RABBITMQ_STOMP_PORT=61613 + - DOCTRINE_DRIVER=pdo_mysql + - DOCTRINE_HOST=mysql + - DOCTRINE_PORT=3306 + - DOCTRINE_DB_NAME=mqdev + - DOCTRINE_USER=root + - DOCTRINE_PASSWORD=rootpass + - REDIS_HOST=redis + - REDIS_PORT=6379 + - AWS_SQS_KEY=$ENQUEUE_AWS__SQS__KEY + - AWS_SQS_SECRET=$ENQUEUE_AWS__SQS__SECRET + - AWS_SQS_REGION=$ENQUEUE_AWS__SQS__REGION - BEANSTALKD_HOST=beanstalkd - BEANSTALKD_PORT=11300 - BEANSTALKD_DSN=beanstalk://beanstalkd:11300 @@ -48,7 +47,6 @@ services: rabbitmq: image: 'enqueue/rabbitmq:latest' - # build: { context: docker, dockerfile: Dockerfile.rabbitmq } environment: - RABBITMQ_DEFAULT_USER=guest - RABBITMQ_DEFAULT_PASS=guest diff --git a/docker/Dockerfile b/docker/Dockerfile index ffb51d818..7c23fb7ec 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,21 +3,34 @@ FROM formapro/nginx-php-fpm:latest-all-exts ## libs RUN set -x && \ apt-get update && \ - apt-get install -y wget curl openssl ca-certificates nano netcat php-dev php-redis git python + apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php-redis git python + +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends --no-install-suggests php-dev librabbitmq-dev make && \ + mkdir -p $HOME/php-amqp && \ + cd $HOME/php-amqp && \ + git clone https://github.com/pdezwart/php-amqp.git . && git checkout v1.9.3 && \ + phpize --clean && phpize && ./configure && make install ## confis # RUN rm -f /etc/php/7.0/cli/conf.d/*xdebug.ini ## librdkafka -RUN git clone https://github.com/edenhill/librdkafka.git /root/librdkafka -RUN cd /root/librdkafka && git checkout v0.11.0-RC2 && ./configure && make && make install -RUN pecl install rdkafka -RUN echo "extension=rdkafka.so" > /etc/php/7.1/cli/conf.d/10-rdkafka.ini -RUN echo "extension=rdkafka.so" > /etc/php/7.1/fpm/conf.d/10-rdkafka.ini +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php-dev && \ + mkdir -p $HOME/librdkafka && \ + cd $HOME/librdkafka && \ + git clone https://github.com/edenhill/librdkafka.git . && \ + git checkout v0.11.1 && \ + ./configure && make && make install && \ + pecl install rdkafka && \ + echo "extension=rdkafka.so" > /etc/php/7.1/cli/conf.d/10-rdkafka.ini && \ + echo "extension=rdkafka.so" > /etc/php/7.1/fpm/conf.d/10-rdkafka.ini COPY ./php/cli.ini /etc/php/7.1/cli/conf.d/1-dev_cli.ini -COPY ./php/amqp.so /usr/lib/php/20160303/amqp.so COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh RUN chmod u+x /usr/local/bin/entrypoint.sh diff --git a/docker/php/amqp.so b/docker/php/amqp.so deleted file mode 100755 index 442c0bb49..000000000 Binary files a/docker/php/amqp.so and /dev/null differ diff --git a/docs/bundle/quick_tour.md b/docs/bundle/quick_tour.md index cb9b0dcdf..21f157b04 100644 --- a/docs/bundle/quick_tour.md +++ b/docs/bundle/quick_tour.md @@ -9,7 +9,9 @@ It adds easy to use [configuration layer](config_reference.md), register service $ composer require enqueue/enqueue-bundle enqueue/amqp-ext # or enqueue/amqp-bunny, enqueue/amqp-lib ``` -_**Note**: You could use not only AMQP transport but other available: STOMP, Amazon SQS, Redis, Filesystem, Doctrine DBAL and others._ +_**Note**: You could use not only AMQP transport but any other [available](https://github.com/php-enqueue/enqueue-dev/tree/master/docs/transport)._ + +_**Note**: If you are looking for a way to migrate from `php-amqplib/rabbitmq-bundle` read this [article](https://blog.forma-pro.com/the-how-and-why-of-the-migration-from-rabbitmqbundle-to-enqueuebundle-6c4054135e2b)._ ## Enable the Bundle diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json index 165420809..9c452ebf4 100644 --- a/pkg/amqp-bunny/composer.json +++ b/pkg/amqp-bunny/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Amqp Transport", "keywords": ["messaging", "queue", "amqp", "bunny"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -17,8 +18,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\AmqpBunny\\": "" }, diff --git a/pkg/amqp-ext/AmqpConnectionFactory.php b/pkg/amqp-ext/AmqpConnectionFactory.php index c6127133c..a3561b85a 100644 --- a/pkg/amqp-ext/AmqpConnectionFactory.php +++ b/pkg/amqp-ext/AmqpConnectionFactory.php @@ -125,11 +125,17 @@ private function establishConnection() $this->connection = new \AMQPConnection($extConfig); - $this->config->isPersisted() ? $this->connection->pconnect() : $this->connection->connect(); + $this->config->isPersisted() ? + $this->connection->pconnect() : + $this->connection->connect() + ; } if (false == $this->connection->isConnected()) { - $this->config->isPersisted() ? $this->connection->preconnect() : $this->connection->reconnect(); + $this->config->isPersisted() ? + $this->connection->preconnect() : + $this->connection->reconnect() + ; } return $this->connection; diff --git a/pkg/amqp-ext/Tests/fix_composer_json.php b/pkg/amqp-ext/Tests/fix_composer_json.php index fc430e276..f025f6081 100644 --- a/pkg/amqp-ext/Tests/fix_composer_json.php +++ b/pkg/amqp-ext/Tests/fix_composer_json.php @@ -4,6 +4,6 @@ $composerJson = json_decode(file_get_contents(__DIR__.'/../composer.json'), true); -$composerJson['config']['platform']['ext-amqp'] = '1.7'; +$composerJson['config']['platform']['ext-amqp'] = '1.9.3'; file_put_contents(__DIR__.'/../composer.json', json_encode($composerJson, JSON_PRETTY_PRINT)); diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json index 7068da14e..90400e471 100644 --- a/pkg/amqp-ext/composer.json +++ b/pkg/amqp-ext/composer.json @@ -3,10 +3,11 @@ "type": "library", "description": "Message Queue Amqp Transport", "keywords": ["messaging", "queue", "amqp"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", - "ext-amqp": "^1.6", + "ext-amqp": "^1.9.3", "queue-interop/amqp-interop": "^0.7@dev", "enqueue/amqp-tools": "^0.8.4@dev" @@ -18,8 +19,8 @@ "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", "empi89/php-amqp-stubs": "*@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\AmqpExt\\": "" }, diff --git a/pkg/amqp-ext/examples/consume.php b/pkg/amqp-ext/examples/consume.php index ece61b1d4..ab13cece9 100644 --- a/pkg/amqp-ext/examples/consume.php +++ b/pkg/amqp-ext/examples/consume.php @@ -18,11 +18,11 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), ]; $factory = new AmqpConnectionFactory($config); diff --git a/pkg/amqp-ext/examples/produce.php b/pkg/amqp-ext/examples/produce.php index a905e49be..d529a3431 100644 --- a/pkg/amqp-ext/examples/produce.php +++ b/pkg/amqp-ext/examples/produce.php @@ -21,11 +21,11 @@ use Interop\Amqp\Impl\AmqpBind; $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), ]; $factory = new AmqpConnectionFactory($config); diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json index 5fbe10e18..d0599e0b5 100644 --- a/pkg/amqp-lib/composer.json +++ b/pkg/amqp-lib/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Amqp Transport", "keywords": ["messaging", "queue", "amqp"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -17,8 +18,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\AmqpLib\\": "" }, diff --git a/pkg/amqp-lib/examples/consume.php b/pkg/amqp-lib/examples/consume.php index 9af598bc5..4acca541d 100644 --- a/pkg/amqp-lib/examples/consume.php +++ b/pkg/amqp-lib/examples/consume.php @@ -18,11 +18,11 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), 'receive_method' => 'basic_consume', ]; diff --git a/pkg/amqp-lib/examples/produce.php b/pkg/amqp-lib/examples/produce.php index 4f9a83192..4b3ff025a 100644 --- a/pkg/amqp-lib/examples/produce.php +++ b/pkg/amqp-lib/examples/produce.php @@ -21,11 +21,11 @@ use Interop\Amqp\Impl\AmqpBind; $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), ]; $factory = new AmqpConnectionFactory($config); diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json index f05356be9..50504c6d4 100644 --- a/pkg/amqp-tools/composer.json +++ b/pkg/amqp-tools/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Amqp Tools", "keywords": ["messaging", "queue", "amqp"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", diff --git a/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php b/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php index 160999d03..d417bcedd 100644 --- a/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php +++ b/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php @@ -4,6 +4,7 @@ use Enqueue\AsyncEventDispatcher\OldAsyncEventDispatcher; use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Extension\Extension; @@ -20,7 +21,7 @@ public function load(array $configs, ContainerBuilder $container) { $config = $this->processConfiguration(new Configuration(), $configs); - $container->setAlias('enqueue.events.context', $config['context_service']); + $container->setAlias('enqueue.events.context', new Alias($config['context_service'], true)); $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); diff --git a/pkg/async-event-dispatcher/Resources/config/services.yml b/pkg/async-event-dispatcher/Resources/config/services.yml index 94dd698e9..e2916058f 100644 --- a/pkg/async-event-dispatcher/Resources/config/services.yml +++ b/pkg/async-event-dispatcher/Resources/config/services.yml @@ -14,17 +14,20 @@ services: enqueue.events.async_listener: class: 'Enqueue\AsyncEventDispatcher\AsyncListener' + public: public arguments: ['@enqueue.events.context', '@enqueue.events.registry', '%enqueue_events_queue%'] enqueue.events.event_dispatcher: class: 'Enqueue\AsyncEventDispatcher\AsyncEventDispatcher' + public: public arguments: - '@event_dispatcher' - '@enqueue.events.async_listener' enqueue.events.async_processor: class: 'Enqueue\AsyncEventDispatcher\AsyncProcessor' + public: public arguments: - '@enqueue.events.registry' - '@enqueue.events.event_dispatcher' @@ -39,6 +42,7 @@ services: enqueue.events.php_serializer_event_transofrmer: class: 'Enqueue\AsyncEventDispatcher\PhpSerializerEventTransformer' + public: public arguments: - '@enqueue.events.context' tags: diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index 35e39f3ac..0e416d893 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -1,26 +1,27 @@ { "name": "enqueue/async-event-dispatcher", "type": "library", - "description": "Symfony async event dispathcer", + "description": "Symfony async event dispatcher", "keywords": ["messaging", "queue", "async event", "event dispatcher"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", "enqueue/enqueue": "^0.8@dev", - "symfony/event-dispatcher": "^2.8|^3" + "symfony/event-dispatcher": "^2.8|^3|^4" }, "require-dev": { "phpunit/phpunit": "~5.5", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3", - "symfony/http-kernel": "^2.8|^3", - "symfony/filesystem": "^2.8|^3", + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4", + "symfony/http-kernel": "^2.8|^3|^4", + "symfony/filesystem": "^2.8|^3|^4", "enqueue/null": "^0.8@dev", "enqueue/fs": "^0.8@dev", "enqueue/test": "^0.8@dev" }, "suggest": { - "symfony/dependency-injection": "^2.8|^3 If you'd like to use async event dispatcher container extension." + "symfony/dependency-injection": "^2.8|^3|^4 If you'd like to use async event dispatcher container extension." }, "autoload": { "psr-4": { "Enqueue\\AsyncEventDispatcher\\": "" }, diff --git a/pkg/dbal/Symfony/DbalTransportFactory.php b/pkg/dbal/Symfony/DbalTransportFactory.php index 11e26ccbb..1deb22416 100644 --- a/pkg/dbal/Symfony/DbalTransportFactory.php +++ b/pkg/dbal/Symfony/DbalTransportFactory.php @@ -100,6 +100,7 @@ public function createContext(ContainerBuilder $container, array $config) $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); $context = new Definition(DbalContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); @@ -114,6 +115,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(DbalDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index 94c931356..15197f7f4 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Doctrine DBAL Transport", "keywords": ["messaging", "queue", "doctrine", "dbal"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -15,8 +16,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Dbal\\": "" }, diff --git a/pkg/dbal/examples/consume.php b/pkg/dbal/examples/consume.php index 1ad3061e6..0fc0eae93 100644 --- a/pkg/dbal/examples/consume.php +++ b/pkg/dbal/examples/consume.php @@ -19,12 +19,12 @@ $config = [ 'connection' => [ - 'dbname' => getenv('SYMFONY__DB__NAME'), - 'user' => getenv('SYMFONY__DB__USER'), - 'password' => getenv('SYMFONY__DB__PASSWORD'), - 'host' => getenv('SYMFONY__DB__HOST'), - 'port' => getenv('SYMFONY__DB__PORT'), - 'driver' => getenv('SYMFONY__DB__DRIVER'), + 'dbname' => getenv('DOCTRINE_DB_NAME'), + 'user' => getenv('DOCTRINE_USER'), + 'password' => getenv('DOCTRINE_PASSWORD'), + 'host' => getenv('DOCTRINE_HOST'), + 'port' => getenv('DOCTRINE_PORT'), + 'driver' => getenv('DOCTRINE_DRIVER'), ], ]; diff --git a/pkg/dbal/examples/produce.php b/pkg/dbal/examples/produce.php index 2a8ceece7..31befb24a 100644 --- a/pkg/dbal/examples/produce.php +++ b/pkg/dbal/examples/produce.php @@ -19,12 +19,12 @@ $config = [ 'connection' => [ - 'dbname' => getenv('SYMFONY__DB__NAME'), - 'user' => getenv('SYMFONY__DB__USER'), - 'password' => getenv('SYMFONY__DB__PASSWORD'), - 'host' => getenv('SYMFONY__DB__HOST'), - 'port' => getenv('SYMFONY__DB__PORT'), - 'driver' => getenv('SYMFONY__DB__DRIVER'), + 'dbname' => getenv('DOCTRINE_DB_NAME'), + 'user' => getenv('DOCTRINE_USER'), + 'password' => getenv('DOCTRINE_PASSWORD'), + 'host' => getenv('DOCTRINE_HOST'), + 'port' => getenv('DOCTRINE_PORT'), + 'driver' => getenv('DOCTRINE_DRIVER'), ], ]; diff --git a/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php b/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php index b3e2b5f0f..86bdd7456 100644 --- a/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php +++ b/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php @@ -82,4 +82,12 @@ public function getName() { return 'enqueue.message_queue'; } + + /** + * {@inheritdoc} + */ + public function reset() + { + $this->data = []; + } } diff --git a/pkg/enqueue-bundle/Resources/config/client.yml b/pkg/enqueue-bundle/Resources/config/client.yml index 539abfcc3..b87bec7a0 100644 --- a/pkg/enqueue-bundle/Resources/config/client.yml +++ b/pkg/enqueue-bundle/Resources/config/client.yml @@ -5,6 +5,7 @@ services: Enqueue\Client\Producer: class: 'Enqueue\Client\Producer' + public: true arguments: - '@enqueue.client.driver' - '@enqueue.client.rpc_factory' @@ -12,27 +13,33 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.producer: + public: true alias: 'Enqueue\Client\Producer' # Deprecated. To be removed in 0.10. enqueue.producer: + public: true alias: 'enqueue.client.producer' # Deprecated. To be removed in 0.10. enqueue.client.producer_v2: + public: true alias: 'enqueue.client.producer' Enqueue\Client\SpoolProducer: class: 'Enqueue\Client\SpoolProducer' + public: true arguments: - '@Enqueue\Client\Producer' # Deprecated. To be removed in 0.10. enqueue.client.spool_producer: + public: true alias: 'Enqueue\Client\SpoolProducer' # Deprecated. To be removed in 0.10. enqueue.spool_producer: + public: true alias: 'enqueue.client.spool_producer' enqueue.client.extensions: @@ -62,6 +69,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.router_processor: + public: true alias: 'Enqueue\Client\RouterProcessor' enqueue.client.processor_registry: @@ -77,6 +85,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.topic_meta_registry: + public: true alias: 'Enqueue\Client\Meta\TopicMetaRegistry' Enqueue\Client\Meta\QueueMetaRegistry: @@ -86,6 +95,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.queue_meta_registry: + public: true alias: 'Enqueue\Client\Meta\QueueMetaRegistry' enqueue.client.delegate_processor: @@ -124,6 +134,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.consume_messages_command: + public: true alias: 'Enqueue\Symfony\Client\ConsumeMessagesCommand' Enqueue\Symfony\Client\ProduceMessageCommand: @@ -136,10 +147,12 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.produce_message_command: + public: true alias: 'Enqueue\Symfony\Client\ProduceMessageCommand' Enqueue\Symfony\Client\Meta\TopicsCommand: class: 'Enqueue\Symfony\Client\Meta\TopicsCommand' + public: true arguments: - '@Enqueue\Client\Meta\TopicMetaRegistry' tags: @@ -147,10 +160,12 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.topics_command: + public: true alias: 'Enqueue\Symfony\Client\Meta\TopicsCommand' Enqueue\Symfony\Client\Meta\QueuesCommand: class: 'Enqueue\Symfony\Client\Meta\QueuesCommand' + public: true arguments: - '@Enqueue\Client\Meta\QueueMetaRegistry' tags: @@ -158,6 +173,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.queues_command: + public: true alias: 'Enqueue\Symfony\Client\Meta\QueuesCommand' Enqueue\Symfony\Client\SetupBrokerCommand: @@ -170,6 +186,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.setup_broker_command: + public: true alias: 'Enqueue\Symfony\Client\SetupBrokerCommand' enqueue.profiler.message_queue_collector: @@ -182,6 +199,7 @@ services: Enqueue\Symfony\Client\FlushSpoolProducerListener: class: 'Enqueue\Symfony\Client\FlushSpoolProducerListener' + public: true arguments: - '@Enqueue\Client\SpoolProducer' tags: @@ -189,4 +207,5 @@ services: # Deprecated. To be removed in 0.10. enqueue.flush_spool_producer_listener: + public: true alias: 'Enqueue\Symfony\Client\FlushSpoolProducerListener' diff --git a/pkg/enqueue-bundle/Resources/config/job.yml b/pkg/enqueue-bundle/Resources/config/job.yml index d8db70793..159aecc61 100644 --- a/pkg/enqueue-bundle/Resources/config/job.yml +++ b/pkg/enqueue-bundle/Resources/config/job.yml @@ -4,6 +4,7 @@ parameters: services: Enqueue\JobQueue\Doctrine\JobStorage: class: 'Enqueue\JobQueue\Doctrine\JobStorage' + public: true arguments: - '@doctrine' - 'Enqueue\JobQueue\Doctrine\Entity\Job' @@ -11,38 +12,46 @@ services: # Deprecated. To be removed in 0.10. enqueue.job.storage: + public: true alias: 'Enqueue\JobQueue\Doctrine\JobStorage' Enqueue\JobQueue\JobProcessor: class: 'Enqueue\JobQueue\JobProcessor' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' - '@Enqueue\Client\Producer' # Deprecated. To be removed in 0.10. enqueue.job.processor: + public: true alias: 'Enqueue\JobQueue\JobProcessor' Enqueue\JobQueue\JobRunner: class: 'Enqueue\JobQueue\JobRunner' + public: true arguments: - '@Enqueue\JobQueue\JobProcessor' # Deprecated. To be removed in 0.10. enqueue.job.runner: + public: true alias: 'Enqueue\JobQueue\JobRunner' Enqueue\JobQueue\CalculateRootJobStatusService: class: 'Enqueue\JobQueue\CalculateRootJobStatusService' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' # Deprecated. To be removed in 0.10. enqueue.job.calculate_root_job_status_service: + public: true alias: 'Enqueue\JobQueue\CalculateRootJobStatusService' Enqueue\JobQueue\CalculateRootJobStatusProcessor: class: 'Enqueue\JobQueue\CalculateRootJobStatusProcessor' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' - '@Enqueue\JobQueue\CalculateRootJobStatusService' @@ -53,10 +62,12 @@ services: # Deprecated. To be removed in 0.10. enqueue.job.calculate_root_job_status_processor: + public: true alias: 'Enqueue\JobQueue\CalculateRootJobStatusProcessor' Enqueue\JobQueue\DependentJobProcessor: class: 'Enqueue\JobQueue\DependentJobProcessor' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' - '@Enqueue\Client\Producer' @@ -66,13 +77,16 @@ services: # Deprecated. To be removed in 0.10. enqueue.job.dependent_job_processor: + public: true alias: 'Enqueue\JobQueue\DependentJobProcessor' Enqueue\JobQueue\DependentJobService: class: 'Enqueue\JobQueue\DependentJobService' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' # Deprecated. To be removed in 0.10. enqueue.job.dependent_job_service: + public: true alias: 'Enqueue\JobQueue\DependentJobService' diff --git a/pkg/enqueue-bundle/Resources/config/services.yml b/pkg/enqueue-bundle/Resources/config/services.yml index 21a58dfdc..452ab315b 100644 --- a/pkg/enqueue-bundle/Resources/config/services.yml +++ b/pkg/enqueue-bundle/Resources/config/services.yml @@ -7,6 +7,7 @@ services: Enqueue\Consumption\QueueConsumer: class: 'Enqueue\Consumption\QueueConsumer' + public: true arguments: - '@enqueue.transport.context' - '@enqueue.consumption.extensions' @@ -15,10 +16,12 @@ services: # Deprecated. To be removed in 0.10. enqueue.consumption.queue_consumer: + public: true alias: 'Enqueue\Consumption\QueueConsumer' Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand: class: 'Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand' + public: true arguments: - '@Enqueue\Consumption\QueueConsumer' tags: @@ -26,6 +29,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.command.consume_messages: + public: true alias: 'Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand' enqueue.transport.rpc_factory: @@ -36,10 +40,12 @@ services: Enqueue\Rpc\RpcClient: class: 'Enqueue\Rpc\RpcClient' + public: true arguments: - '@enqueue.transport.context' - '@enqueue.transport.rpc_factory' # Deprecated. To be removed in 0.10. enqueue.transport.rpc_client: + public: true alias: 'Enqueue\Rpc\RpcClient' diff --git a/pkg/enqueue-bundle/Resources/views/Icon/icon.svg b/pkg/enqueue-bundle/Resources/views/Icon/icon.svg index 6a3179b4e..fc7b60cc9 100644 --- a/pkg/enqueue-bundle/Resources/views/Icon/icon.svg +++ b/pkg/enqueue-bundle/Resources/views/Icon/icon.svg @@ -1,9 +1,36 @@ - - - - + + + + + + Layer 1 + + + + + + + + + + + + + Layer 2 + + + + background + + + \ No newline at end of file diff --git a/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php b/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php index e2ed065a3..59ac38666 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php @@ -46,6 +46,21 @@ public function registerContainerConfiguration(LoaderInterface $loader) $loader->load(__DIR__.'/config/config.yml'); } + protected function getKernelParameters() + { + $parameters = parent::getKernelParameters(); + + // it works in all Symfony version, 2.8, 3.x, 4.x + $parameters['db.driver'] = getenv('DOCTRINE_DRIVER'); + $parameters['db.host'] = getenv('DOCTRINE_HOST'); + $parameters['db.port'] = getenv('DOCTRINE_PORT'); + $parameters['db.name'] = getenv('DOCTRINE_DB_NAME'); + $parameters['db.user'] = getenv('DOCTRINE_USER'); + $parameters['db.password'] = getenv('DOCTRINE_PASSWORD'); + + return $parameters; + } + protected function getContainerClass() { return parent::getContainerClass().'BundleDefault'; diff --git a/pkg/enqueue-bundle/Tests/Functional/App/CustomAppKernel.php b/pkg/enqueue-bundle/Tests/Functional/App/CustomAppKernel.php index b5043aa26..574dc6b39 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/CustomAppKernel.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/CustomAppKernel.php @@ -13,6 +13,8 @@ class CustomAppKernel extends Kernel { use MicroKernelTrait; + private $enqueueConfigId; + private $enqueueConfig = [ 'client' => [ 'prefix' => 'enqueue', @@ -25,11 +27,13 @@ class CustomAppKernel extends Kernel public function setEnqueueConfig(array $config) { - $fs = new Filesystem(); - $fs->remove(sys_get_temp_dir().'/EnqueueBundleCustom/cache'); - $fs->mkdir(sys_get_temp_dir().'/EnqueueBundleCustom/cache'); - $this->enqueueConfig = array_replace_recursive($this->enqueueConfig, $config); + $this->enqueueConfig['client']['app_name'] = str_replace('.', '', uniqid(true)); + $this->enqueueConfigId = md5(json_encode($this->enqueueConfig)); + + $fs = new Filesystem(); + $fs->remove(sys_get_temp_dir().'/EnqueueBundleCustom/cache/'.$this->enqueueConfigId); + $fs->mkdir(sys_get_temp_dir().'/EnqueueBundleCustom/cache/'.$this->enqueueConfigId); } /** @@ -52,7 +56,7 @@ public function registerBundles() */ public function getCacheDir() { - return sys_get_temp_dir().'/EnqueueBundleCustom/cache'; + return sys_get_temp_dir().'/EnqueueBundleCustom/cache/'.$this->enqueueConfigId; } /** @@ -60,12 +64,12 @@ public function getCacheDir() */ public function getLogDir() { - return sys_get_temp_dir().'/EnqueueBundleCustom/cache/logs'; + return sys_get_temp_dir().'/EnqueueBundleCustom/cache/logs/'.$this->enqueueConfigId; } protected function getContainerClass() { - return parent::getContainerClass().'Custom'; + return parent::getContainerClass().'Custom'.$this->enqueueConfigId; } /** diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml index d5f2dc07f..aa1d645ff 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml +++ b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml @@ -44,26 +44,31 @@ enqueue: services: test_async_listener: class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncListener' + public: true tags: - { name: 'kernel.event_listener', async: true, event: 'test_async', method: 'onEvent' } test_command_subscriber_processor: class: 'Enqueue\Bundle\Tests\Functional\App\TestCommandSubscriberProcessor' + public: true tags: - { name: 'enqueue.client.processor' } test_exclusive_command_subscriber_processor: class: 'Enqueue\Bundle\Tests\Functional\App\TestExclusiveCommandSubscriberProcessor' + public: true tags: - { name: 'enqueue.client.processor' } test_async_subscriber: class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncSubscriber' + public: true tags: - { name: 'kernel.event_subscriber', async: true } test_async_event_transformer: class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncEventTransformer' + public: true arguments: - '@enqueue.transport.default.context' tags: @@ -73,4 +78,5 @@ services: # overwrite async listener with one based on client producer. so we can use traceable producer. enqueue.events.async_listener: class: 'Enqueue\Bundle\Tests\Functional\App\AsyncListener' + public: true arguments: ['@Enqueue\Client\Producer', '@enqueue.events.registry'] \ No newline at end of file diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml index d99f650d2..9bcc45a30 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml +++ b/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml @@ -24,10 +24,12 @@ monolog: services: test.message.processor: class: 'Enqueue\Bundle\Tests\Functional\TestProcessor' + public: true tags: - { name: 'enqueue.client.processor' } test.message.command_processor: class: 'Enqueue\Bundle\Tests\Functional\TestCommandProcessor' + public: true tags: - { name: 'enqueue.client.processor' } diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php index 9c633b3d1..69793bf4b 100644 --- a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php +++ b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php @@ -6,11 +6,14 @@ use Enqueue\Client\DriverInterface; use Enqueue\Client\Producer; use Enqueue\Client\ProducerInterface; +use Enqueue\Stomp\StompDestination; use Enqueue\Symfony\Client\ConsumeMessagesCommand; use Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand; use Interop\Queue\PsrContext; use Interop\Queue\PsrMessage; +use Interop\Queue\PsrQueue; use Symfony\Component\Console\Tester\CommandTester; +use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpKernel\Kernel; /** @@ -24,6 +27,21 @@ public function setUp() // parent::setUp(); } + public function tearDown() + { + if ($this->getPsrContext()) { + $this->getPsrContext()->close(); + } + + if (static::$kernel) { + $fs = new Filesystem(); + $fs->remove(static::$kernel->getLogDir()); + $fs->remove(static::$kernel->getCacheDir()); + } + + parent::tearDown(); + } + public function provideEnqueueConfigs() { $baseDir = realpath(__DIR__.'/../../../../'); @@ -39,11 +57,11 @@ public function provideEnqueueConfigs() 'default' => 'amqp', 'amqp' => [ 'driver' => 'ext', - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), 'lazy' => false, ], ], @@ -90,16 +108,17 @@ public function provideEnqueueConfigs() ], ]]; - yield 'stomp' => [[ + yield 'rabbitmq_stomp' => [[ 'transport' => [ - 'default' => 'stomp', - 'stomp' => [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'), - 'login' => getenv('SYMFONY__RABBITMQ__USER'), - 'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'default' => 'rabbitmq_stomp', + 'rabbitmq_stomp' => [ + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_STOMP_PORT'), + 'login' => getenv('RABBITMQ_USER'), + 'password' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), 'lazy' => false, + 'management_plugin_installed' => true, ], ], ]]; @@ -108,8 +127,8 @@ public function provideEnqueueConfigs() 'transport' => [ 'default' => 'redis', 'redis' => [ - 'host' => getenv('SYMFONY__REDIS__HOST'), - 'port' => (int) getenv('SYMFONY__REDIS__PORT'), + 'host' => getenv('REDIS_HOST'), + 'port' => (int) getenv('REDIS_PORT'), 'vendor' => 'predis', 'lazy' => false, ], @@ -120,8 +139,8 @@ public function provideEnqueueConfigs() 'transport' => [ 'default' => 'redis', 'redis' => [ - 'host' => getenv('SYMFONY__REDIS__HOST'), - 'port' => (int) getenv('SYMFONY__REDIS__PORT'), + 'host' => getenv('REDIS_HOST'), + 'port' => (int) getenv('REDIS_PORT'), 'vendor' => 'phpredis', 'lazy' => false, ], @@ -155,12 +174,12 @@ public function provideEnqueueConfigs() 'default' => 'dbal', 'dbal' => [ 'connection' => [ - 'dbname' => getenv('SYMFONY__DB__NAME'), - 'user' => getenv('SYMFONY__DB__USER'), - 'password' => getenv('SYMFONY__DB__PASSWORD'), - 'host' => getenv('SYMFONY__DB__HOST'), - 'port' => getenv('SYMFONY__DB__PORT'), - 'driver' => getenv('SYMFONY__DB__DRIVER'), + 'dbname' => getenv('DOCTRINE_DB_NAME'), + 'user' => getenv('DOCTRINE_USER'), + 'password' => getenv('DOCTRINE_PASSWORD'), + 'host' => getenv('DOCTRINE_HOST'), + 'port' => getenv('DOCTRINE_PORT'), + 'driver' => getenv('DOCTRINE_DRIVER'), ], ], ], @@ -177,19 +196,19 @@ public function provideEnqueueConfigs() 'transport' => [ 'default' => 'sqs', 'sqs' => [ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), + 'key' => getenv('AWS_SQS_KEY'), + 'secret' => getenv('AWS_SQS_SECRET'), + 'region' => getenv('AWS_SQS_REGION'), ], ], ]]; - yield 'gps' => [[ - 'transport' => [ - 'default' => 'gps', - 'gps' => [], - ], - ]]; +// yield 'gps' => [[ +// 'transport' => [ +// 'default' => 'gps', +// 'gps' => [], +// ], +// ]]; } /** @@ -199,16 +218,17 @@ public function testProducerSendsMessage(array $enqueueConfig) { $this->customSetUp($enqueueConfig); - $this->getMessageProducer()->sendEvent(TestProcessor::TOPIC, 'test message body'); + $expectedBody = __METHOD__.time(); - $queue = $this->getPsrContext()->createQueue('enqueue.test'); + $this->getMessageProducer()->sendEvent(TestProcessor::TOPIC, $expectedBody); - $consumer = $this->getPsrContext()->createConsumer($queue); + $consumer = $this->getPsrContext()->createConsumer($this->getTestQueue()); $message = $consumer->receive(100); - $this->assertInstanceOf(PsrMessage::class, $message); - $this->assertSame('test message body', $message->getBody()); + $consumer->acknowledge($message); + + $this->assertSame($expectedBody, $message->getBody()); } /** @@ -222,11 +242,10 @@ public function testProducerSendsCommandMessage(array $enqueueConfig) $this->getMessageProducer()->sendCommand(TestCommandProcessor::COMMAND, $expectedBody); - $queue = $this->getPsrContext()->createQueue('enqueue.test'); - - $consumer = $this->getPsrContext()->createConsumer($queue); + $consumer = $this->getPsrContext()->createConsumer($this->getTestQueue()); $message = $consumer->receive(100); + $this->assertInstanceOf(PsrMessage::class, $message); $consumer->acknowledge($message); $this->assertInstanceOf(PsrMessage::class, $message); @@ -265,10 +284,12 @@ public function testClientConsumeMessagesFromExplicitlySetQueue(array $enqueueCo { $this->customSetUp($enqueueConfig); + $expectedBody = __METHOD__.time(); + $command = $this->container->get(ConsumeMessagesCommand::class); $processor = $this->container->get('test.message.processor'); - $this->getMessageProducer()->sendEvent(TestProcessor::TOPIC, 'test message body'); + $this->getMessageProducer()->sendEvent(TestProcessor::TOPIC, $expectedBody); $tester = new CommandTester($command); $tester->execute([ @@ -278,7 +299,7 @@ public function testClientConsumeMessagesFromExplicitlySetQueue(array $enqueueCo ]); $this->assertInstanceOf(PsrMessage::class, $processor->message); - $this->assertEquals('test message body', $processor->message->getBody()); + $this->assertEquals($expectedBody, $processor->message->getBody()); } /** @@ -288,22 +309,31 @@ public function testTransportConsumeMessagesCommandShouldConsumeMessage(array $e { $this->customSetUp($enqueueConfig); + if ($this->getTestQueue() instanceof StompDestination) { + $this->markTestSkipped('The test fails with the exception Stomp\Exception\ErrorFrameException: Error "precondition_failed". '. + 'It happens because of the destination options are different from the one used while creating the dest. Nothing to do about it' + ); + } + + $expectedBody = __METHOD__.time(); + $command = $this->container->get(ContainerAwareConsumeMessagesCommand::class); $command->setContainer($this->container); $processor = $this->container->get('test.message.processor'); - $this->getMessageProducer()->sendEvent(TestProcessor::TOPIC, 'test message body'); + $this->getMessageProducer()->sendEvent(TestProcessor::TOPIC, $expectedBody); $tester = new CommandTester($command); $tester->execute([ '--message-limit' => 1, '--time-limit' => '+10sec', - '--queue' => ['enqueue.test'], + '--receive-timeout' => 1000, + '--queue' => [$this->getTestQueue()->getQueueName()], 'processor-service' => 'test.message.processor', ]); $this->assertInstanceOf(PsrMessage::class, $processor->message); - $this->assertEquals('test message body', $processor->message->getBody()); + $this->assertEquals($expectedBody, $processor->message->getBody()); } /** @@ -329,16 +359,26 @@ protected function customSetUp(array $enqueueConfig) $driver = $this->container->get('enqueue.client.driver'); $context = $this->getPsrContext(); - $queue = $driver->createQueue('test'); - - //guard - $this->assertEquals('enqueue.test', $queue->getQueueName()); + $driver->setupBroker(); - if (method_exists($context, 'deleteQueue')) { - $context->deleteQueue($queue); + try { + if (method_exists($context, 'purgeQueue')) { + $queue = $this->getTestQueue(); + $context->purgeQueue($queue); + } + } catch (\Exception $e) { } + } - $driver->setupBroker(); + /** + * @return PsrQueue + */ + protected function getTestQueue() + { + /** @var DriverInterface $driver */ + $driver = $this->container->get('enqueue.client.driver'); + + return $driver->createQueue('test'); } /** diff --git a/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php b/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php index 0a83b6eed..5507d193d 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php +++ b/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php @@ -53,7 +53,10 @@ public function createContext(ContainerBuilder $container, array $config) { $contextId = 'foo.context'; - $container->setDefinition($contextId, new Definition(\stdClass::class, [$config])); + $context = new Definition(\stdClass::class, [$config]); + $context->setPublic(true); + + $container->setDefinition($contextId, $context); return $contextId; } @@ -62,7 +65,10 @@ public function createDriver(ContainerBuilder $container, array $config) { $driverId = 'foo.driver'; - $container->setDefinition($driverId, new Definition(\stdClass::class, [$config])); + $driver = new Definition(\stdClass::class, [$config]); + $driver->setPublic(true); + + $container->setDefinition($driverId, $driver); return $driverId; } diff --git a/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php b/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php index 2f8581207..f3a003201 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php +++ b/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php @@ -48,7 +48,10 @@ public function createContext(ContainerBuilder $container, array $config) { $contextId = 'without_driver.context'; - $container->setDefinition($contextId, new Definition(\stdClass::class, [$config])); + $context = new Definition(\stdClass::class, [$config]); + $context->setPublic(true); + + $container->setDefinition($contextId, $context); return $contextId; } diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 768240af8..47bc218cf 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -3,10 +3,11 @@ "type": "symfony-bundle", "description": "Message Queue Bundle", "keywords": ["messaging", "queue", "amqp", "rabbitmq"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", - "symfony/framework-bundle": "^2.8|^3", + "symfony/framework-bundle": "^2.8|^3|^4", "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "enqueue/async-event-dispatcher": "^0.8@dev" @@ -26,9 +27,9 @@ "enqueue/gps": "^0.8@dev", "enqueue/test": "^0.8@dev", "doctrine/doctrine-bundle": "~1.2", - "symfony/monolog-bundle": "^2.8|^3", - "symfony/browser-kit": "^2.8|^3", - "symfony/expression-language": "^2.8|^3" + "symfony/monolog-bundle": "^2.8|^3|^4", + "symfony/browser-kit": "^2.8|^3|^4", + "symfony/expression-language": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Bundle\\": "" }, diff --git a/pkg/enqueue/Symfony/AmqpTransportFactory.php b/pkg/enqueue/Symfony/AmqpTransportFactory.php index 8a2a20ee9..0a749f769 100644 --- a/pkg/enqueue/Symfony/AmqpTransportFactory.php +++ b/pkg/enqueue/Symfony/AmqpTransportFactory.php @@ -166,6 +166,7 @@ public function createContext(ContainerBuilder $container, array $config) $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); $context = new Definition(AmqpContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); @@ -180,6 +181,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(AmqpDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/enqueue/Symfony/DefaultTransportFactory.php b/pkg/enqueue/Symfony/DefaultTransportFactory.php index 24972986c..97734b83a 100644 --- a/pkg/enqueue/Symfony/DefaultTransportFactory.php +++ b/pkg/enqueue/Symfony/DefaultTransportFactory.php @@ -18,6 +18,7 @@ use Enqueue\Stomp\Symfony\StompTransportFactory; use Interop\Amqp\AmqpConnectionFactory; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; +use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ContainerBuilder; use function Enqueue\dsn_to_connection_factory; @@ -83,8 +84,8 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); - $container->setAlias($factoryId, $aliasId); - $container->setAlias('enqueue.transport.connection_factory', $factoryId); + $container->setAlias($factoryId, new Alias($aliasId, true)); + $container->setAlias('enqueue.transport.connection_factory', new Alias($factoryId, true)); return $factoryId; } @@ -104,8 +105,8 @@ public function createContext(ContainerBuilder $container, array $config) $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); - $container->setAlias($contextId, $aliasId); - $container->setAlias('enqueue.transport.context', $contextId); + $container->setAlias($contextId, new Alias($aliasId, true)); + $container->setAlias('enqueue.transport.context', new Alias($contextId, true)); return $contextId; } @@ -125,8 +126,8 @@ public function createDriver(ContainerBuilder $container, array $config) $driverId = sprintf('enqueue.client.%s.driver', $this->getName()); - $container->setAlias($driverId, $aliasId); - $container->setAlias('enqueue.client.driver', $driverId); + $container->setAlias($driverId, new Alias($aliasId, true)); + $container->setAlias('enqueue.client.driver', new Alias($driverId, true)); return $driverId; } diff --git a/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php b/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php index 2bd98e584..94ee9234e 100644 --- a/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php +++ b/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php @@ -55,6 +55,7 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(RabbitMqDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index 638efea94..8c25bb6a7 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Library", "keywords": ["messaging", "queue", "amqp", "rabbitmq"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -13,11 +14,11 @@ }, "require-dev": { "phpunit/phpunit": "~5.5", - "symfony/console": "^2.8|^3", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3", - "symfony/event-dispatcher": "^2.8|^3", - "symfony/http-kernel": "^2.8|^3", + "symfony/console": "^2.8|^3|^4", + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.8|^3|^4", + "symfony/http-kernel": "^2.8|^3|^4", "enqueue/amqp-ext": "^0.8@dev", "enqueue/amqp-lib": "^0.8@dev", "enqueue/amqp-bunny": "^0.8@dev", @@ -35,9 +36,9 @@ "empi89/php-amqp-stubs": "*@dev" }, "suggest": { - "symfony/console": "^2.8|^3 If you want to use li commands", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3", + "symfony/console": "^2.8|^3|^4 If you want to use li commands", + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4", "enqueue/amqp-ext": "AMQP transport (based on php extension)", "enqueue/stomp": "STOMP transport", "enqueue/fs": "Filesystem transport", diff --git a/pkg/fs/CannotObtainLockException.php b/pkg/fs/CannotObtainLockException.php new file mode 100644 index 000000000..854d726f8 --- /dev/null +++ b/pkg/fs/CannotObtainLockException.php @@ -0,0 +1,9 @@ +chmod = $chmod; $this->pollingInterval = $pollingInterval; - $this->lockHandlers = []; + $this->lock = new LegacyFilesystemLock(); } /** @@ -95,11 +93,6 @@ public function declareDestination(PsrDestination $destination) InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class); set_error_handler(function ($severity, $message, $file, $line) { - // do not throw on a deprecation notice. - if (E_USER_DEPRECATED === $severity && false !== strpos($message, LockHandler::class)) { - return; - } - throw new \ErrorException($message, 0, $severity, $file, $line); }); @@ -123,20 +116,14 @@ public function workWithFile(FsDestination $destination, $mode, callable $callba try { $file = fopen($destination->getFileInfo(), $mode); - $lockHandler = $this->getLockHandler($destination); - - if (false == $lockHandler->lock(true)) { - throw new \LogicException(sprintf('Cannot obtain the lock for destination %s', $destination->getName())); - } + $this->lock->lock($destination); return call_user_func($callback, $destination, $file); } finally { if (isset($file)) { fclose($file); } - if (isset($lockHandler)) { - $lockHandler->release(); - } + $this->lock->release($destination); restore_error_handler(); } @@ -184,11 +171,7 @@ public function createConsumer(PsrDestination $destination) public function close() { - foreach ($this->lockHandlers as $lockHandler) { - $lockHandler->release(); - } - - $this->lockHandlers = []; + $this->lock->releaseAll(); } /** @@ -234,18 +217,4 @@ private function getStoreDir() return $this->storeDir; } - - /** - * @param FsDestination $destination - * - * @return LockHandler - */ - private function getLockHandler(FsDestination $destination) - { - if (false == isset($this->lockHandlers[$destination->getName()])) { - $this->lockHandlers[$destination->getName()] = new LockHandler($destination->getName(), $this->storeDir); - } - - return $this->lockHandlers[$destination->getName()]; - } } diff --git a/pkg/fs/LegacyFilesystemLock.php b/pkg/fs/LegacyFilesystemLock.php new file mode 100644 index 000000000..a765d2ced --- /dev/null +++ b/pkg/fs/LegacyFilesystemLock.php @@ -0,0 +1,185 @@ +lockHandlers = []; + } + + /** + * {@inheritdoc} + */ + public function lock(FsDestination $destination) + { + $lockHandler = $this->getLockHandler($destination); + + if (false == $lockHandler->lock(true)) { + throw new CannotObtainLockException(sprintf('Cannot obtain the lock for destination %s', $destination->getName())); + } + } + + /** + * {@inheritdoc} + */ + public function release(FsDestination $destination) + { + $lockHandler = $this->getLockHandler($destination); + + $lockHandler->release(); + } + + public function releaseAll() + { + foreach ($this->lockHandlers as $lockHandler) { + $lockHandler->release(); + } + + $this->lockHandlers = []; + } + + /** + * @param FsDestination $destination + * + * @return LockHandler + */ + private function getLockHandler(FsDestination $destination) + { + if (false == isset($this->lockHandlers[$destination->getName()])) { + $this->lockHandlers[$destination->getName()] = new LockHandler( + $destination->getName(), + $destination->getFileInfo()->getPath() + ); + } + + return $this->lockHandlers[$destination->getName()]; + } +} + +// symfony/lock component works only with 3.x and 4.x Symfony +// For symfony 2.x we should use LockHandler from symfony/component which was removed from 4.x +// because we cannot use both at the same time. I copied and pasted the lock handler here + +/* + * This file is part of the Symfony package. + * + * (c) Fabien Potencier + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +/** + * LockHandler class provides a simple abstraction to lock anything by means of + * a file lock. + * + * A locked file is created based on the lock name when calling lock(). Other + * lock handlers will not be able to lock the same name until it is released + * (explicitly by calling release() or implicitly when the instance holding the + * lock is destroyed). + * + * @author Grégoire Pineau + * @author Romain Neutron + * @author Nicolas Grekas + * + * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\Lock\Store\SemaphoreStore or Symfony\Component\Lock\Store\FlockStore instead. + */ +class LockHandler +{ + private $file; + private $handle; + + /** + * @param string $name The lock name + * @param string|null $lockPath The directory to store the lock. Default values will use temporary directory + * + * @throws IOException If the lock directory could not be created or is not writable + */ + public function __construct($name, $lockPath = null) + { + $lockPath = $lockPath ?: sys_get_temp_dir(); + + if (!is_dir($lockPath)) { + $fs = new Filesystem(); + $fs->mkdir($lockPath); + } + + if (!is_writable($lockPath)) { + throw new IOException(sprintf('The directory "%s" is not writable.', $lockPath), 0, null, $lockPath); + } + + $this->file = sprintf('%s/sf.%s.%s.lock', $lockPath, preg_replace('/[^a-z0-9\._-]+/i', '-', $name), hash('sha256', $name)); + } + + /** + * Lock the resource. + * + * @param bool $blocking Wait until the lock is released + * + * @throws IOException If the lock file could not be created or opened + * + * @return bool Returns true if the lock was acquired, false otherwise + */ + public function lock($blocking = false) + { + if ($this->handle) { + return true; + } + + $error = null; + + // Silence error reporting + set_error_handler(function ($errno, $msg) use (&$error) { + $error = $msg; + }); + + if (!$this->handle = fopen($this->file, 'r')) { + if ($this->handle = fopen($this->file, 'x')) { + chmod($this->file, 0444); + } elseif (!$this->handle = fopen($this->file, 'r')) { + usleep(100); // Give some time for chmod() to complete + $this->handle = fopen($this->file, 'r'); + } + } + restore_error_handler(); + + if (!$this->handle) { + throw new IOException($error, 0, null, $this->file); + } + + // On Windows, even if PHP doc says the contrary, LOCK_NB works, see + // https://bugs.php.net/54129 + if (!flock($this->handle, LOCK_EX | ($blocking ? 0 : LOCK_NB))) { + fclose($this->handle); + $this->handle = null; + + return false; + } + + return true; + } + + /** + * Release the resource. + */ + public function release() + { + if ($this->handle) { + flock($this->handle, LOCK_UN | LOCK_NB); + fclose($this->handle); + $this->handle = null; + } + } +} diff --git a/pkg/fs/Lock.php b/pkg/fs/Lock.php new file mode 100644 index 000000000..02c2fbb76 --- /dev/null +++ b/pkg/fs/Lock.php @@ -0,0 +1,23 @@ +getName()); $context = new Definition(FsContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); @@ -100,6 +101,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(FsDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/fs/Tests/FsContextTest.php b/pkg/fs/Tests/FsContextTest.php index 5ce324a49..0d1ea4c63 100644 --- a/pkg/fs/Tests/FsContextTest.php +++ b/pkg/fs/Tests/FsContextTest.php @@ -182,34 +182,6 @@ public function testShouldAllowPurgeMessagesFromQueue() $this->assertEmpty(file_get_contents($tmpFile)); } - public function testShouldReleaseAllLocksOnClose() - { - new TempFile(sys_get_temp_dir().'/foo'); - new TempFile(sys_get_temp_dir().'/bar'); - - $context = new FsContext(sys_get_temp_dir(), 1, 0666); - - $fooQueue = $context->createQueue('foo'); - $barQueue = $context->createTopic('bar'); - - $this->assertAttributeCount(0, 'lockHandlers', $context); - - $context->workWithFile($fooQueue, 'r+', function () { - }); - $context->workWithFile($barQueue, 'r+', function () { - }); - $context->workWithFile($fooQueue, 'c+', function () { - }); - $context->workWithFile($barQueue, 'c+', function () { - }); - - $this->assertAttributeCount(2, 'lockHandlers', $context); - - $context->close(); - - $this->assertAttributeCount(0, 'lockHandlers', $context); - } - public function testShouldCreateFileOnFilesystemIfNotExistOnDeclareDestination() { $tmpFile = new TempFile(sys_get_temp_dir().'/'.uniqid()); diff --git a/pkg/fs/Tests/LegacyFilesystemLockTest.php b/pkg/fs/Tests/LegacyFilesystemLockTest.php new file mode 100644 index 000000000..c797bf41a --- /dev/null +++ b/pkg/fs/Tests/LegacyFilesystemLockTest.php @@ -0,0 +1,50 @@ +assertClassImplements(Lock::class, LegacyFilesystemLock::class); + } + + public function testShouldReleaseAllLocksOnClose() + { + $context = new FsContext(sys_get_temp_dir(), 1, 0666); + $fooQueue = $context->createQueue('foo'); + $barQueue = $context->createTopic('bar'); + + new TempFile(sys_get_temp_dir().'/foo'); + new TempFile(sys_get_temp_dir().'/bar'); + + $lock = new LegacyFilesystemLock(); + + $this->assertAttributeCount(0, 'lockHandlers', $lock); + + $lock->lock($fooQueue); + $this->assertAttributeCount(1, 'lockHandlers', $lock); + + $lock->release($fooQueue); + $this->assertAttributeCount(1, 'lockHandlers', $lock); + + $lock->lock($barQueue); + $lock->lock($fooQueue); + $lock->lock($barQueue); + + $this->assertAttributeCount(2, 'lockHandlers', $lock); + + $lock->releaseAll(); + + $this->assertAttributeCount(0, 'lockHandlers', $lock); + } +} diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json index a76cbaca8..f9d481dd2 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -3,11 +3,12 @@ "type": "library", "description": "Enqueue Filesystem based transport", "keywords": ["messaging", "queue", "filesystem", "local"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", "queue-interop/queue-interop": "^0.6", - "symfony/filesystem": "^2.8|^3@stable", + "symfony/filesystem": "^2.8|^3|^4", "makasim/temp-file": "^0.2@stable" }, "require-dev": { @@ -16,9 +17,9 @@ "enqueue/null": "^0.7", "enqueue/test": "^0.7", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3@stable", - "symfony/config": "^2.8|^3@stable", - "symfony/phpunit-bridge": "^2.8|^3@stable" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4", + "symfony/phpunit-bridge": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Fs\\": "" }, diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json index 4529a1197..85b8fc8bd 100644 --- a/pkg/gearman/composer.json +++ b/pkg/gearman/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Gearman transport", "keywords": ["messaging", "queue", "german"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -15,8 +16,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Gearman\\": "" }, diff --git a/pkg/gps/Symfony/GpsTransportFactory.php b/pkg/gps/Symfony/GpsTransportFactory.php index 1ad137a12..36c15e39b 100644 --- a/pkg/gps/Symfony/GpsTransportFactory.php +++ b/pkg/gps/Symfony/GpsTransportFactory.php @@ -94,6 +94,7 @@ public function createContext(ContainerBuilder $container, array $config) $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); $context = new Definition(GpsContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); @@ -108,6 +109,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(GpsDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index b9540a51c..f8cf4729c 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Google Cloud Pub/Sub Transport", "keywords": ["messaging", "queue", "google", "pubsub"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -14,8 +15,8 @@ "enqueue/test": "^0.8@dev", "enqueue/enqueue": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Gps\\": "" }, diff --git a/pkg/job-queue/Tests/Functional/app/AppKernel.php b/pkg/job-queue/Tests/Functional/app/AppKernel.php index ce21df0b8..0d60c665f 100644 --- a/pkg/job-queue/Tests/Functional/app/AppKernel.php +++ b/pkg/job-queue/Tests/Functional/app/AppKernel.php @@ -44,6 +44,21 @@ public function registerContainerConfiguration(LoaderInterface $loader) $loader->load(__DIR__.'/config/config.yml'); } + protected function getKernelParameters() + { + $parameters = parent::getKernelParameters(); + + // it works in all Symfony version, 2.8, 3.x, 4.x + $parameters['db.driver'] = getenv('DOCTRINE_DRIVER'); + $parameters['db.host'] = getenv('DOCTRINE_HOST'); + $parameters['db.port'] = getenv('DOCTRINE_PORT'); + $parameters['db.name'] = getenv('DOCTRINE_DB_NAME'); + $parameters['db.user'] = getenv('DOCTRINE_USER'); + $parameters['db.password'] = getenv('DOCTRINE_PASSWORD'); + + return $parameters; + } + protected function getContainerClass() { return parent::getContainerClass().'JobQueue'; diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index 816c5c164..8bf91d18f 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -3,10 +3,11 @@ "type": "library", "description": "Job Queue", "keywords": ["messaging", "queue", "jobs"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", - "symfony/framework-bundle": "^2.8|^3", + "symfony/framework-bundle": "^2.8|^3|^4", "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "doctrine/orm": "~2.4" @@ -15,8 +16,8 @@ "phpunit/phpunit": "~5.5", "enqueue/test": "^0.8@dev", "doctrine/doctrine-bundle": "~1.2", - "symfony/browser-kit": "^2.8|^3", - "symfony/expression-language": "^2.8|^3" + "symfony/browser-kit": "^2.8|^3|^4", + "symfony/expression-language": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\JobQueue\\": "" }, diff --git a/pkg/null/Symfony/NullTransportFactory.php b/pkg/null/Symfony/NullTransportFactory.php index 2784405d0..7d70b8426 100644 --- a/pkg/null/Symfony/NullTransportFactory.php +++ b/pkg/null/Symfony/NullTransportFactory.php @@ -66,7 +66,9 @@ public function createContext(ContainerBuilder $container, array $config) $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); + $context = new Definition(NullContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $container->setDefinition($contextId, $context); @@ -80,6 +82,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(NullDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/null/composer.json b/pkg/null/composer.json index e24c54c2f..e100496ee 100644 --- a/pkg/null/composer.json +++ b/pkg/null/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Enqueue Null transport", "keywords": ["messaging", "queue", "testing"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -13,8 +14,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/test": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Null\\": "" }, diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json index 542e18ae5..a24699b49 100644 --- a/pkg/pheanstalk/composer.json +++ b/pkg/pheanstalk/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Beanstalk transport", "keywords": ["messaging", "queue", "Pheanstalk", "Beanstalk"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -15,8 +16,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Pheanstalk\\": "" }, diff --git a/pkg/rdkafka/RdKafkaTopic.php b/pkg/rdkafka/RdKafkaTopic.php index 9aea638ee..6faf12f8c 100644 --- a/pkg/rdkafka/RdKafkaTopic.php +++ b/pkg/rdkafka/RdKafkaTopic.php @@ -34,7 +34,6 @@ class RdKafkaTopic implements PsrTopic, PsrQueue public function __construct($name) { $this->name = $name; - $this->conf = new TopicConf(); } /** @@ -54,13 +53,21 @@ public function getQueueName() } /** - * @return TopicConf + * @return TopicConf|null */ public function getConf() { return $this->conf; } + /** + * @param TopicConf|null $conf + */ + public function setConf(TopicConf $conf = null) + { + $this->conf = $conf; + } + /** * @return int */ diff --git a/pkg/rdkafka/Tests/RdKafkaProducerTest.php b/pkg/rdkafka/Tests/RdKafkaProducerTest.php index 6ac08bbab..1c076e498 100644 --- a/pkg/rdkafka/Tests/RdKafkaProducerTest.php +++ b/pkg/rdkafka/Tests/RdKafkaProducerTest.php @@ -64,7 +64,7 @@ public function testShouldUseSerializerToEncodeMessageAndPutToExpectedTube() $kafkaProducer ->expects($this->once()) ->method('newTopic') - ->with('theQueueName', $this->isInstanceOf(TopicConf::class)) + ->with('theQueueName') ->willReturn($kafkaTopic) ; @@ -81,6 +81,74 @@ public function testShouldUseSerializerToEncodeMessageAndPutToExpectedTube() $producer->send(new RdKafkaTopic('theQueueName'), $message); } + public function testShouldPassNullAsTopicConfigIfNotSetOnTopic() + { + // guard + $kafkaTopic = $this->createKafkaTopicMock(); + $kafkaTopic + ->expects($this->once()) + ->method('produce') + ; + + $kafkaProducer = $this->createKafkaProducerMock(); + $kafkaProducer + ->expects($this->once()) + ->method('newTopic') + ->with('theQueueName', null) + ->willReturn($kafkaTopic) + ; + + $serializer = $this->createSerializerMock(); + $serializer + ->expects($this->once()) + ->method('toString') + ->willReturn('aSerializedMessage') + ; + + $producer = new RdKafkaProducer($kafkaProducer, $serializer); + + $topic = new RdKafkaTopic('theQueueName'); + + // guard + $this->assertNull($topic->getConf()); + + $producer->send($topic, new RdKafkaMessage()); + } + + public function testShouldPassCustomConfAsTopicConfigIfSetOnTopic() + { + $conf = new TopicConf(); + + // guard + $kafkaTopic = $this->createKafkaTopicMock(); + $kafkaTopic + ->expects($this->once()) + ->method('produce') + ; + + $kafkaProducer = $this->createKafkaProducerMock(); + $kafkaProducer + ->expects($this->once()) + ->method('newTopic') + ->with('theQueueName', $this->identicalTo($conf)) + ->willReturn($kafkaTopic) + ; + + $serializer = $this->createSerializerMock(); + $serializer + ->expects($this->once()) + ->method('toString') + ->willReturn('aSerializedMessage') + ; + + $producer = new RdKafkaProducer($kafkaProducer, $serializer); + + $topic = new RdKafkaTopic('theQueueName'); + $topic->setConf($conf); + + $producer->send($topic, new RdKafkaMessage()); + } + public function testShouldAllowGetPreviouslySetSerializer() { $producer = new RdKafkaProducer($this->createKafkaProducerMock(), $this->createSerializerMock()); diff --git a/pkg/rdkafka/Tests/RdKafkaTopicTest.php b/pkg/rdkafka/Tests/RdKafkaTopicTest.php index f81e4cd38..5ed22885a 100644 --- a/pkg/rdkafka/Tests/RdKafkaTopicTest.php +++ b/pkg/rdkafka/Tests/RdKafkaTopicTest.php @@ -27,10 +27,20 @@ public function testCouldSetGetKey() $this->assertSame('key', $topic->getKey()); } - public function testShouldReturnConfInstance() + public function testShouldReturnNullAsConfIfNotSet() { $topic = new RdKafkaTopic('topic'); - $this->assertInstanceOf(TopicConf::class, $topic->getConf()); + $this->assertNull($topic->getConf()); + } + + public function testShouldAllowGetPreviouslySetConf() + { + $topic = new RdKafkaTopic('topic'); + + $conf = new TopicConf(); + $topic->setConf($conf); + + $this->assertSame($conf, $topic->getConf()); } } diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json index 1014002d1..45f87d769 100644 --- a/pkg/rdkafka/composer.json +++ b/pkg/rdkafka/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Kafka Transport", "keywords": ["messaging", "queue", "kafka"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", diff --git a/pkg/redis/Symfony/RedisTransportFactory.php b/pkg/redis/Symfony/RedisTransportFactory.php index df4f462d9..5fcbe7603 100644 --- a/pkg/redis/Symfony/RedisTransportFactory.php +++ b/pkg/redis/Symfony/RedisTransportFactory.php @@ -90,6 +90,7 @@ public function createContext(ContainerBuilder $container, array $config) $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); $context = new Definition(RedisContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); @@ -104,6 +105,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(RedisDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json index cb924e286..26f6dce96 100644 --- a/pkg/redis/composer.json +++ b/pkg/redis/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Redis Transport", "keywords": ["messaging", "queue", "redis"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -15,8 +16,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Redis\\": "" }, diff --git a/pkg/simple-client/SimpleClientContainerExtension.php b/pkg/simple-client/SimpleClientContainerExtension.php index f10a7b186..7bcb849cf 100644 --- a/pkg/simple-client/SimpleClientContainerExtension.php +++ b/pkg/simple-client/SimpleClientContainerExtension.php @@ -18,6 +18,7 @@ use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\NodeInterface; use Symfony\Component\Config\Definition\Processor; +use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\Extension; use Symfony\Component\DependencyInjection\Reference; @@ -79,6 +80,7 @@ public function load(array $configs, ContainerBuilder $container) ; $container->register('enqueue.client.config', Config::class) + ->setPublic(true) ->setArguments([ $config['client']['prefix'], $config['client']['app_name'], @@ -90,33 +92,38 @@ public function load(array $configs, ContainerBuilder $container) ]); $container->register('enqueue.client.rpc_factory', RpcFactory::class) + ->setPublic(true) ->setArguments([ new Reference('enqueue.transport.context'), ]); $container->register('enqueue.client.producer', Producer::class) + ->setPublic(true) ->setArguments([ new Reference('enqueue.client.driver'), new Reference('enqueue.client.rpc_factory'), ]); - $container->setAlias('enqueue.client.producer_v2', 'enqueue.client.producer'); + $container->setAlias('enqueue.client.producer_v2', new Alias('enqueue.client.producer', true)); $container->register('enqueue.client.meta.topic_meta_registry', TopicMetaRegistry::class) + ->setPublic(true) ->setArguments([[]]); $container->register('enqueue.client.meta.queue_meta_registry', QueueMetaRegistry::class) - ->setArguments([ - new Reference('enqueue.client.config'), - [], - ]); + ->setPublic(true) + ->setArguments([new Reference('enqueue.client.config'), []]); - $container->register('enqueue.client.processor_registry', ArrayProcessorRegistry::class); + $container->register('enqueue.client.processor_registry', ArrayProcessorRegistry::class) + ->setPublic(true) + ; $container->register('enqueue.client.delegate_processor', DelegateProcessor::class) + ->setPublic(true) ->setArguments([new Reference('enqueue.client.processor_registry')]); $container->register('enqueue.client.queue_consumer', QueueConsumer::class) + ->setPublic(true) ->setArguments([ new Reference('enqueue.transport.context'), new Reference('enqueue.consumption.extensions'), @@ -124,6 +131,7 @@ public function load(array $configs, ContainerBuilder $container) // router $container->register('enqueue.client.router_processor', RouterProcessor::class) + ->setPublic(true) ->setArguments([new Reference('enqueue.client.driver'), []]); $container->getDefinition('enqueue.client.processor_registry') ->addMethodCall('add', ['enqueue.client.router_processor', new Reference('enqueue.client.router_processor')]); @@ -134,6 +142,7 @@ public function load(array $configs, ContainerBuilder $container) $extensions = []; if ($config['client']['redelivered_delay_time']) { $container->register('enqueue.client.delay_redelivered_message_extension', DelayRedeliveredMessageExtension::class) + ->setPublic(true) ->setArguments([ new Reference('enqueue.client.driver'), $config['client']['redelivered_delay_time'], @@ -143,11 +152,13 @@ public function load(array $configs, ContainerBuilder $container) } $container->register('enqueue.client.extension.set_router_properties', SetRouterPropertiesExtension::class) + ->setPublic(true) ->setArguments([new Reference('enqueue.client.driver')]); $extensions[] = new Reference('enqueue.client.extension.set_router_properties'); $container->register('enqueue.consumption.extensions', ConsumptionChainExtension::class) + ->setPublic(true) ->setArguments([$extensions]); } diff --git a/pkg/simple-client/Tests/Functional/SimpleClientTest.php b/pkg/simple-client/Tests/Functional/SimpleClientTest.php index 3281aa274..cedbd11ff 100644 --- a/pkg/simple-client/Tests/Functional/SimpleClientTest.php +++ b/pkg/simple-client/Tests/Functional/SimpleClientTest.php @@ -22,7 +22,7 @@ class SimpleClientTest extends TestCase public function setUp() { - if (false == getenv('SYMFONY__RABBITMQ__HOST')) { + if (false == getenv('RABBITMQ_HOST')) { throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment'); } @@ -36,11 +36,11 @@ public function transportConfigDataProvider() 'default' => 'amqp', 'amqp' => [ 'driver' => 'ext', - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), ], ], ]]; @@ -65,11 +65,11 @@ public function transportConfigDataProvider() 'default' => 'rabbitmq_amqp', 'rabbitmq_amqp' => [ 'driver' => 'ext', - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), ], ], ]]; diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index 4f1c737ab..8a781d651 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -3,13 +3,14 @@ "type": "library", "description": "Message Queue Simple Client", "keywords": ["messaging", "queue", "amqp", "rabbitmq"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", "enqueue/enqueue": "^0.8@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3", - "symfony/console": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4", + "symfony/console": "^2.8|^3|^4" }, "require-dev": { "phpunit/phpunit": "~5.5", diff --git a/pkg/sqs/SqsContext.php b/pkg/sqs/SqsContext.php index 93bb2834d..57384daaf 100644 --- a/pkg/sqs/SqsContext.php +++ b/pkg/sqs/SqsContext.php @@ -186,12 +186,22 @@ public function deleteQueue(SqsDestination $dest) } /** + * @deprecated since 0.8 will be removed 0.9 use self::purgeQueue() + * * @param SqsDestination $dest */ public function purge(SqsDestination $dest) + { + $this->purgeQueue($dest); + } + + /** + * @param SqsDestination $destination + */ + public function purgeQueue(SqsDestination $destination) { $this->getClient()->purgeQueue([ - 'QueueUrl' => $this->getQueueUrl($dest), + 'QueueUrl' => $this->getQueueUrl($destination), ]); } } diff --git a/pkg/sqs/Symfony/SqsTransportFactory.php b/pkg/sqs/Symfony/SqsTransportFactory.php index c2ce2a304..e5f843a48 100644 --- a/pkg/sqs/Symfony/SqsTransportFactory.php +++ b/pkg/sqs/Symfony/SqsTransportFactory.php @@ -69,6 +69,7 @@ public function createContext(ContainerBuilder $container, array $config) $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); $context = new Definition(SqsContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); @@ -83,6 +84,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(SqsDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json index c8e3a51c9..5965b56ff 100644 --- a/pkg/sqs/composer.json +++ b/pkg/sqs/composer.json @@ -3,6 +3,7 @@ "type": "library", "description": "Message Queue Amazon SQS Transport", "keywords": ["messaging", "queue", "amazon", "aws", "sqs"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", @@ -14,8 +15,8 @@ "enqueue/test": "^0.8@dev", "enqueue/enqueue": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Sqs\\": "" }, diff --git a/pkg/sqs/examples/consume.php b/pkg/sqs/examples/consume.php index a8914d165..a63f41fba 100644 --- a/pkg/sqs/examples/consume.php +++ b/pkg/sqs/examples/consume.php @@ -18,9 +18,9 @@ use Enqueue\Sqs\SqsConnectionFactory; $config = [ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), + 'key' => getenv('AWS_SQS_KEY'), + 'secret' => getenv('AWS_SQS_SECRET'), + 'region' => getenv('AWS_SQS_REGION'), ]; $factory = new SqsConnectionFactory($config); diff --git a/pkg/sqs/examples/produce.php b/pkg/sqs/examples/produce.php index 878ba00a4..cb1a4d8e6 100644 --- a/pkg/sqs/examples/produce.php +++ b/pkg/sqs/examples/produce.php @@ -18,9 +18,9 @@ use Enqueue\Sqs\SqsConnectionFactory; $config = [ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), + 'key' => getenv('AWS_SQS_KEY'), + 'secret' => getenv('AWS_SQS_SECRET'), + 'region' => getenv('AWS_SQS_REGION'), ]; $factory = new SqsConnectionFactory($config); diff --git a/pkg/stomp/StompConnectionFactory.php b/pkg/stomp/StompConnectionFactory.php index ce2aae733..1f82a7b8a 100644 --- a/pkg/stomp/StompConnectionFactory.php +++ b/pkg/stomp/StompConnectionFactory.php @@ -64,7 +64,7 @@ public function createContext() }); } - return new StompContext($this->stomp); + return new StompContext($this->establishConnection()); } /** diff --git a/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php b/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php index 48bbb719d..38b43b693 100644 --- a/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php +++ b/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php @@ -59,6 +59,7 @@ public function createDriver(ContainerBuilder $container, array $config) $container->setDefinition($managementId, $management); $driver = new Definition(RabbitMqStompDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/stomp/Symfony/StompTransportFactory.php b/pkg/stomp/Symfony/StompTransportFactory.php index 6144dd6d8..235752cdd 100644 --- a/pkg/stomp/Symfony/StompTransportFactory.php +++ b/pkg/stomp/Symfony/StompTransportFactory.php @@ -68,6 +68,7 @@ public function createContext(ContainerBuilder $container, array $config) $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); $context = new Definition(StompContext::class); + $context->setPublic(true); $context->setFactory([new Reference($factoryId), 'createContext']); $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); @@ -82,6 +83,7 @@ public function createContext(ContainerBuilder $container, array $config) public function createDriver(ContainerBuilder $container, array $config) { $driver = new Definition(StompDriver::class); + $driver->setPublic(true); $driver->setArguments([ new Reference(sprintf('enqueue.transport.%s.context', $this->getName())), new Reference('enqueue.client.config'), diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 703cc9fe0..52f0ef57d 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -3,12 +3,14 @@ "type": "library", "description": "Message Queue Stomp Transport", "keywords": ["messaging", "queue", "stomp"], + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "require": { "php": ">=5.6", "stomp-php/stomp-php": "^4", "queue-interop/queue-interop": "^0.6@dev", "php-http/guzzle6-adapter": "^1.1", + "php-http/client-common": "^1.7@dev", "richardfullmer/rabbitmq-management-api": "^2.0" }, "require-dev": { @@ -17,8 +19,8 @@ "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3", - "symfony/config": "^2.8|^3" + "symfony/dependency-injection": "^2.8|^3|^4", + "symfony/config": "^2.8|^3|^4" }, "autoload": { "psr-4": { "Enqueue\\Stomp\\": "" }, diff --git a/pkg/stomp/examples/consume.php b/pkg/stomp/examples/consume.php index 36d9e5a34..f6cc2fdff 100644 --- a/pkg/stomp/examples/consume.php +++ b/pkg/stomp/examples/consume.php @@ -19,11 +19,11 @@ use Stomp\Exception\ErrorFrameException; $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'), - 'login' => getenv('SYMFONY__RABBITMQ__USER'), - 'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_STOMP_PORT'), + 'login' => getenv('RABBITMQ_USER'), + 'password' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), 'sync' => true, ]; diff --git a/pkg/stomp/examples/publish.php b/pkg/stomp/examples/publish.php index 47985885c..a320a40a6 100644 --- a/pkg/stomp/examples/publish.php +++ b/pkg/stomp/examples/publish.php @@ -19,11 +19,11 @@ use Stomp\Exception\ErrorFrameException; $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'), - 'login' => getenv('SYMFONY__RABBITMQ__USER'), - 'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_STOMP_PORT'), + 'login' => getenv('RABBITMQ_USER'), + 'password' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), 'sync' => true, ]; diff --git a/pkg/test/RabbitmqAmqpExtension.php b/pkg/test/RabbitmqAmqpExtension.php index ad698fcfe..1a4da0e90 100644 --- a/pkg/test/RabbitmqAmqpExtension.php +++ b/pkg/test/RabbitmqAmqpExtension.php @@ -12,16 +12,16 @@ trait RabbitmqAmqpExtension */ private function buildAmqpContext() { - if (false == getenv('SYMFONY__RABBITMQ__HOST')) { + if (false == getenv('RABBITMQ_HOST')) { throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment'); } $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'), - 'user' => getenv('SYMFONY__RABBITMQ__USER'), - 'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_AMQP__PORT'), + 'user' => getenv('RABBITMQ_USER'), + 'pass' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), ]; return (new AmqpConnectionFactory($config))->createContext(); diff --git a/pkg/test/RabbitmqManagmentExtensionTrait.php b/pkg/test/RabbitmqManagmentExtensionTrait.php index b7c4a4440..660e20d58 100644 --- a/pkg/test/RabbitmqManagmentExtensionTrait.php +++ b/pkg/test/RabbitmqManagmentExtensionTrait.php @@ -9,10 +9,10 @@ trait RabbitmqManagmentExtensionTrait */ private function removeQueue($queueName) { - $rabbitmqHost = getenv('SYMFONY__RABBITMQ__HOST'); - $rabbitmqUser = getenv('SYMFONY__RABBITMQ__USER'); - $rabbitmqPassword = getenv('SYMFONY__RABBITMQ__PASSWORD'); - $rabbitmqVhost = getenv('SYMFONY__RABBITMQ__VHOST'); + $rabbitmqHost = getenv('RABBITMQ_HOST'); + $rabbitmqUser = getenv('RABBITMQ_USER'); + $rabbitmqPassword = getenv('RABBITMQ_PASSWORD'); + $rabbitmqVhost = getenv('RABBITMQ_VHOST'); $url = sprintf( 'http://%s:15672/api/queues/%s/%s', @@ -46,10 +46,10 @@ private function removeQueue($queueName) */ private function removeExchange($exchangeName) { - $rabbitmqHost = getenv('SYMFONY__RABBITMQ__HOST'); - $rabbitmqUser = getenv('SYMFONY__RABBITMQ__USER'); - $rabbitmqPassword = getenv('SYMFONY__RABBITMQ__PASSWORD'); - $rabbitmqVhost = getenv('SYMFONY__RABBITMQ__VHOST'); + $rabbitmqHost = getenv('RABBITMQ_HOST'); + $rabbitmqUser = getenv('RABBITMQ_USER'); + $rabbitmqPassword = getenv('RABBITMQ_PASSWORD'); + $rabbitmqVhost = getenv('RABBITMQ_VHOST'); $url = sprintf( 'http://%s:15672/api/exchanges/%s/%s', diff --git a/pkg/test/RabbitmqStompExtension.php b/pkg/test/RabbitmqStompExtension.php index ce3b80312..ae2bf4bda 100644 --- a/pkg/test/RabbitmqStompExtension.php +++ b/pkg/test/RabbitmqStompExtension.php @@ -12,16 +12,16 @@ trait RabbitmqStompExtension */ private function buildStompContext() { - if (false == getenv('SYMFONY__RABBITMQ__HOST')) { + if (false == getenv('RABBITMQ_HOST')) { throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment'); } $config = [ - 'host' => getenv('SYMFONY__RABBITMQ__HOST'), - 'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'), - 'login' => getenv('SYMFONY__RABBITMQ__USER'), - 'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'), - 'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'), + 'host' => getenv('RABBITMQ_HOST'), + 'port' => getenv('RABBITMQ_STOMP_PORT'), + 'login' => getenv('RABBITMQ_USER'), + 'password' => getenv('RABBITMQ_PASSWORD'), + 'vhost' => getenv('RABBITMQ_VHOST'), 'sync' => true, ]; diff --git a/pkg/test/RedisExtension.php b/pkg/test/RedisExtension.php index 9b98c5443..0740c8f21 100644 --- a/pkg/test/RedisExtension.php +++ b/pkg/test/RedisExtension.php @@ -12,13 +12,13 @@ trait RedisExtension */ private function buildPhpRedisContext() { - if (false == getenv('SYMFONY__REDIS__HOST')) { + if (false == getenv('REDIS_HOST')) { throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment'); } $config = [ - 'host' => getenv('SYMFONY__REDIS__HOST'), - 'port' => getenv('SYMFONY__REDIS__PORT'), + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT'), 'vendor' => 'phpredis', 'lazy' => false, ]; @@ -31,13 +31,13 @@ private function buildPhpRedisContext() */ private function buildPRedisContext() { - if (false == getenv('SYMFONY__REDIS__HOST')) { + if (false == getenv('REDIS_HOST')) { throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment'); } $config = [ - 'host' => getenv('SYMFONY__REDIS__HOST'), - 'port' => getenv('SYMFONY__REDIS__PORT'), + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT'), 'vendor' => 'predis', 'lazy' => false, ]; diff --git a/pkg/test/SqsExtension.php b/pkg/test/SqsExtension.php index 530b0e988..4446c3346 100644 --- a/pkg/test/SqsExtension.php +++ b/pkg/test/SqsExtension.php @@ -12,14 +12,14 @@ trait SqsExtension */ private function buildSqsContext() { - if (false == getenv('AWS__SQS__KEY')) { + if (false == getenv('AWS_SQS_KEY')) { throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment'); } $config = [ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), + 'key' => getenv('AWS_SQS_KEY'), + 'secret' => getenv('AWS_SQS_SECRET'), + 'region' => getenv('AWS_SQS_REGION'), 'lazy' => false, ]; diff --git a/pkg/test/composer.json b/pkg/test/composer.json index 8d25ea853..06a34951d 100644 --- a/pkg/test/composer.json +++ b/pkg/test/composer.json @@ -1,5 +1,6 @@ { "name": "enqueue/test", + "homepage": "https://github.com/php-enqueue/enqueue-dev", "license": "MIT", "autoload": { "psr-4": { "Enqueue\\Test\\": "" }