Merge pull request #3 from sters/fix-issue-2

Author: sters

.circleci/config.yml

@@ -0,0 +1,19 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/php:5.6-apache-jessie-node-browsers
+    working_directory: ~/repo
+    steps:
+      - run: sudo apt-get install libicu-dev libmcrypt-dev
+      - run: sudo docker-php-ext-install intl && sudo docker-php-ext-install mcrypt
+      - checkout
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "composer.json" }}
+      - run: composer install
+      - save_cache:
+          paths:
+            - vendor
+          key: v1-dependencies-{{ checksum "composer.json" }}
+      - run: composer test

README.md

@@ -31,6 +31,7 @@ one Datasrouce has one S3 Bucket connection.
         'key'        => 'put your s3 access key',
         'secret'     => 'put your s3 access secret',
         'bucketName' => 'put your bucket name',
+        'region'     => 'put your region',
     ],
 ],
 ```
@@ -42,7 +43,7 @@ Setup new table using s3 connection.
 
 ```
 <?php
-namespace App\Model\Table\;
+namespace App\Model\Table;
 
 use CakeS3\Datasource\AwsS3Table;
 
@@ -52,7 +53,7 @@ class MyS3Table extends AwsS3Table
 }
 ```
 
-For example, declare action of get & show S3 Object. 
+For example, declare action of get & show S3 Object.
 
 ```
 class TopController extends Controller
@@ -61,10 +62,10 @@ class TopController extends Controller
     {
         $MyS3Table = TableRegistry::get('MyS3');
         $content = $MyS3Table->getObjectBody('/path/to/object/file.jpg');
-        
+
         $this->response->type('image/jpeg');
         $this->response->body($content);
-        
+
         return $this->response;
     }
 }
@@ -77,7 +78,7 @@ class TopController extends Controller
 
 The methods can call on your S3 Table.
 
-If You want more detail, go to S3Client document.  
+If You want more detail, go to S3Client document.
 [http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.S3.S3Client.html](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.S3.S3Client.html)
 
 #### ```copyObject(string $srcKey, string $destKey, array $options = []) : \Aws\Result```

composer.json

@@ -20,7 +20,7 @@
     "aws/aws-sdk-php": "~3.18"
   },
   "require-dev": {
-    "phpunit/phpunit": "*",
+    "phpunit/phpunit": "~5.6",
     "cakephp/cakephp": "~3.2",
     "cakephp/cakephp-codesniffer": "dev-master",
     "mockery/mockery": "dev-master"

src/Datasource/Connection.php

@@ -42,9 +42,8 @@ public function __construct(array $config = [])
         ]);
         $this->_s3Client->registerStreamWrapper();
 
-        if ($this->_s3Client->doesBucketExist($this->_config['bucketName']) === false) {
-            throw new \InvalidArgumentException("Bucket '{$this->_config['bucketName']}' is not found.");
-        }
+        // check has bucket
+        $this->_s3Client->getCommand('HeadBucket', ['Bucket' => $this->_config['bucketName']]);
     }
 
     /**
@@ -107,6 +106,27 @@ public function logger($instance = null)
     {
     }
 
+    /**
+     * This method is not supported.
+     *
+     * @return \Cake\Database\Log\QueryLogger logger instance
+     */
+    public function getLogger()
+    {
+        return new \Cake\Database\Log\QueryLogger();
+    }
+
+    /**
+     * This method is not supported.
+     *
+     * @param \Cake\Database\Log\QueryLogger $logger Logger object
+     * @return $this
+     */
+    public function setLogger($logger)
+    {
+        return $this;
+    }
+
     /**
      * Pre processing to convert the key.
      * ex) '/key' => 'key'

tests/TestCase/Datasource/ConnectionTest.php

@@ -28,7 +28,7 @@ private function __getS3ClientMock()
         $mock = m::mock('overload:\Aws\S3\S3Client');
         $mock->shouldReceive('registerStreamWrapper')
             ->once();
-        $mock->shouldReceive('doesBucketExist')
+        $mock->shouldReceive('getCommand')
             ->once()
             ->andReturn(true);
 
@@ -78,25 +78,6 @@ public function testNewInstanceMissingArguments()
         new Connection($params);
     }
 
-    /**
-     * Test new instance failed, missing bucket
-     *
-     * @return void
-     */
-    public function testNewInstanceBucketIsNotExist()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-
-        $mock = m::mock('overload:Aws\S3\S3Client');
-        $mock->shouldReceive('registerStreamWrapper')
-            ->once();
-        $mock->shouldReceive('doesBucketExist')
-            ->once()
-            ->andReturn(false);
-
-        $this->__getConnectionInstance();
-    }
-
     /**
      * Test copyObject method
      */