Fixed small bug which allowed array keys to be referenceable, fixed dynamic object type and added ByteArray serialization

Author: dannykopping

lib/ByteArray.php

@@ -0,0 +1,31 @@
+<?php
+namespace AMF;
+
+/**
+ * @author Danny Kopping <[email protected]>
+ */
+class ByteArray
+{
+    private $data;
+
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @param mixed $data
+     */
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+} 

lib/Serializer.php

@@ -2,6 +2,7 @@
 namespace AMF;
 
 use AMF\Exception\NotSupportedException;
+use AMF\Exception\SerializationException;
 use DateTime;
 use Exception;
 use SimpleXMLElement;
@@ -59,6 +60,10 @@ public static function serialize($data, $includeType = true)
                 self::serializeDate($data, $includeType);
                 break;
 
+            case ($data instanceof ByteArray):
+                self::serializeByteArray($data, $includeType);
+                break;
+
             case is_array($data):
                 self::serializeArray($data, $includeType);
                 break;
@@ -194,17 +199,18 @@ private static function serializeArray($data)
 
         $isDense = Spec::isDenseArray($data);
         if ($isDense) {
-            self::serializeInt((count($data) << 1) | 0x01, false);
+            self::serializeInt((count($data) << 1) | Spec::REFERENCE_BIT, false);
             self::serializeString('', false);
 
             foreach ($data as $element) {
                 self::serialize($element);
             }
+
         } else {
             self::serializeInt(1, false);
 
             foreach ($data as $key => $value) {
-                self::serializeString((string) $key, false);
+                self::serializeString((string) $key, false, false);
                 self::serialize($value);
             }
 
@@ -240,23 +246,24 @@ private static function serializeObject($data)
         }
 
         // write object info & class name
-        self::serializeInt(($numProperties << 0x04) | ((int) $externalizable << 0x02) | 0x03, false);
-        self::serializeString(self::getObjectClassname($data), false);
+        if($dynamic) {
+            self::serializeInt(0x0b, false);
+        } else {
+            self::serializeInt(($numProperties << 0x04) | ((int) $externalizable << 0x02) | 0x03, false);
+        }
+
+        self::serializeString(self::getObjectClassname($data), false, false);
 
         if ($dynamic) {
 
             // write keys
             foreach ($properties as $key => $value) {
                 self::serializeString($key, false, false);
-            }
-
-            // write values
-            foreach ($properties as $key => $value) {
                 self::serialize($value);
             }
 
             // close
-            self::serializeInt(0x01, false);
+            self::serializeInt(Spec::REFERENCE_BIT, false);
         } else {
 
             /**
@@ -269,6 +276,20 @@ private static function serializeObject($data)
         }
     }
 
+    private static function serializeByteArray($data, $includeType = true)
+    {
+        if ($includeType) {
+            self::writeBytes(Spec::TYPE_BYTE_ARRAY);
+        }
+
+        if (!$data instanceof ByteArray) {
+            throw new SerializationException('Invalid ByteArray data provided');
+        }
+
+        self::serializeInt(strlen($data->getData()) << 1 | Spec::REFERENCE_BIT, false);
+        self::writeBytes($data->getData(), true);
+    }
+
     private static function writeBytes($bytes, $raw = false)
     {
         self::$packet .= $raw ? $bytes : pack('c', $bytes);

lib/Spec.php

@@ -35,6 +35,8 @@ class Spec
     const OBJECT_DYNAMIC        = 0x00;
     const OBJECT_EXTERNALIZABLE = 0x01;
 
+    const REFERENCE_BIT = 0x01;
+
     public static function getMaxInt()
     {
         return pow(2, 28) - 1;

tests/SerializationTest.php

@@ -1,5 +1,6 @@
 <?php
 use AMF\AMF;
+use AMF\ByteArray;
 use AMF\IExternalizable;
 use AMF\Spec;
 use AMF\Undefined;
@@ -63,7 +64,7 @@ public function testSerializeObject()
         $dyn->a = 'b';
         $dyn->b = array('123');
 
-        $this->assertEquals('0a230103610362060362090301060731323301', bin2hex(AMF::serialize($dyn)));
+        $this->assertEquals('0a0b0103610603620362090301060731323301', bin2hex(AMF::serialize($dyn)));
 
         // externalizable object
         $ext = new ExternalizableClass();
@@ -77,7 +78,23 @@ public function testSerializeObject()
 
         // object with no properties
         $null = new stdClass();
-        $this->assertEquals('0a030101', bin2hex(AMF::serialize($null)));
+        $this->assertEquals('0a0b0101', bin2hex(AMF::serialize($null)));
+    }
+
+    public function testSerializeBytes()
+    {
+        $bytes = new ByteArray('A');
+        $this->assertEquals('0c0341', bin2hex(AMF::serialize($bytes)));
+
+        $bytes = new ByteArray('$1�2');
+        $this->assertEquals('0c132431c3afc2bfc2bd32', bin2hex(AMF::serialize($bytes)));
+
+        $bytes = new ByteArray(0b11000011101010); // 12522
+        $this->assertEquals('0c0b3132353232', bin2hex(AMF::serialize($bytes)));
+
+        $bytes = new ByteArray(file_get_contents(__DIR__.'/php.ico'));
+        $this->assertEquals('0c8c6d424d360300000000000036000000280000001000000010000000010018000000000000030000c40e0000c40e00000000000000000000c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080d7d7d7d7d7d7d7d7d7c08080c08080c08080c08080c08080c08080c08080d7d7d7d7d7d7d7d7d7c08080c08080c08080d7d7d7000000d7d7d7c08080c08080c08080c08080c08080c08080c08080d7d7d7000000d7d7d7c08080c08080c08080d7d7d7000000d7d7d7d7d7d7c08080c08080d7d7d7c08080c08080d7d7d7d7d7d7000000d7d7d7d7d7d7c08080c08080d7d7d7000000000000000000d7d7d7d7d7d7000000d7d7d7d7d7d7000000d7d7d7000000000000000000d7d7d7d7d7d7d7d7d7000000d7d7d7d7d7d7000000d7d7d7000000d7d7d7d7d7d7000000d7d7d7000000d7d7d7d7d7d7000000d7d7d7d7d7d7000000d7d7d7d7d7d7000000d7d7d7000000d7d7d7d7d7d7000000d7d7d7000000d7d7d7d7d7d7000000d7d7d7d7d7d7000000d7d7d7d7d7d7000000d7d7d7000000d7d7d7d7d7d7000000d7d7d7000000d7d7d7d7d7d7000000d7d7d7d7d7d7000000000000000000d7d7d7d7d7d7000000000000000000d7d7d7d7d7d7000000000000000000d7d7d7d7d7d7c08080d7d7d7d7d7d7d7d7d7c08080d7d7d7000000d7d7d7d7d7d7c08080c08080d7d7d7d7d7d7d7d7d7c08080c08080c08080c08080c08080c08080c08080d7d7d7000000d7d7d7c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080d7d7d7d7d7d7d7d7d7c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080c08080',
+            bin2hex(AMF::serialize($bytes)));
     }
 }