Merge branch 'chriwup-master'

Author: k-k

src/Command/QueueReceiveCommand.php

@@ -97,7 +97,7 @@ private function pollQueue($registry, $name)
             );
         }
 
-        $dispatcher = $this->getContainer()->get('event_dispatcher');
+        $dispatcher = $this->container->get('event_dispatcher');
         $messages   = $registry->get($name)->receive();
 
         foreach ($messages as $message) {

src/DependencyInjection/UecodeQPushExtension.php

@@ -136,24 +136,45 @@ private function createAwsClient($config, ContainerBuilder $container, $name)
 
         if (!$container->hasDefinition($service)) {
 
-            if (!class_exists('Aws\Common\Aws')) {
+            $aws2 = class_exists('Aws\Common\Aws');
+            $aws3 = class_exists('Aws\Sdk');
+            if (!$aws2 && !$aws3) {
                 throw new \RuntimeException(
                     'You must require "aws/aws-sdk-php" to use the AWS provider.'
                 );
             }
 
-            $awsConfig = [];
-            if (!empty($config['key']) && !empty($config['secret'])) {
-                $awsConfig['key'] = $config['key'];
-                $awsConfig['secret'] = $config['secret'];
-            }
-
-            $awsConfig['region'] = $config['region'];
+            $awsConfig = [
+                'region' => $config['region']
+            ];
 
             $aws = new Definition('Aws\Common\Aws');
             $aws->setFactory(['Aws\Common\Aws', 'factory']);
             $aws->setArguments([$awsConfig]);
 
+            if ($aws2) {
+                $aws = new Definition('Aws\Common\Aws');
+                $aws->setFactory(['Aws\Common\Aws', 'factory']);
+
+                if (!empty($config['key']) && !empty($config['secret'])) {
+                    $awsConfig['key']    = $config['key'];
+                    $awsConfig['secret'] = $config['secret'];
+                }
+
+            } else {
+                $aws = new Definition('Aws\Sdk');
+
+                if (!empty($config['key']) && !empty($config['secret'])) {
+                    $awsConfig['credentials'] = [
+                        'key'    => $config['key'],
+                        'secret' => $config['secret']
+                    ];
+                }
+                $awsConfig['version']  = 'latest';
+            }
+
+            $aws->setArguments([$awsConfig]);
+
             $container->setDefinition($service, $aws)
                 ->setPublic(false);
         }

src/Provider/AwsProvider.php

@@ -22,10 +22,10 @@
 
 namespace Uecode\Bundle\QPushBundle\Provider;
 
-use Aws\Common\Aws;
 use Aws\Sns\SnsClient;
 use Aws\Sqs\SqsClient;
 use Aws\Sqs\Exception\SqsException;
+
 use Doctrine\Common\Cache\Cache;
 use Symfony\Bridge\Monolog\Logger;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -71,10 +71,12 @@ public function __construct($name, array $options, $client, Cache $cache, Logger
     {
         $this->name     = $name;
         $this->options  = $options;
-        $this->sqs      = $client->get('Sqs');
-        $this->sns      = $client->get('Sns');
         $this->cache    = $cache;
         $this->logger   = $logger;
+        // get() method used for sdk v2, create methods for v3
+        $useGet = method_exists($client, 'get');
+        $this->sqs      = $useGet ? $client->get('Sqs') : $client->createSqs();
+        $this->sns      = $useGet ? $client->get('Sns') : $client->createSns();
     }
 
     public function getProvider()