From 4d8e9cbc9e5bc25e785854a25e955c4b5acec8df Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Thu, 3 May 2018 23:42:28 +0300 Subject: [PATCH 01/10] [skip ci] update release script. --- bin/release | 2 +- bin/subtree-split | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/release b/bin/release index f958eed3c..44e37f9fb 100755 --- a/bin/release +++ b/bin/release @@ -14,7 +14,7 @@ fi CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD` -for REMOTE in origin stomp amqp-ext amqp-lib amqp-bunny amqp-tools pheanstalk gearman sqs gps fs redis dbal null rdkafka enqueue simple-client enqueue-bundle job-queue test async-event-dispatcher +for REMOTE in origin stomp amqp-ext amqp-lib amqp-bunny amqp-tools pheanstalk gearman sqs gps fs redis dbal null rdkafka enqueue simple-client enqueue-bundle job-queue test async-event-dispatcher mongodb do echo "" echo "" diff --git a/bin/subtree-split b/bin/subtree-split index 2c3dd8261..ae411e4c9 100755 --- a/bin/subtree-split +++ b/bin/subtree-split @@ -63,6 +63,7 @@ remote enqueue-bundle git@github.com:php-enqueue/enqueue-bundle.git remote job-queue git@github.com:php-enqueue/job-queue.git remote test git@github.com:php-enqueue/test.git remote async-event-dispatcher git@github.com:php-enqueue/async-event-dispatcher.git +remote mongodb git@github.com:php-enqueue/mongodb.git split 'pkg/enqueue' enqueue split 'pkg/simple-client' simple-client @@ -83,4 +84,5 @@ split 'pkg/gps' gps split 'pkg/enqueue-bundle' enqueue-bundle split 'pkg/job-queue' job-queue split 'pkg/test' test -split 'pkg/async-event-dispatcher' async-event-dispatcher \ No newline at end of file +split 'pkg/async-event-dispatcher' async-event-dispatcher +split 'pkg/mongodb' mongodb \ No newline at end of file From 79def9f814487e0ab1f45e7730802e5592afc7f2 Mon Sep 17 00:00:00 2001 From: Max Kotliar Date: Fri, 4 May 2018 08:46:12 +0300 Subject: [PATCH 02/10] [skip ci][doc] fix typo --- docs/transport/mongodb.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/transport/mongodb.md b/docs/transport/mongodb.md index 8bae7bd97..451eecc3a 100644 --- a/docs/transport/mongodb.md +++ b/docs/transport/mongodb.md @@ -33,10 +33,10 @@ $factory = new MongodbConnectionFactory('mongodb:'); $factory = new MongodbConnectionFactory([]); $factory = new MongodbConnectionFactory([ - 'uri' => 'mongodb://localhost:27017/db_name', - 'dbname' => 'enqueue', - 'collection_name' => 'enqueue', - 'polling_interval' => '1000', + 'dsn' => 'mongodb://localhost:27017/db_name', + 'dbname' => 'enqueue', + 'collection_name' => 'enqueue', + 'polling_interval' => '1000', ]); $psrContext = $factory->createContext(); From ff9db49f85e993e4b441920806a488d68a9550cb Mon Sep 17 00:00:00 2001 From: Max Kotliar Date: Fri, 4 May 2018 08:47:00 +0300 Subject: [PATCH 03/10] [mongodb] add mongodb to enqueue dev deps. --- pkg/enqueue/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index 86673b9b8..fffef75c2 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -33,6 +33,7 @@ "enqueue/stomp": "^0.8@dev", "enqueue/test": "^0.8@dev", "enqueue/simple-client": "^0.8@dev", + "enqueue/mongodb": "^0.8@dev", "empi89/php-amqp-stubs": "*@dev" }, "suggest": { From 5923ce9f6337a733e25341894c9a5a929707a8b9 Mon Sep 17 00:00:00 2001 From: Max Kotliar Date: Fri, 4 May 2018 08:56:44 +0300 Subject: [PATCH 04/10] Update README.md --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index b6df3127b..08edc9a1b 100644 --- a/README.md +++ b/README.md @@ -15,59 +15,59 @@ Features: * Supported transports * [AMQP(s)](docs/transport/amqp.md) based on [PHP AMQP extension](https://github.com/pdezwart/php-amqp). [![Build Status](https://travis-ci.org/php-enqueue/amqp-ext.png?branch=master)](https://travis-ci.org/php-enqueue/amqp-ext) -[![Total Downloads](https://poser.pugx.org/enqueue/amqp-ext/d/total.png)](https://packagist.org/packages/enqueue/amqp-ext) +[![Total Downloads](https://poser.pugx.org/enqueue/amqp-ext/d/total.png)](https://packagist.org/packages/enqueue/amqp-ext/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/amqp-ext/version.png)](https://packagist.org/packages/enqueue/amqp-ext) * [AMQP](docs/transport/amqp_bunny.md) based on [bunny](https://github.com/jakubkulhan/bunny). [![Build Status](https://travis-ci.org/php-enqueue/amqp-bunny.png?branch=master)](https://travis-ci.org/php-enqueue/amqp-bunny) -[![Total Downloads](https://poser.pugx.org/enqueue/amqp-bunny/d/total.png)](https://packagist.org/packages/enqueue/amqp-bunny) +[![Total Downloads](https://poser.pugx.org/enqueue/amqp-bunny/d/total.png)](https://packagist.org/packages/enqueue/amqp-bunny/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/amqp-bunny/version.png)](https://packagist.org/packages/enqueue/amqp-bunny) * [AMQP(s)](docs/transport/amqp_lib.md) based on [php-amqplib](https://github.com/php-amqplib/php-amqplib). [![Build Status](https://travis-ci.org/php-enqueue/amqp-lib.png?branch=master)](https://travis-ci.org/php-enqueue/amqp-lib) -[![Total Downloads](https://poser.pugx.org/enqueue/amqp-lib/d/total.png)](https://packagist.org/packages/enqueue/amqp-lib) +[![Total Downloads](https://poser.pugx.org/enqueue/amqp-lib/d/total.png)](https://packagist.org/packages/enqueue/amqp-lib/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/amqp-lib/version.png)](https://packagist.org/packages/enqueue/amqp-lib) * [Beanstalk](docs/transport/pheanstalk.md). [![Build Status](https://travis-ci.org/php-enqueue/pheanstalk.png?branch=master)](https://travis-ci.org/php-enqueue/pheanstalk) -[![Total Downloads](https://poser.pugx.org/enqueue/pheanstalk/d/total.png)](https://packagist.org/packages/enqueue/pheanstalk) +[![Total Downloads](https://poser.pugx.org/enqueue/pheanstalk/d/total.png)](https://packagist.org/packages/enqueue/pheanstalk/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/pheanstalk/version.png)](https://packagist.org/packages/enqueue/pheanstalk) * [STOMP](docs/transport/stomp.md) [![Build Status](https://travis-ci.org/php-enqueue/stomp.png?branch=master)](https://travis-ci.org/php-enqueue/stomp) -[![Total Downloads](https://poser.pugx.org/enqueue/stomp/d/total.png)](https://packagist.org/packages/enqueue/stomp) +[![Total Downloads](https://poser.pugx.org/enqueue/stomp/d/total.png)](https://packagist.org/packages/enqueue/stomp/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/stomp/version.png)](https://packagist.org/packages/enqueue/stomp) * [Amazon SQS](docs/transport/sqs.md) [![Build Status](https://travis-ci.org/php-enqueue/sqs.png?branch=master)](https://travis-ci.org/php-enqueue/sqs) -[![Total Downloads](https://poser.pugx.org/enqueue/sqs/d/total.png)](https://packagist.org/packages/enqueue/sqs) +[![Total Downloads](https://poser.pugx.org/enqueue/sqs/d/total.png)](https://packagist.org/packages/enqueue/sqs/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/sqs/version.png)](https://packagist.org/packages/enqueue/sqs) * [Google PubSub](docs/transport/gps.md) [![Build Status](https://travis-ci.org/php-enqueue/gps.png?branch=master)](https://travis-ci.org/php-enqueue/gps) -[![Total Downloads](https://poser.pugx.org/enqueue/gps/d/total.png)](https://packagist.org/packages/enqueue/gps) +[![Total Downloads](https://poser.pugx.org/enqueue/gps/d/total.png)](https://packagist.org/packages/enqueue/gps/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/gps/version.png)](https://packagist.org/packages/enqueue/gps) * [Kafka](docs/transport/kafka.md) [![Build Status](https://travis-ci.org/php-enqueue/rdkafka.png?branch=master)](https://travis-ci.org/php-enqueue/rdkafka) -[![Total Downloads](https://poser.pugx.org/enqueue/rdkafka/d/total.png)](https://packagist.org/packages/enqueue/rdkafka) +[![Total Downloads](https://poser.pugx.org/enqueue/rdkafka/d/total.png)](https://packagist.org/packages/enqueue/rdkafka/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/rdkafka/version.png)](https://packagist.org/packages/enqueue/rdkafka) * [Redis](docs/transport/redis.md) [![Build Status](https://travis-ci.org/php-enqueue/redis.png?branch=master)](https://travis-ci.org/php-enqueue/redis) -[![Total Downloads](https://poser.pugx.org/enqueue/redis/d/total.png)](https://packagist.org/packages/enqueue/redis) +[![Total Downloads](https://poser.pugx.org/enqueue/redis/d/total.png)](https://packagist.org/packages/enqueue/redis/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/redis/version.png)](https://packagist.org/packages/enqueue/redis) * [Gearman](docs/transport/gearman.md) [![Build Status](https://travis-ci.org/php-enqueue/gearman.png?branch=master)](https://travis-ci.org/php-enqueue/gearman) -[![Total Downloads](https://poser.pugx.org/enqueue/gearman/d/total.png)](https://packagist.org/packages/enqueue/gearman) +[![Total Downloads](https://poser.pugx.org/enqueue/gearman/d/total.png)](https://packagist.org/packages/enqueue/gearman/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/gearman/version.png)](https://packagist.org/packages/enqueue/gearman) * [Doctrine DBAL](docs/transport/dbal.md) [![Build Status](https://travis-ci.org/php-enqueue/dbal.png?branch=master)](https://travis-ci.org/php-enqueue/dbal) -[![Total Downloads](https://poser.pugx.org/enqueue/dbal/d/total.png)](https://packagist.org/packages/enqueue/dbal) +[![Total Downloads](https://poser.pugx.org/enqueue/dbal/d/total.png)](https://packagist.org/packages/enqueue/dbal/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/dbal/version.png)](https://packagist.org/packages/enqueue/dbal) * [Filesystem](docs/transport/filesystem.md) [![Build Status](https://travis-ci.org/php-enqueue/fs.png?branch=master)](https://travis-ci.org/php-enqueue/fs) -[![Total Downloads](https://poser.pugx.org/enqueue/fs/d/total.png)](https://packagist.org/packages/enqueue/fs) +[![Total Downloads](https://poser.pugx.org/enqueue/fs/d/total.png)](https://packagist.org/packages/enqueue/fs/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/fs/version.png)](https://packagist.org/packages/enqueue/fs) * [Mongodb](docs/transport/mongodb.md) [![Build Status](https://travis-ci.org/php-enqueue/mongodb.png?branch=master)](https://travis-ci.org/php-enqueue/mongodb) -[![Total Downloads](https://poser.pugx.org/enqueue/mongodb/d/total.png)](https://packagist.org/packages/enqueue/mongodb) +[![Total Downloads](https://poser.pugx.org/enqueue/mongodb/d/total.png)](https://packagist.org/packages/enqueue/mongodb/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/mongodb/version.png)](https://packagist.org/packages/enqueue/mongodb) * [Null](docs/transport/null.md). [![Build Status](https://travis-ci.org/php-enqueue/null.png?branch=master)](https://travis-ci.org/php-enqueue/null) -[![Total Downloads](https://poser.pugx.org/enqueue/null/d/total.png)](https://packagist.org/packages/enqueue/null) +[![Total Downloads](https://poser.pugx.org/enqueue/null/d/total.png)](https://packagist.org/packages/enqueue/null/stats) [![Latest Stable Version](https://poser.pugx.org/enqueue/null/version.png)](https://packagist.org/packages/enqueue/null) * [the others are comming](https://github.com/php-enqueue/enqueue-dev/issues/284) * [Symfony bundle](docs/bundle/quick_tour.md) From d1112e5cf63aef262747a2fd39bb1998e0e581de Mon Sep 17 00:00:00 2001 From: Max Kotliar Date: Fri, 4 May 2018 10:07:54 +0300 Subject: [PATCH 05/10] Update mongodb.md --- docs/transport/mongodb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/transport/mongodb.md b/docs/transport/mongodb.md index 451eecc3a..315bb9bdb 100644 --- a/docs/transport/mongodb.md +++ b/docs/transport/mongodb.md @@ -1,4 +1,4 @@ -# Mongodb transport +# Enqueue Mongodb message queue transport Allows to use [MongoDB](https://www.mongodb.com/) as a message queue broker. From da618071e52c6410c195826bb1f1a0b5bdd7627a Mon Sep 17 00:00:00 2001 From: Max Kotliar Date: Fri, 4 May 2018 14:59:12 +0300 Subject: [PATCH 06/10] [skip ci][travis] remove debug lines --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19f623a12..ed2082dca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,8 +46,6 @@ cache: before_install: - echo "extension = mongodb.so" >> $HOME/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - php -m - - php -i | grep -C 15 mongo install: - rm $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; From eec9fc1a2da7c7af5be29a49c084f49f54e11359 Mon Sep 17 00:00:00 2001 From: Zelimkhan Khalidov Date: Mon, 7 May 2018 12:21:35 +0300 Subject: [PATCH 07/10] Update message_producer.md --- docs/bundle/message_producer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/bundle/message_producer.md b/docs/bundle/message_producer.md index d99ff4244..95712ff1d 100644 --- a/docs/bundle/message_producer.md +++ b/docs/bundle/message_producer.md @@ -26,7 +26,7 @@ where another one (it is called spool producer) collects them in memory and send The producer has two types on send methods: -* `sendEvent` - Message is sent to topic and many consumers can subscriber to it. It is "fire and forget" strategy. The event could be sent to "message bus" to other applications. +* `sendEvent` - Message is sent to topic and many consumers can subscribe to it. It is "fire and forget" strategy. The event could be sent to "message bus" to other applications. * `sendCommand` - Message is to ONE exact consumer. It could be used as "fire and forget" or as RPC. The command message is always sent in scope of current application. ### Send event From e958948dd27877f2e6947f7448a7f8ad2337e327 Mon Sep 17 00:00:00 2001 From: TS <32767367+kfb-ts@users.noreply.github.com> Date: Tue, 8 May 2018 18:39:56 +0200 Subject: [PATCH 08/10] Add gps support for google/cloud-pubsub ^1.0 --- pkg/gps/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index 0766ec235..798fc8656 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -8,7 +8,7 @@ "require": { "php": ">=5.6", "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", - "google/cloud-pubsub": "^0.6.1" + "google/cloud-pubsub": "^0.6.1|^1.0" }, "require-dev": { "phpunit/phpunit": "~5.4.0", From 7e85b4b2aea52e0b80f7f5c6b41eff4167e5a2e6 Mon Sep 17 00:00:00 2001 From: Max Kotliar Date: Tue, 8 May 2018 22:06:07 +0300 Subject: [PATCH 09/10] [mongodb] Parse DSN if array --- pkg/mongodb/MongodbConnectionFactory.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/mongodb/MongodbConnectionFactory.php b/pkg/mongodb/MongodbConnectionFactory.php index 83c405afb..1bc2c2db1 100644 --- a/pkg/mongodb/MongodbConnectionFactory.php +++ b/pkg/mongodb/MongodbConnectionFactory.php @@ -35,6 +35,7 @@ public function __construct($config = 'mongodb:') } elseif (is_string($config)) { $config = $this->parseDsn($config); } elseif (is_array($config)) { + $config = $this->parseDsn(empty($config['dsn']) ? 'mongodb:' : $config['dsn']); } else { throw new \LogicException('The config must be either an array of options, a DSN string or null'); } From dd12bd123a497e599b72d86071abef68a64f0886 Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Tue, 8 May 2018 22:11:19 +0300 Subject: [PATCH 10/10] Release 0.8.29 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3642384b2..1dbf170e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [0.8.29](https://github.com/php-enqueue/enqueue-dev/tree/0.8.29) (2018-05-08) +[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.8.28...0.8.29) + +- \[mongodb\] Parse DSN if array [\#438](https://github.com/php-enqueue/enqueue-dev/pull/438) ([makasim](https://github.com/makasim)) +- \[gps\] Add support for google/cloud-pubsub ^1.0 [\#437](https://github.com/php-enqueue/enqueue-dev/pull/437) ([kfb-ts](https://github.com/kfb-ts)) +- fix typo in message\_producer.md [\#436](https://github.com/php-enqueue/enqueue-dev/pull/436) ([halidovz](https://github.com/halidovz)) + ## [0.8.28](https://github.com/php-enqueue/enqueue-dev/tree/0.8.28) (2018-05-03) [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.8.27...0.8.28)