Fixes merge conflicts

Author: Keith Kirk

.gitignore

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

composer.json

@@ -31,13 +31,17 @@
         "symfony/finder": "~2.3|^3.0",
         "symfony/filesystem": "~2.3|^3.0",
         "symfony/phpunit-bridge": "^4.0",
-        "symfony/yaml": "~2.8|^3.0"
+        "symfony/yaml": "~2.8|^3.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": {

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,6 +98,10 @@ 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(
@@ -256,6 +260,11 @@ private function createSyncClient()
     {
         return new Reference('event_dispatcher');
     }
+    
+    private function createDoctrineClient($config)
+    {
+        return new Reference($config['entity_manager']);
+    }
 
     /**
      * @param string $serviceId

src/Entity/DoctrineMessage.php

@@ -0,0 +1,236 @@
+<?php
+
+/**
+ * Copyright Talisman Innovations Ltd. (2016). All rights reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @package     qpush-bundle
+ * @copyright   Talisman Innovations Ltd. (2016)
+ * @license     Apache License, Version 2.0
+ */
+
+namespace Uecode\Bundle\QPushBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\ORM\Mapping\Index as Index;
+use Gedmo\Mapping\Annotation as Gedmo;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="uecode_qpush_message",
+ * indexes={@ORM\Index(name="uecode_qpush_queue_idx",columns={"queue"}),
+ *          @ORM\Index(name="uecode_qpush_delivered_idx",columns={"delivered"}),
+ *          @ORM\Index(name="uecode_qpush_created_idx",columns={"created"})})
+ */
+class DoctrineMessage {
+    /** 
+     * @ORM\Id 
+     * @ORM\GeneratedValue 
+     * @ORM\Column(type="integer") 
+     */
+    private $id;
+    
+     /**
+     * @var \DateTime $created
+     *
+     * @Gedmo\Timestampable(on="create")
+     * @ORM\Column(type="datetime")
+     */
+    private $created;
+
+    /**
+     * @var \DateTime $updated
+     *
+     * @Gedmo\Timestampable(on="update")
+     * @ORM\Column(type="datetime")
+     */
+    private $updated;
+    
+    /**
+     *
+     * @ORM\Column(type="string")
+     */
+    private $queue;
+    
+    /**
+     *
+     * @ORM\Column(type="boolean")
+     */
+    private $delivered;
+    
+    /**
+     *
+     * @ORM\Column(type="array")
+     */
+    private $message;
+
+     /** 
+     * @ORM\Column(type="integer") 
+     */
+    private $length;
+    
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set message
+     *
+     * @param array $message
+     *
+     * @return DoctrineMessage
+     */
+    public function setMessage($message)
+    {
+        $this->message = $message;
+
+        return $this;
+    }
+
+    /**
+     * Get message
+     *
+     * @return array
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * Set queue
+     *
+     * @param string $queue
+     *
+     * @return DoctrineMessage
+     */
+    public function setQueue($queue)
+    {
+        $this->queue = $queue;
+
+        return $this;
+    }
+
+    /**
+     * Get queue
+     *
+     * @return string
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * Set delivered
+     *
+     * @param boolean $delivered
+     *
+     * @return DoctrineMessage
+     */
+    public function setDelivered($delivered)
+    {
+        $this->delivered = $delivered;
+
+        return $this;
+    }
+
+    /**
+     * Get delivered
+     *
+     * @return boolean
+     */
+    public function getDelivered()
+    {
+        return $this->delivered;
+    }
+
+    /**
+     * Set created
+     *
+     * @param \DateTime $created
+     *
+     * @return DoctrineMessage
+     */
+    public function setCreated($created)
+    {
+        $this->created = $created;
+
+        return $this;
+    }
+
+    /**
+     * Get created
+     *
+     * @return \DateTime
+     */
+    public function getCreated()
+    {
+        return $this->created;
+    }
+
+    /**
+     * Set updated
+     *
+     * @param \DateTime $updated
+     *
+     * @return DoctrineMessage
+     */
+    public function setUpdated($updated)
+    {
+        $this->updated = $updated;
+
+        return $this;
+    }
+
+    /**
+     * Get updated
+     *
+     * @return \DateTime
+     */
+    public function getUpdated()
+    {
+        return $this->updated;
+    }
+
+    /**
+     * Set length
+     *
+     * @param integer $length
+     *
+     * @return DoctrineMessage
+     */
+    public function setLength($length)
+    {
+        $this->length = $length;
+
+        return $this;
+    }
+
+    /**
+     * Get length
+     *
+     * @return integer
+     */
+    public function getLength()
+    {
+        return $this->length;
+    }
+}