Merge pull request #12739 from Jurigag/3.1.x-snapshot-warning

Fixed _doLowUpdate warning
phalcon · Mar 23, 2017 · 9ec1056 · 9ec1056
2 parents a3e22a9 + 8e40926
commit 9ec1056
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # [3.1.1](https://github.com/phalcon/cphalcon/releases/tag/v3.1.1) (2017-XX-XX)
 - Fixed undefined index warning on existing cached resultsets
+- Fixed `Phalcon\Mvc\Model::_dowLowUpdate` warning first argument is not an array [#12742](https://github.com/phalcon/cphalcon/issues/12742)
 
 # [3.1.0](https://github.com/phalcon/cphalcon/releases/tag/v3.1.0) (2017-03-22)
 - Added `Phalcon\Validation\Validator\Callback`, `Phalcon\Validation::getData`

diff --git a/phalcon/mvc/model.zep b/phalcon/mvc/model.zep
@@ -2650,8 +2650,12 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
  		], bindTypes);
 
  		if success && manager->isKeepingSnapshots(this) {
-            let this->_snapshot = array_merge(this->_snapshot, newSnapshot);
- 		}
+			if typeof this->_snapshot == "array" {
+				let this->_snapshot = array_merge(this->_snapshot, newSnapshot);
+			} else {
+				let this->_snapshot = newSnapshot;
+			}
+		}
 
  		return success;
  	}

diff --git a/tests/unit/Mvc/Model/SnapshotTest.php b/tests/unit/Mvc/Model/SnapshotTest.php
@@ -299,4 +299,21 @@ function () {
             }
         );
     }
+
+    /**
+     * @author Wojciech Ślawski <jurigag@gmail.com>
+     * @since  2017-03-23
+     */
+    public function testNewInstanceUpdate()
+    {
+        $this->specify(
+            'When updating model from new instance there is some problem',
+            function () {
+                $this->setUpModelsManager();
+                $robots = Robots::findFirst();
+                $robots = new Robots($robots->toArray());
+                expect($robots->save())->true();
+            }
+        );
+    }
 }