xMerge branch 'master' into bench

makasim · makasim · commit f53bddb17687 · 2018-01-04T14:18:04.000+02:00
diff --git a/README.md b/README.md
@@ -78,6 +78,7 @@ Features:
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Quick tour](docs/quick_tour.md)
 * [Documentation](docs/index.md)
 * [Blog](docs/index.md#blogs)
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "enqueue/enqueue-dev",
   "type": "project",
   "minimum-stability": "beta",
-  "homepage": "https://github.com/php-enqueue/enqueue-dev",
+  "homepage": "https://enqueue.forma-pro.com/",
   "require": {
     "php": ">=5.6",
     "enqueue/enqueue": "*@dev",
diff --git a/docs/laravel/queues.md b/docs/laravel/queues.md
@@ -22,7 +22,7 @@ return [
             'connection_factory_class' => \Enqueue\Fs\FsConnectionFactory::class,
             
             // the factory specific options
-            'dsn' => 'file://'.realpath(__DIR__.'/../storage').'/enqueue',
+            'dsn' => 'file://'.storage_path('enqueue'),
         ],
     ],
 ];
diff --git a/docs/laravel/quick_tour.md b/docs/laravel/quick_tour.md
@@ -11,7 +11,7 @@ The package allows you to use queue interop transport the [laravel way](https://
 You have to install `enqueue/laravel-queue` packages and one of the [supported transports](https://github.com/php-enqueue/enqueue-dev/tree/master/docs/transport).
 
 ```bash
-$ composer require enqueue/larvel-queue enqueue/fs
+$ composer require enqueue/laravel-queue enqueue/fs
 ```
 
 ## Register service provider
diff --git a/pkg/amqp-bunny/README.md b/pkg/amqp-bunny/README.md
@@ -9,6 +9,7 @@ This is an implementation of [amqp interop](https://github.com/queue-interop/amq
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Queue Amqp Transport",
     "keywords": ["messaging", "queue", "amqp", "bunny"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/amqp-ext/README.md b/pkg/amqp-ext/README.md
@@ -9,6 +9,7 @@ This is an implementation of [amqp interop](https://github.com/queue-interop/amq
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Queue Amqp Transport",
     "keywords": ["messaging", "queue", "amqp"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/amqp-lib/README.md b/pkg/amqp-lib/README.md
@@ -9,6 +9,7 @@ This is an implementation of [amqp interop](https://github.com/queue-interop/amq
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Queue Amqp Transport",
     "keywords": ["messaging", "queue", "amqp"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/amqp-tools/README.md b/pkg/amqp-tools/README.md
@@ -10,6 +10,7 @@ The tools could be used with any [amqp interop](https://github.com/queue-interop
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Queue Amqp Tools",
     "keywords": ["messaging", "queue", "amqp"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/async-event-dispatcher/README.md b/pkg/async-event-dispatcher/README.md
@@ -10,6 +10,7 @@ It allows to processes events in background by sending them to MQ.
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Symfony async event dispatcher",
     "keywords": ["messaging", "queue", "async event", "event dispatcher"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/dbal/README.md b/pkg/dbal/README.md
@@ -9,6 +9,7 @@ This is an implementation of PSR specification. It allows you to send and consum
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Queue Doctrine DBAL Transport",
     "keywords": ["messaging", "queue", "doctrine", "dbal"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/enqueue-bundle/README.md b/pkg/enqueue-bundle/README.md
@@ -9,6 +9,7 @@ Integrates message queue components to Symfony application.
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Quick tour](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/bundle/quick_tour.md)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
@@ -3,7 +3,7 @@
     "type": "symfony-bundle",
     "description": "Message Queue Bundle",
     "keywords": ["messaging", "queue", "amqp", "rabbitmq"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/enqueue/Consumption/Extension/SignalExtension.php b/pkg/enqueue/Consumption/Extension/SignalExtension.php
@@ -18,7 +18,7 @@ class SignalExtension implements ExtensionInterface
     protected $interruptConsumption = false;
 
     /**
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
     protected $logger;
 
@@ -84,7 +84,10 @@ public function onIdle(Context $context)
     public function interruptExecutionIfNeeded(Context $context)
     {
         if (false == $context->isExecutionInterrupted() && $this->interruptConsumption) {
-            $this->logger->debug('[SignalExtension] Interrupt execution');
+            if ($this->logger) {
+                $this->logger->debug('[SignalExtension] Interrupt execution');
+            }
+
             $context->setExecutionInterrupted($this->interruptConsumption);
 
             $this->interruptConsumption = false;
@@ -104,7 +107,10 @@ public function handleSignal($signal)
             case SIGTERM:  // 15 : supervisor default stop
             case SIGQUIT:  // 3  : kill -s QUIT
             case SIGINT:   // 2  : ctrl+c
-                $this->logger->debug('[SignalExtension] Interrupt consumption');
+                if ($this->logger) {
+                    $this->logger->debug('[SignalExtension] Interrupt consumption');
+                }
+
                 $this->interruptConsumption = true;
                 break;
             default:
diff --git a/pkg/enqueue/Consumption/QueueConsumer.php b/pkg/enqueue/Consumption/QueueConsumer.php
@@ -168,39 +168,47 @@ public function consume(ExtensionInterface $runtimeExtension = null)
         $logger = $context->getLogger() ?: new NullLogger();
         $logger->info('Start consuming');
 
-        while (true) {
-            try {
-                if ($this->psrContext instanceof AmqpContext) {
-                    $callback = function (AmqpMessage $message, AmqpConsumer $consumer) use ($extension, $logger, &$context) {
-                        $currentProcessor = null;
+        if ($this->psrContext instanceof AmqpContext) {
+            $callback = function (AmqpMessage $message, AmqpConsumer $consumer) use ($extension, $logger, &$context) {
+                $currentProcessor = null;
+
+                /** @var PsrQueue $queue */
+                foreach ($this->boundProcessors as list($queue, $processor)) {
+                    if ($queue->getQueueName() === $consumer->getQueue()->getQueueName()) {
+                        $currentProcessor = $processor;
+                    }
+                }
 
-                        /** @var PsrQueue $queue */
-                        foreach ($this->boundProcessors as list($queue, $processor)) {
-                            if ($queue->getQueueName() === $consumer->getQueue()->getQueueName()) {
-                                $currentProcessor = $processor;
-                            }
-                        }
+                if (false == $currentProcessor) {
+                    throw new \LogicException(sprintf('The processor for the queue "%s" could not be found.', $consumer->getQueue()->getQueueName()));
+                }
 
-                        if (false == $currentProcessor) {
-                            throw new \LogicException(sprintf('The processor for the queue "%s" could not be found.', $consumer->getQueue()->getQueueName()));
-                        }
+                $context = new Context($this->psrContext);
+                $context->setLogger($logger);
+                $context->setPsrQueue($consumer->getQueue());
+                $context->setPsrConsumer($consumer);
+                $context->setPsrProcessor($currentProcessor);
+                $context->setPsrMessage($message);
 
-                        $context = new Context($this->psrContext);
-                        $context->setLogger($logger);
-                        $context->setPsrQueue($consumer->getQueue());
-                        $context->setPsrConsumer($consumer);
-                        $context->setPsrProcessor($currentProcessor);
-                        $context->setPsrMessage($message);
+                $this->doConsume($extension, $context);
 
-                        $this->doConsume($extension, $context);
+                return true;
+            };
 
-                        return true;
-                    };
+            foreach ($consumers as $consumer) {
+                /* @var AmqpConsumer $consumer */
 
-                    foreach ($consumers as $consumer) {
-                        /* @var AmqpConsumer $consumer */
+                $this->psrContext->subscribe($consumer, $callback);
+            }
+        }
 
-                        $this->psrContext->subscribe($consumer, $callback);
+        while (true) {
+            try {
+                if ($this->psrContext instanceof AmqpContext) {
+                    $extension->onBeforeReceive($context);
+
+                    if ($context->isExecutionInterrupted()) {
+                        throw new ConsumptionInterruptedException();
                     }
 
                     $this->psrContext->consume($this->receiveTimeout);
@@ -266,16 +274,14 @@ protected function doConsume(ExtensionInterface $extension, Context $context)
         $consumer = $context->getPsrConsumer();
         $logger = $context->getLogger();
 
-        if (false == $context->getPsrMessage() instanceof AmqpContext) {
-            $extension->onBeforeReceive($context);
-        }
-
         if ($context->isExecutionInterrupted()) {
             throw new ConsumptionInterruptedException();
         }
 
         $message = $context->getPsrMessage();
         if (false == $message) {
+            $extension->onBeforeReceive($context);
+
             if ($message = $consumer->receive($this->receiveTimeout)) {
                 $context->setPsrMessage($message);
             }
@@ -312,10 +318,6 @@ protected function doConsume(ExtensionInterface $extension, Context $context)
             $logger->info(sprintf('Message processed: %s', $context->getResult()));
 
             $extension->onPostReceived($context);
-
-            if ($context->getPsrMessage() instanceof AmqpContext) {
-                $extension->onBeforeReceive($context);
-            }
         } else {
             usleep($this->idleTimeout * 1000);
             $extension->onIdle($context);
diff --git a/pkg/enqueue/README.md b/pkg/enqueue/README.md
@@ -11,6 +11,7 @@ Read more about it in documentation.
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Queue Library",
     "keywords": ["messaging", "queue", "amqp", "rabbitmq"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/fs/README.md b/pkg/fs/README.md
@@ -9,6 +9,7 @@ This is an implementation of PSR queue specification. It allows you to send and
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Enqueue Filesystem based transport",
     "keywords": ["messaging", "queue", "filesystem", "local"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/gearman/README.md b/pkg/gearman/README.md
@@ -9,6 +9,7 @@ This is an implementation of the queue specification. It allows you to send and
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Queue Gearman transport",
     "keywords": ["messaging", "queue", "german"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/gps/README.md b/pkg/gps/README.md
@@ -9,6 +9,7 @@ This is an implementation of PSR specification. It allows you to send and consum
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Message Google Cloud Pub/Sub Transport",
     "keywords": ["messaging", "queue", "google", "pubsub"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/job-queue/README.md b/pkg/job-queue/README.md
@@ -11,6 +11,7 @@ Read more about it in documentation
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Job Queue",
     "keywords": ["messaging", "queue", "jobs"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/null/README.md b/pkg/null/README.md
@@ -9,6 +9,7 @@ This is an implementation of PSR queue specification. It does not send messages
 
 ## Resources
 
+* [Site](https://enqueue.forma-pro.com/)
 * [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
diff --git a/pkg/null/composer.json b/pkg/null/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Enqueue Null transport",
     "keywords": ["messaging", "queue", "testing"],
-    "homepage": "https://github.com/php-enqueue/enqueue-dev",
+    "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
         "php": ">=5.6",
diff --git a/pkg/pheanstalk/README.md b/pkg/pheanstalk/README.md
diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json
diff --git a/pkg/rdkafka/README.md b/pkg/rdkafka/README.md
diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json
diff --git a/pkg/redis/README.md b/pkg/redis/README.md
diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json
diff --git a/pkg/simple-client/README.md b/pkg/simple-client/README.md
diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json
diff --git a/pkg/sqs/README.md b/pkg/sqs/README.md
diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json
diff --git a/pkg/stomp/README.md b/pkg/stomp/README.md
diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json
diff --git a/pkg/test/README.md b/pkg/test/README.md
diff --git a/pkg/test/composer.json b/pkg/test/composer.json
