Laravel 6.0 Support

.travis.yml

@@ -7,7 +7,6 @@ stages:
   - test
 
 php:
-  - '7.1'
   - '7.2'
   - '7.3'
 

README.md

@@ -609,3 +609,4 @@ Author and Contributors
 * [Quang Ngo](https://github.com/vanquang9387)
 * [David Higgins](https://github.com/zoul0813)
 * [Damon Williams](https://github.com/footballencarta)
+* [David Palmer](https://github.com/dp88)

composer.json

@@ -4,8 +4,8 @@
     "keywords": ["laravel", "dynamodb", "aws"],
     "require": {
         "aws/aws-sdk-php": "^3.0.0",
-        "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.*",
-        "illuminate/database": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.*"
+        "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.0.*",
+        "illuminate/database": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.0.*"
     },
     "license": "MIT",
     "authors": [

src/ConditionAnalyzer/Analyzer.php

@@ -5,6 +5,7 @@
 use BaoPham\DynamoDb\ComparisonOperator;
 use BaoPham\DynamoDb\DynamoDbModel;
 use BaoPham\DynamoDb\H;
+use Illuminate\Support\Arr;
 
 /**
  * Class ConditionAnalyzer
@@ -71,7 +72,7 @@ public function isExactSearch()
         }
 
         foreach ($this->conditions as $condition) {
-            if (array_get($condition, 'type') !== ComparisonOperator::EQ) {
+            if (Arr::get($condition, 'type') !== ComparisonOperator::EQ) {
                 return false;
             }
         }
@@ -173,15 +174,15 @@ private function getIndex()
         $index = null;
 
         foreach ($this->model->getDynamoDbIndexKeys() as $name => $keysInfo) {
-            $conditionKeys = array_pluck($this->conditions, 'column');
+            $conditionKeys = Arr::pluck($this->conditions, 'column');
             $keys = array_values($keysInfo);
 
             if (count(array_intersect($conditionKeys, $keys)) === count($keys)) {
                 if (!isset($this->indexName) || $this->indexName === $name) {
                     $index = new Index(
                         $name,
-                        array_get($keysInfo, 'hash'),
-                        array_get($keysInfo, 'range')
+                        Arr::get($keysInfo, 'hash'),
+                        Arr::get($keysInfo, 'range')
                     );
 
                     break;

src/DynamoDb/QueryBuilder.php

@@ -6,6 +6,7 @@
 use BadMethodCallException;
 use BaoPham\DynamoDb\DynamoDbClientInterface;
 use BaoPham\DynamoDb\RawDynamoDbQuery;
+use Illuminate\Support\Str;
 
 /**
  * Class QueryBuilder
@@ -109,7 +110,7 @@ public function prepare(DynamoDbClient $client = null)
      */
     public function __call($method, $parameters)
     {
-        if (starts_with($method, 'set')) {
+        if (Str::startsWith($method, 'set')) {
             $key = array_reverse(explode('set', $method, 2))[0];
             $this->query[$key] = current($parameters);
 

src/DynamoDbClientService.php

@@ -4,6 +4,7 @@
 
 use Aws\DynamoDb\DynamoDbClient;
 use Aws\DynamoDb\Marshaler;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
 
 class DynamoDbClientService implements DynamoDbClientInterface
@@ -43,7 +44,7 @@ public function getClient($connection = null)
 
         $config = config("dynamodb.connections.$connection", []);
         $config['version'] = '2012-08-10';
-        $config['debug'] = $this->getDebugOptions(array_get($config, 'debug'));
+        $config['debug'] = $this->getDebugOptions(Arr::get($config, 'debug'));
 
         $client = new DynamoDbClient($config);
 

src/DynamoDbModel.php

@@ -5,6 +5,7 @@
 use Exception;
 use DateTime;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
 
 /**
  * Class DynamoDbModel.
@@ -183,7 +184,7 @@ public function saveAsync(array $options = [])
         $savePromise = $this->newQuery()->saveAsync();
 
         $savePromise->then(function ($result) use ($create, $options) {
-            if (array_get($result, '@metadata.statusCode') === 200) {
+            if (Arr::get($result, '@metadata.statusCode') === 200) {
                 $this->exists = true;
                 $this->wasRecentlyCreated = $create;
                 $this->fireModelEvent($create ? 'created' : 'updated', false);
@@ -446,7 +447,7 @@ public function getMarshaler()
     public function __sleep()
     {
         return array_keys(
-            array_except(get_object_vars($this), ['marshaler', 'attributeFilter'])
+            Arr::except(get_object_vars($this), ['marshaler', 'attributeFilter'])
         );
     }
 

src/DynamoDbQueryBuilder.php

@@ -10,6 +10,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Scope;
+use Illuminate\Support\Arr;
 
 class DynamoDbQueryBuilder
 {
@@ -470,7 +471,7 @@ public function find($id, array $columns = [])
 
         $item = $query->prepare($this->client)->getItem();
 
-        $item = array_get($item->toArray(), 'Item');
+        $item = Arr::get($item->toArray(), 'Item');
 
         if (empty($item)) {
             return null;
@@ -601,7 +602,7 @@ public function removeAttribute(...$attributes)
             ->prepare($this->client)
             ->updateItem();
 
-        $success = array_get($result, '@metadata.statusCode') === 200;
+        $success = Arr::get($result, '@metadata.statusCode') === 200;
 
         if ($success) {
             $this->model->setRawAttributes(DynamoDb::unmarshalItem($result->get('Attributes')));
@@ -618,7 +619,7 @@ public function delete()
             ->prepare($this->client)
             ->deleteItem();
 
-        return array_get($result->toArray(), '@metadata.statusCode') === 200;
+        return Arr::get($result->toArray(), '@metadata.statusCode') === 200;
     }
 
     public function deleteAsync()
@@ -638,7 +639,7 @@ public function save()
             ->prepare($this->client)
             ->putItem();
 
-        return array_get($result, '@metadata.statusCode') === 200;
+        return Arr::get($result, '@metadata.statusCode') === 200;
     }
 
     public function saveAsync()
@@ -710,7 +711,7 @@ protected function getAll(
                 $res = $this->client->query($raw->query);
             }
 
-            $this->lastEvaluatedKey = array_get($res, 'LastEvaluatedKey');
+            $this->lastEvaluatedKey = Arr::get($res, 'LastEvaluatedKey');
             $iterator = $res['Items'];
         }
 

src/Parsers/ConditionExpression.php

@@ -5,6 +5,7 @@
 use BaoPham\DynamoDb\ComparisonOperator;
 use BaoPham\DynamoDb\NotSupportedException;
 use BaoPham\DynamoDb\Facades\DynamoDb;
+use Illuminate\Support\Arr;
 
 class ConditionExpression
 {
@@ -70,9 +71,9 @@ public function parse($where)
         $parsed = [];
 
         foreach ($where as $condition) {
-            $boolean = array_get($condition, 'boolean');
-            $value = array_get($condition, 'value');
-            $type = array_get($condition, 'type');
+            $boolean = Arr::get($condition, 'boolean');
+            $value = Arr::get($condition, 'value');
+            $type = Arr::get($condition, 'type');
 
             $prefix = '';
 
@@ -86,7 +87,7 @@ public function parse($where)
             }
 
             $parsed[] = $prefix . $this->parseCondition(
-                array_get($condition, 'column'),
+                Arr::get($condition, 'column'),
                 $type,
                 $value
             );

src/Parsers/KeyConditionExpression.php

@@ -3,12 +3,13 @@
 namespace BaoPham\DynamoDb\Parsers;
 
 use BaoPham\DynamoDb\ComparisonOperator;
+use Illuminate\Support\Arr;
 
 class KeyConditionExpression extends ConditionExpression
 {
     protected function getSupportedOperators()
     {
-        return array_only(static::OPERATORS, [
+        return Arr::only(static::OPERATORS, [
             ComparisonOperator::EQ,
             ComparisonOperator::LE,
             ComparisonOperator::LT,