Merge branch 'master' into symfony4

Author: k-k

.gitignore

@@ -3,3 +3,4 @@
 /docs/_build
 /coverage
 .idea
+/nbproject

.travis.yml

@@ -7,21 +7,17 @@ cache:
         - $HOME/.composer/cache/files
 
 php:
-    - 5.4
-    - 5.5
     - hhvm
-    
+
 matrix:
     fast_finish: true
     include:
-        - php: 5.6
-          env: SYMFONY_VERSION=2.3.*
-        - php: 5.6
-          env: SYMFONY_VERSION=2.6.*
         - php: 5.6
           env: SYMFONY_VERSION=2.7.*
         - php: 5.6
           env: SYMFONY_VERSION=2.8.*
+        - php: 5.6
+          env: SYMFONY_VERSION=3.4.*
         - php: 7.0
           env: COVERAGE=yes
     allow_failures:
@@ -36,7 +32,7 @@ install:
     - composer install --prefer-dist
 
 script:
-    - if [ "$COVERAGE" = "yes" ]; then phpunit --coverage-text --coverage-clover=coverage.clover --testsuite "UecodeQPushBundle Test Suite"; else phpunit --testsuite "UecodeQPushBundle Test Suite"; fi
+    - if [ "$COVERAGE" = "yes" ]; then ./vendor/bin/simple-phpunit --coverage-text --coverage-clover=coverage.clover --testsuite "UecodeQPushBundle Test Suite"; else ./vendor/bin/simple-phpunit --testsuite "UecodeQPushBundle Test Suite"; fi
 
 after_script:
   - if [ "$COVERAGE" = "yes" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi

README.md

@@ -6,7 +6,7 @@ QPush - Symfony2 Push Queue Bundle
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/uecode/qpush-bundle.svg?style=flat-square)](https://scrutinizer-ci.com/g/uecode/qpush-bundle/)
 [![Total Downloads](http://img.shields.io/packagist/dt/uecode/qpush-bundle.svg?style=flat-square)](https://packagist.org/packages/uecode/qpush-bundle)
 
-##Overview
+## Overview
 This bundle allows you to easily consume messages from Push Queues by simply
 tagging your services and relying on Symfony's event dispatcher - without
 needing to run a daemon or background process to continuously poll your queue.
@@ -158,4 +158,3 @@ public function onMessageReceived(MessageEvent $event)
 
 Once all other Event Listeners have been invoked on a `MessageEvent`, the Bundle
 will automatically attempt to remove the Message from your Queue for you.
-

composer.json

@@ -17,26 +17,31 @@
         "email": "kkirk@undergroundelephant.com"
     },
     "require": {
-        "php":                      ">=5.4.0",
-        "doctrine/common":          "~2.4",
+        "php": ">=5.6.0",
+        "doctrine/common": "~2.4",
         "symfony/dependency-injection": "~2.3|^3.0|^4.0",
         "symfony/config": "~2.3|^3.0",
         "symfony/http-kernel": "~2.3|^3.0|^4.0",
         "symfony/console": "~2.3|^3.0|^4.0",
-        "symfony/monolog-bundle":   "~2.3|^3.0|^4.0"
+        "symfony/monolog-bundle": "~2.3|^3.0|^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit":        "~3.7",
-        "aws/aws-sdk-php":        "~2.5",
-        "iron-io/iron_mq":        "^4.0",
-        "symfony/finder":         "~2.3|^3.0|^4.0",
-        "symfony/filesystem":     "~2.3|^3.0|^4.0"
+        "aws/aws-sdk-php": "~2.5",
+        "iron-io/iron_mq": "^4.0",
+        "symfony/finder": "~2.3|^3.0|^4.0",
+        "symfony/filesystem": "~2.3|^3.0|^4.0",
+        "symfony/phpunit-bridge": "^4.0",
+        "symfony/yaml": "~2.8|^3.0|^4.0",
+        "doctrine/orm": "^2.4.8",
+        "stof/doctrine-extensions-bundle": "^1.2"
     },
     "suggest": {
         "aws/aws-sdk-php": "Required to use AWS as a Queue Provider",
         "iron-io/iron_mq": "Required to use IronMQ as a Queue Provider",
         "symfony/finder": "Required to use File as a Queue Provider",
-        "symfony/filesystem": "Required to use File as a Queue Provider"
+        "symfony/filesystem": "Required to use File as a Queue Provider",
+        "doctrine/orm": "Required to use Doctrine as a Queue Provider",
+        "stof/doctrine-extensions-bundle": "Required to use Doctrine as a Queue Provider"
     },
     "autoload": {
         "psr-4": {

docs/configuration.rst

@@ -152,7 +152,7 @@ A working configuration would look like the following
                 provider: aws
                 options:
                     queue_name:                  my_actual_queue_name.fifo
-                    push_notifications:          true
+                    push_notifications:          false
                     notification_retries:        3
                     message_delay:               0
                     message_timeout:             30
@@ -164,3 +164,5 @@ A working configuration would look like the following
                     subscribers:
                         - { endpoint: http://example1.com/, protocol: http }
                         - { endpoint: http://example2.com/, protocol: http }
+                        
+Note that `FIFO` queues are not currently compatible with `push_notifications`. For more information, see: http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-subscribe-queue-sns-topic.html

src/Command/QueueReceiveCommand.php

@@ -100,9 +100,11 @@ private function pollQueue($registry, $name)
         $dispatcher = $this->container->get('event_dispatcher');
         $messages   = $registry->get($name)->receive();
 
-        foreach ($messages as $message) {
-            $messageEvent = new MessageEvent($name, $message);
-            $dispatcher->dispatch(Events::Message($name), $messageEvent);
+        if($messages) {
+            foreach ($messages as $message) {
+                $messageEvent = new MessageEvent($name, $message);
+                $dispatcher->dispatch(Events::Message($name), $messageEvent);
+            }
         }
 
         $msg = "<info>Finished polling %s Queue, %d messages fetched.</info>";

src/DependencyInjection/Configuration.php

@@ -61,7 +61,8 @@ private function getProvidersNode()
             'ironmq' => ['token', 'project_id'],
             'sync' => [],
             'custom' => ['service'],
-            'file' => ['path']
+            'file' => ['path'],
+            'doctrine' => []
         ];
 
         $node
@@ -98,6 +99,10 @@ private function getProvidersNode()
                     ->end()
                     // File
                     ->scalarNode('path')->end()
+                   // Doctrine
+                    ->scalarNode('entity_manager')
+                         ->defaultValue('doctrine.orm.default_entity_manager')
+                    ->end()
                 ->end()
 
                 ->validate()

src/DependencyInjection/UecodeQPushExtension.php

@@ -98,12 +98,18 @@ public function load(array $configs, ContainerBuilder $container)
                     $class = $container->getParameter('uecode_qpush.provider.file');
                     $values['options']['path'] = $config['providers'][$provider]['path'];
                     break;
+                case 'doctrine':
+                    $class = $container->getParameter('uecode_qpush.provider.doctrine');
+                    $client = $this->createDoctrineClient($config['providers'][$provider]);
+                    break;
             }
 
             $definition = new Definition(
                 $class, [$queue, $values['options'], $client, new Reference($cache), new Reference('logger')]
             );
 
+            $definition->setPublic(true);
+
             $definition->addTag('monolog.logger', ['channel' => 'qpush'])
                 ->addTag(
                     'uecode_qpush.event_listener',
@@ -254,6 +260,11 @@ private function createSyncClient()
     {
         return new Reference('event_dispatcher');
     }
+    
+    private function createDoctrineClient($config)
+    {
+        return new Reference($config['entity_manager']);
+    }
 
     /**
      * @param string $serviceId