Improved Object serialize()/unserialize()

getgrav · Feb 22, 2018 · 274c701 · 274c701
1 parent e533024
commit 274c701
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/system/src/Grav/Framework/Object/Base/ObjectTrait.php b/system/src/Grav/Framework/Object/Base/ObjectTrait.php
@@ -118,6 +118,9 @@ public function unserialize($serialized)
     {
         $data = unserialize($serialized);
 
+        if (method_exists($this, 'initObjectProperties')) {
+            $this->initObjectProperties();
+        }
         $this->doUnserialize($data);
     }
 
@@ -126,6 +129,10 @@ public function unserialize($serialized)
      */
     protected function doUnserialize(array $serialized)
     {
+        if (!isset($serialized['key'], $serialized['type'], $serialized['elements']) || $serialized['type'] !== $this->getType()) {
+            throw new \InvalidArgumentException("Cannot unserialize '{$this->getType()}': Bad data");
+        }
+
         $this->setKey($serialized['key']);
         $this->setElements($serialized['elements']);
     }