#192: Refactoring

Author: zhuravljov

src/drivers/sqs/Queue.php

@@ -23,15 +23,15 @@ class Queue extends CliQueue
 
     /**
      * aws access key
-     * @var string
+     * @var string|null
      */
-    public $key = '';
+    public $key;
 
     /**
      * aws secret
-     * @var string
+     * @var string|null
      */
-    public $secret = '';
+    public $secret;
 
     /**
      * region where queue is hosted.
@@ -118,26 +118,25 @@ private function getPayload($timeout = 0)
      */
     protected function getClient()
     {
-        if ($this->key && $this->secret) {
-            $provider = [
+        if ($this->_client) {
+            return $this->_client;
+        }
+
+        if ($this->key !== null && $this->secret !== null) {
+            $credentials = [
                 'key'    => $this->key,
                 'secret' => $this->secret
             ];
         } else {
             // use default provider if no key and secret passed
             //see - http://docs.aws.amazon.com/aws-sdk-php/v3/guide/guide/credentials.html#credential-profiles
-            $provider = CredentialProvider::defaultProvider();
+            $credentials = CredentialProvider::defaultProvider();
         }
-
-        $config = [
-            'credentials' => $provider,
+        $this->_client = new SqsClient([
+            'credentials' => $credentials,
             'region' => $this->region,
             'version' => $this->version,
-        ];
-
-        if (!$this->_client) {
-            $this->_client = SqsClient::factory($config);
-        }
+        ]);
 
         return $this->_client;
     }

tests/app/config/main.php

@@ -93,7 +93,7 @@
     ];
 }
 
-if (getenv('AWS_SQS_URL') !== false) {
+if (getenv('AWS_SQS_ENABLED')) {
     $config['bootstrap'][] = 'sqsQueue';
     $config['components']['sqsQueue'] = [
         'class' => \yii\queue\sqs\Queue::class,

tests/drivers/sqs/QueueTest.php

@@ -43,6 +43,16 @@ public function testLater()
         $this->assertSimpleJobLaterDone($job, 2);
     }
 
+    public function testClear()
+    {
+        if (!getenv('AWS_SQS_CLEAR_TEST_ENABLED')) {
+            $this->markTestSkipped(__METHOD__ . ' is disabled');
+        }
+
+        $this->getQueue()->push($this->createSimpleJob());
+        $this->runProcess('php yii queue/clear --interactive=0');
+    }
+
     /**
      * @return Queue
      */
@@ -53,7 +63,7 @@ protected function getQueue()
 
     protected function setUp()
     {
-        if (getenv('AWS_SQS_URL') === false) {
+        if (!getenv('AWS_SQS_ENABLED')) {
             $this->markTestSkipped('AWS SQS tests are disabled');
         }