Incorporated feedback for #9

- Re-instated regex for detecting serialized strings.
- Added data providers to both changed test methods to provide multiple
  values and expected exception message strings.

Author: weierophinney

src/Adapter/PhpSerialize.php

@@ -64,8 +64,18 @@ public function serialize($value)
      */
     public function unserialize($serialized)
     {
-        if (!is_string($serialized)) {
-            throw new Exception\RuntimeException('Serialized data must be a string');
+        if (! is_string($serialized) || ! preg_match('/^((s|i|d|b|a|O|C):|N;)/', $serialized)) {
+            $value = $serialized;
+            if (is_object($value)) {
+                $value = get_class($value);
+            } elseif (! is_string($value)) {
+                $value = gettype($value);
+            }
+
+            throw new Exception\RuntimeException(sprintf(
+                'Serialized data must be a string containing serialized PHP code; received: %s',
+                $value
+            ));
         }
 
         // If we have a serialized boolean false value, just return false;

test/Adapter/PhpSerializeTest.php

@@ -122,20 +122,47 @@ public function testUnserializeObject()
         $this->assertEquals($expected, $data);
     }
 
-    public function testUnserializingNoStringRaisesException()
+    public function invalidSerializationTypes()
+    {
+        return [
+            'null'       => [null, 'NULL'],
+            'true'       => [true, 'boolean'],
+            'false'      => [false, 'boolean'],
+            'zero'       => [0, 'int'],
+            'int'        => [1, 'int'],
+            'zero-float' => [0.0, 'double'],
+            'float'      => [1.1, 'double'],
+            'array'      => [['foo'], 'array'],
+            'object'     => [(object) ['foo' => 'bar'], 'stdClass'],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidSerializationTypes
+     */
+    public function testUnserializingNoStringRaisesException($value, $expected)
     {
-        $value = null;
         $this->setExpectedException(
             'Zend\Serializer\Exception\RuntimeException',
-            'Serialized data must be a string'
+            $expected
         );
         $this->adapter->unserialize($value);
     }
 
-    public function testUnserializingInvalidStringRaisesException()
+    public function invalidStrings()
     {
-        $value = 'foobar';
-        $this->setExpectedException('Zend\Serializer\Exception\RuntimeException');
-        $this->adapter->unserialize($value);
+        return [
+            'not-serialized'        => ['foobar', 'foobar'],
+            'invalid-serialization' => ['a:foobar', 'Unserialization failed'],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidStrings
+     */
+    public function testUnserializingInvalidStringRaisesException($string, $expected)
+    {
+        $this->setExpectedException(Serializer\Exception\RuntimeException::class, $expected);
+        $this->adapter->unserialize($string);
     }
 }