Fix conflicts

Author: k-k

.travis.yml

@@ -13,6 +13,9 @@ php:
     - hhvm
 
 matrix:
+    exclude:
+        - php: 5.4
+          env: SYMFONY_VERSION=3.0.*
     allow_failures:
         - php: hhvm
 
@@ -21,6 +24,9 @@ env:
     - SYMFONY_VERSION=2.4.*
     - SYMFONY_VERSION=2.5.*
     - SYMFONY_VERSION=2.6.*
+    - SYMFONY_VERSION=2.7.*
+    - SYMFONY_VERSION=2.8.*
+    - SYMFONY_VERSION=3.0.*
 
 install:
     - composer self-update

composer.json

@@ -19,18 +19,18 @@
     "require": {
         "php":                      ">=5.4.0",
         "doctrine/common":          "~2.4",
-        "symfony/dependency-injection": "~2.3, <3.0.0@dev",
-        "symfony/config": "~2.3, <3.0.0@dev",
-        "symfony/http-kernel": "~2.3, <3.0.0@dev",
-        "symfony/console": "~2.3, <3.0.0@dev",
-        "symfony/monolog-bundle":   "~2.3, <3.0.0@dev"
+        "symfony/dependency-injection": "~2.3|^3.0",
+        "symfony/config": "~2.3|^3.0",
+        "symfony/http-kernel": "~2.3|^3.0",
+        "symfony/console": "~2.3|^3.0",
+        "symfony/monolog-bundle":   "~2.3|^3.0"
     },
     "require-dev": {
         "phpunit/phpunit":        "~3.7",
         "aws/aws-sdk-php":        "~2.5",
         "iron-io/iron_mq":        "^4.0",
-        "symfony/finder":         "~2.3",
-        "symfony/filesystem":     "~2.3"
+        "symfony/finder":         "~2.3|^3.0",
+        "symfony/filesystem":     "~2.3|^3.0"
     },
     "suggest": {
         "aws/aws-sdk-php": "Required to use AWS as a Queue Provider",

src/DependencyInjection/UecodeQPushExtension.php

@@ -22,7 +22,6 @@
 
 namespace Uecode\Bundle\QPushBundle\DependencyInjection;
 
-use Uecode\Bundle\QPushBundle\DependencyInjection\Configuration;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;

src/EventListener/RequestListener.php

@@ -26,7 +26,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Uecode\Bundle\QPushBundle\Message\Message;
 use Uecode\Bundle\QPushBundle\Message\Notification;
 use Uecode\Bundle\QPushBundle\Event\Events;
 use Uecode\Bundle\QPushBundle\Event\NotificationEvent;

src/Provider/AbstractProvider.php

@@ -25,7 +25,6 @@
 use Doctrine\Common\Cache\Cache;
 use Symfony\Bridge\Monolog\Logger;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Uecode\Bundle\QPushBundle\Provider\ProviderInterface;
 use Uecode\Bundle\QPushBundle\Event\MessageEvent;
 use Uecode\Bundle\QPushBundle\Event\NotificationEvent;
 
@@ -118,7 +117,7 @@ public function log($level, $message, array $context = [])
         // Add the queue name and provider to the context
         $context = array_merge(['queue' => $this->name, 'provider'  => $this->getProvider()], $context);
 
-        $this->logger->addRecord($level, $message, $context);
+        return $this->logger->addRecord($level, $message, $context);
     }
 
     /**

src/Provider/AwsProvider.php

@@ -22,10 +22,10 @@
 
 namespace Uecode\Bundle\QPushBundle\Provider;
 
-use Aws\Sns\SnsClient;
 use Aws\Sns\Exception\NotFoundException;
-use Aws\Sqs\SqsClient;
+use Aws\Sns\SnsClient;
 use Aws\Sqs\Exception\SqsException;
+use Aws\Sqs\SqsClient;
 
 use Doctrine\Common\Cache\Cache;
 use Symfony\Bridge\Monolog\Logger;

src/Provider/FileProvider.php

@@ -16,7 +16,7 @@ class FileProvider extends AbstractProvider
 
     public function __construct($name, array $options, $client, Cache $cache, Logger $logger) {
         $this->name     = $name;
-        /** @var md5 only contain numeric and A to F, so it is file system safe */
+        /* md5 only contain numeric and A to F, so it is file system safe */
         $this->queuePath = $options['path'].DIRECTORY_SEPARATOR.str_replace('-', '', hash('md5', $name));
         $this->options  = $options;
         $this->cache    = $cache;

src/Provider/IronMqProvider.php

@@ -46,7 +46,7 @@ class IronMqProvider extends AbstractProvider
     /**
      * IronMQ Queue
      *
-     * @var stdObject
+     * @var object
      */
     private $queue;
 
@@ -212,7 +212,7 @@ public function receive(array $options = [])
     public function delete($id)
     {
         try {
-            $result = $this->ironmq->deleteMessage($this->getNameWithPrefix(), $id);
+            $this->ironmq->deleteMessage($this->getNameWithPrefix(), $id);
             $this->log(200, "Message deleted.", ['message_id' => $id]);
         } catch ( \Exception $e) {
             if (false !== strpos($e->getMessage(), "Queue not found")) {