Map and Set now serialize their hash function (fixes #23)

icecave · Feb 7, 2013 · 753be98 · 753be98
1 parent 70f15f9
commit 753be98
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 14 deletions.
diff --git a/lib/Icecave/Collections/AssociativeKeyGenerator.php b/lib/Icecave/Collections/AssociativeKeyGenerator.php
@@ -29,7 +29,7 @@ public function __construct($arrayHashFunction = 'md5', $objectHashFunction = 's
      */
     public function __invoke($value)
     {
-        $this->typeCheck->__invoke(func_get_args());
+        $this->typeCheck->validateInvoke(func_get_args());
 
         return $this->generate($value);
     }

diff --git a/lib/Icecave/Collections/LinkedList.php b/lib/Icecave/Collections/LinkedList.php
@@ -97,7 +97,7 @@ public function isEmpty()
      */
     public function __toString()
     {
-        $this->typeCheck->__toString(func_get_args());
+        $this->typeCheck->validateToString(func_get_args());
 
         if ($this->isEmpty()) {
             return '<LinkedList 0>';

diff --git a/lib/Icecave/Collections/Map.php b/lib/Icecave/Collections/Map.php
@@ -72,7 +72,7 @@ public function isEmpty()
      */
     public function __toString()
     {
-        $this->typeCheck->__toString(func_get_args());
+        $this->typeCheck->validateToString(func_get_args());
 
         if ($this->isEmpty()) {
             return '<Map 0>';
@@ -1031,7 +1031,12 @@ public function serialize()
     {
         $this->typeCheck->serialize(func_get_args());
 
-        return serialize($this->elements());
+        return serialize(
+            array(
+                $this->elements(),
+                $this->hashFunction
+            )
+        );
     }
 
     /**
@@ -1041,9 +1046,9 @@ public function unserialize($packet)
     {
         TypeCheck::get(__CLASS__)->unserialize(func_get_args());
 
-        $elements = unserialize($packet);
+        list($elements, $hashFunction) = unserialize($packet);
 
-        $this->__construct();
+        $this->__construct(null, $hashFunction);
 
         foreach ($elements as $element) {
             list($key, $value) = $element;

diff --git a/lib/Icecave/Collections/PriorityQueue.php b/lib/Icecave/Collections/PriorityQueue.php
@@ -42,7 +42,7 @@ public function __construct($prioritizer, $collection = null)
      */
     public function __toString()
     {
-        $this->typeCheck->__toString(func_get_args());
+        $this->typeCheck->validateToString(func_get_args());
 
         if ($this->isEmpty()) {
             return '<PriorityQueue 0>';

diff --git a/lib/Icecave/Collections/Queue.php b/lib/Icecave/Collections/Queue.php
@@ -70,7 +70,7 @@ public function isEmpty()
      */
     public function __toString()
     {
-        $this->typeCheck->__toString(func_get_args());
+        $this->typeCheck->validateToString(func_get_args());
 
         if ($this->isEmpty()) {
             return '<Queue 0>';

diff --git a/lib/Icecave/Collections/Set.php b/lib/Icecave/Collections/Set.php
@@ -71,7 +71,7 @@ public function isEmpty()
      */
     public function __toString()
     {
-        $this->typeCheck->__toString(func_get_args());
+        $this->typeCheck->validateToString(func_get_args());
 
         if ($this->isEmpty()) {
             return '<Set 0>';
@@ -311,7 +311,12 @@ public function serialize()
     {
         $this->typeCheck->serialize(func_get_args());
 
-        return serialize($this->elements());
+        return serialize(
+            array(
+                $this->elements(),
+                $this->hashFunction
+            )
+        );
     }
 
     /**
@@ -321,8 +326,8 @@ public function unserialize($packet)
     {
         TypeCheck::get(__CLASS__)->unserialize(func_get_args());
 
-        $elements = unserialize($packet);
-        $this->__construct($elements);
+        list($elements, $hashFunction) = unserialize($packet);
+        $this->__construct($elements, $hashFunction);
     }
 
     ////////////////////////////

diff --git a/lib/Icecave/Collections/Stack.php b/lib/Icecave/Collections/Stack.php
@@ -70,7 +70,7 @@ public function isEmpty()
      */
     public function __toString()
     {
-        $this->typeCheck->__toString(func_get_args());
+        $this->typeCheck->validateToString(func_get_args());
 
         if ($this->isEmpty()) {
             return '<Stack 0>';

diff --git a/lib/Icecave/Collections/Vector.php b/lib/Icecave/Collections/Vector.php
@@ -73,7 +73,7 @@ public function isEmpty()
      */
     public function __toString()
     {
-        $this->typeCheck->__toString(func_get_args());
+        $this->typeCheck->validateToString(func_get_args());
 
         if ($this->isEmpty()) {
             return '<Vector 0>';

diff --git a/test/suite/Icecave/Collections/MapTest.php b/test/suite/Icecave/Collections/MapTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace Icecave\Collections;
 
+use Eloquent\Liberator\Liberator;
 use PHPUnit_Framework_TestCase;
 
 class MapTest extends PHPUnit_Framework_TestCase
@@ -53,6 +54,20 @@ public function testSerialization()
         $this->assertSame($this->_collection->elements(), $collection->elements());
     }
 
+    /**
+     * @group regression
+     * @link https://github.com/IcecaveStudios/collections/issues/23
+     */
+    public function testSerializationOfHashFunction()
+    {
+        $collection = new Map(null, 'sha1');
+
+        $packet = serialize($collection);
+        $collection = unserialize($packet);
+
+        $this->assertSame('sha1', Liberator::liberate($collection)->hashFunction);
+    }
+
     ///////////////////////////////////////////
     // Implementation of CollectionInterface //
     ///////////////////////////////////////////

diff --git a/test/suite/Icecave/Collections/SetTest.php b/test/suite/Icecave/Collections/SetTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace Icecave\Collections;
 
+use Eloquent\Liberator\Liberator;
 use PHPUnit_Framework_TestCase;
 
 class SetTest extends PHPUnit_Framework_TestCase
@@ -47,6 +48,20 @@ public function testSerialization()
         $this->assertSame($this->_collection->elements(), $collection->elements());
     }
 
+    /**
+     * @group regression
+     * @link https://github.com/IcecaveStudios/collections/issues/23
+     */
+    public function testSerializationOfHashFunction()
+    {
+        $collection = new Set(null, 'sha1');
+
+        $packet = serialize($collection);
+        $collection = unserialize($packet);
+
+        $this->assertSame('sha1', Liberator::liberate($collection)->hashFunction);
+    }
+
     ///////////////////////////////////////////
     // Implementation of CollectionInterface //
     ///////////////////////////////////////////