Merge pull request #16 from jarektkaczyk/5.4

fixes back to master
jarektkaczyk · Sep 26, 2017 · dc1666e · dc1666e
2 parents ae87508 + 44069d1
commit dc1666e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - hhvm

diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
-        "illuminate/database": "5.2.*"
+        "php": ">=5.6.4",
+        "illuminate/database": "5.3.*|5.4.*"
     },
     "require-dev": {
         "crysalead/kahlan": "~1.1"

diff --git a/src/Builder.php b/src/Builder.php
@@ -32,7 +32,7 @@ class Builder extends EloquentBuilder
      */
     protected $passthru = array(
         'toSql', 'lists', 'insert', 'insertGetId', 'pluck', 'value', 'count', 'raw',
-        'min', 'max', 'avg', 'sum', 'exists', 'getBindings', 'aggregate',
+        'min', 'max', 'avg', 'sum', 'exists', 'getBindings', 'aggregate', 'getConnection'
     );
 
     /*

diff --git a/src/Hookable.php b/src/Hookable.php
@@ -122,15 +122,15 @@ public function setAttribute($key, $value)
      */
     public function save(array $options = [])
     {
-        if (!parent::save($options)) {
+        if (!($saved = parent::save($options)) && $this->isDirty()) {
             return false;
         }
 
         $hooks       = $this->boundHooks(__FUNCTION__);
         $params      = compact('options');
         $payload     = true;
-        $destination = function () {
-            return true;
+        $destination = function () use ($saved) {
+            return $saved;
         };
 
         return $this->pipe($hooks, $payload, $params, $destination);
@@ -178,6 +178,8 @@ public function toArray()
     /**
      * Register hook for replicate.
      *
+     * @param array|null $except
+     *
      * @return mixed
      */
     public function replicate(array $except = null)