Merge pull request #24 from mewebstudio/6.0

Add support Laravel 6

Author: jarektkaczyk

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - hhvm
+  - 7.2
+  - 7.3
 
 install:
   - travis_retry composer require squizlabs/php_codesniffer:2.3.3

composer.json

@@ -16,8 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
-        "illuminate/database": "5.3.*|5.4.*"
+        "php": ">=7.2",
+        "illuminate/database": "^5.4|^6.0"
     },
     "require-dev": {
         "crysalead/kahlan": "~1.1"

spec/BuilderSpec.php

@@ -20,6 +20,6 @@
         $model = Stub::create();
         expect($model)->toReceive('queryHook');
         Stub::on($this->builder)->method('getModel', function () use ($model) {return $model;});
-        $this->builder->select('column', 'value');
+        $this->builder->select(['column', 'value']);
     });
 });

src/Builder.php

@@ -17,23 +17,23 @@ class Builder extends EloquentBuilder
      * @var array
      */
     protected $operators = [
-        '=', '<', '>', '<=', '>=', '<>', '!=',
+        '=', '<', '>', '<=', '>=', '<>', '!=', '<=>',
         'like', 'like binary', 'not like', 'between', 'ilike',
         '&', '|', '^', '<<', '>>',
         'rlike', 'regexp', 'not regexp',
         '~', '~*', '!~', '!~*', 'similar to',
-                'not similar to',
+        'not similar to', 'not ilike', '~~*', '!~~*',
     ];
 
     /**
      * The methods that should be returned from query builder.
      *
      * @var array
      */
-    protected $passthru = array(
-        'toSql', 'lists', 'insert', 'insertGetId', 'pluck', 'value', 'count', 'raw',
-        'min', 'max', 'avg', 'sum', 'exists', 'getBindings', 'aggregate', 'getConnection'
-    );
+    protected $passthru = [
+        'toSql', 'lists', 'insert', 'insertGetId', 'pluck', 'value', 'count', 'raw', 'min', 'max',
+        'avg', 'sum', 'exists', 'doesntExist', 'getBindings', 'aggregate', 'getConnection'
+    ];
 
     /*
     |--------------------------------------------------------------------------
@@ -205,7 +205,6 @@ public function orWhereNotBetween($column, array $values)
         return $this->whereNotBetween($column, $values, 'or');
     }
 
-
     /**
      * Add a "where in" clause to the query.
      *

src/Hookable.php

@@ -100,7 +100,7 @@ public function getAttribute($key)
      *
      * @param  string $key
      * @param  mixed  $value
-     * @return void
+     * @return mixed
      */
     public function setAttribute($key, $value)
     {
@@ -111,7 +111,9 @@ public function setAttribute($key, $value)
             parent::setAttribute($key, $value);
         };
 
-        return $this->pipe($hooks, $payload, $params, $destination);
+        $this->pipe($hooks, $payload, $params, $destination);
+
+        return $this;
     }
 
     /**
@@ -144,7 +146,7 @@ public function save(array $options = [])
      */
     public function isDirty($attributes = null)
     {
-        if (! is_array($attributes) && !is_null($attributes)) {
+        if (! is_array($attributes)) {
             $attributes = func_get_args();
         }