Changeset 279 for trunk/ext

Timestamp:

10/05/2007 10:34:34 (14 months ago)

Author:

indeyets

Message:

- changed naming of tags to php/(object|array|hash)::ClassName?
- added ability to emit Serializable objects

Location:

trunk/ext/php

Files:

• CHANGELOG (modified) (1 diff)
• TODO (modified) (1 diff)
• phpext.c (modified) (7 diffs)
• phpunit-tests/TestDump.php (modified) (3 diffs)
• phpunit-tests/TestLoad.php (modified) (7 diffs)
• phpunit-tests/helpers.php (added)

trunk/ext/php/CHANGELOG

@@ -8 +8 @@
     - fixed loading of maps with numeric keys
     - short-and-flat arrays are dumped using inline-mode now (for readability)
+    - changed explicit type of DateTime class to be !php/object::DateTime
     - added support for loading explicitly typed DateTime (with timestamp-compatible value)
-    - added support for loading sequences into classes which implement ArrayAccess (!php/array:ClassName)
-    - added support for loading maps into classes which implement ArrayAccess (!php/hash:ClassName)
-    - added support for loading classes which implement Serializable (!php:ClassName)
-    - changed explicit type of DateTime class to be !php:DateTime
+    - added support for loading sequences into classes which implement ArrayAccess (!php/array::ClassName)
+    - added support for loading maps into classes which implement ArrayAccess (!php/hash::ClassName)
+    - added support for loading classes which implement Serializable (!php/object::ClassName)
+    - added support for dumping classes which implement Serializable (!php/object::ClassName)
 
 - version: 0.9.1

trunk/ext/php/TODO

@@ -13 +13 @@
     - Iterator:
       as: map
-      label: "!php/hash:ClassName"
+      label: "!php/hash::ClassName"
     - ArrayAccess:
       as: sequence
-      label: "!php/array:ClassName"
+      label: "!php/array::ClassName"
     - Generic object (?)

trunk/ext/php/phpext.c

@@ -360 +360 @@
                         } else if (strcmp(n->type_id, "float#neginf") == 0) {
                                 ZVAL_DOUBLE(o, -inf());
-                        } else if (strncmp(n->type_id, "timestamp", 9) == 0 || strcmp(n->type_id, "php:Datetime") == 0) {
+                        } else if (strncmp(n->type_id, "timestamp", 9) == 0 || strcmp(n->type_id, "php/object::Datetime") == 0) {
                                 zval fname, param, *params[1];
                                 TSRMLS_FETCH();
@@ -373 +373 @@
                                 zval_dtor(&fname);
                                 zval_dtor(params[0]);
-                        } else if (strncmp(n->type_id, "php:", 4) == 0) {
+                        } else if (strncmp(n->type_id, "php/object::", 12) == 0) {
                                 /* Some custom php-class packed in a string. Only ones implementing Serializable ar supported */
-                                size_t classname_len = strlen(n->type_id) - 4;
+                                size_t classname_len = strlen(n->type_id) - 12;
                                 char *classname = emalloc(classname_len + 1);
                                 zend_class_entry **ce;
@@ -381 +381 @@
                                 TSRMLS_FETCH();
 
-                                strncpy(classname, n->type_id + 4, classname_len + 1);
+                                strncpy(classname, n->type_id + 12, classname_len + 1);
 
                                 if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
@@ -421 +421 @@
                                         add_index_zval(o, i, o2);
                                 }
-                        } else if (strncmp(n->type_id, "php/array:", 10) == 0) {
+                        } else if (strncmp(n->type_id, "php/array::", 11) == 0) {
                                 /* some class which implements ArrayAccess */
                                 size_t i;
-                                size_t classname_len = strlen(n->type_id) - 10;
+                                size_t classname_len = strlen(n->type_id) - 11;
                                 char *classname = emalloc(classname_len + 1);
                                 zend_class_entry **ce;
                                 TSRMLS_FETCH();
 
-                                strncpy(classname, n->type_id + 10, classname_len + 1);
+                                strncpy(classname, n->type_id + 11, classname_len + 1);
 
                                 if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
@@ -501 +501 @@
                                         zval_ptr_dtor(&o2);
                                 }
-                        } else if (strncmp(n->type_id, "php/hash:", 9) == 0) {
+                        } else if (strncmp(n->type_id, "php/hash::", 10) == 0) {
                                 /* some classm which implements ArrayAccess */
                                 SYMID oid;
                                 size_t i;
                                 zval *o2, *o3;
-                                size_t classname_len = strlen(n->type_id) - 9;
+                                size_t classname_len = strlen(n->type_id) - 10;
                                 char *classname = emalloc(classname_len + 1);
                                 zend_class_entry **ce;
                                 TSRMLS_FETCH();
 
-                                strncpy(classname, n->type_id + 9, classname_len + 1);
+                                strncpy(classname, n->type_id + 10, classname_len + 1);
 
                                 if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
@@ -733 +733 @@
                         zend_get_object_classname(data, &name, &name_len TSRMLS_CC);
 
+                        /* DateTime is encoded as timestamp */
                         if (strncmp(name, "DateTime", name_len) == 0) {
                                 zval *retval;
@@ -745 +746 @@
                                 zval_dtor(retval);
                                 efree(retval);
+                        } else {
+                                if (0 != instanceof_function_ex(ce, zend_ce_serializable, 1 TSRMLS_CC)) {
+                                        char *prefix = "tag:php:object::";
+                                        size_t prefix_len = strlen(prefix) + 1;
+                                        char *tagname = emalloc(name_len + prefix_len);
+                                        zval *serialized;
+
+                                        snprintf(tagname, name_len + prefix_len, "%s%s", prefix, name);
+
+                                        zend_call_method_with_0_params(&data, ce, NULL, "serialize", &serialized);
+                                        syck_emit_scalar(e, tagname, scalar_2quote, 0, 0, 0, Z_STRVAL_P(serialized), Z_STRLEN_P(serialized));
+
+                                        efree(tagname);
+                                }
                         }
 

trunk/ext/php/phpunit-tests/TestDump.php

@@ -5 +5 @@
 
 require_once "PHPUnit/Framework/TestCase.php";
+require 'helpers.php';
 
 error_reporting(E_ALL);
@@ -10 +11 @@
 class TestDump extends PHPUnit_Framework_TestCase
 {
+    public function testNull()
+    {
+        $arr = array('qq' => null);
+        $this->assertEquals($arr, syck_load(syck_dump($arr)));
+    }
+
     public function testArray()
     {
@@ -47 +54 @@
         $this->assertEquals($arr2, $arr);
     }
+
+    public function testSerializable()
+    {
+        $obj = new MySerializable('some string');
+        $this->assertEquals($obj, syck_load(syck_dump($obj)));
+    }
 }

trunk/ext/php/phpunit-tests/TestLoad.php

@@ -5 +5 @@
 
 require_once "PHPUnit/Framework/TestCase.php";
+require 'helpers.php';
 
 error_reporting(E_ALL);
 
-class SyckTestSomeClass {}
-
-class MySerializable implements Serializable
-{
-    private $string = null;
-
-    public function __construct()
-    {
-        throw new Exception('This is not supposed to be called');
-    }
-
-    public function serialize()
-    {
-        return 'test';
-    }
-
-    public function unserialize($string)
-    {
-        $this->string = $string;
-    }
-
-    public function test()
-    {
-        return $this->string;
-    }
-}
 
 class TestLoad extends PHPUnit_Framework_TestCase
@@ -165 +140 @@
 
         // explicit
-        $this->assertType('DateTime', syck_load("!php:Datetime 2002-12-14"));
+        $this->assertType('DateTime', syck_load("!php/object::Datetime 2002-12-14"));
     }
 
@@ -175 +150 @@
 
         // ArrayObject implements ArrayAccess: OK
-        $this->assertEquals(syck_load('!php/array:ArrayObject []'), new ArrayObject());
-        $this->assertEquals(syck_load('!php/array:ArrayObject [1, 2, 3]'), new ArrayObject(array(1, 2, 3)));
+        $this->assertEquals(syck_load('!php/array::ArrayObject []'), new ArrayObject());
+        $this->assertEquals(syck_load('!php/array::ArrayObject [1, 2, 3]'), new ArrayObject(array(1, 2, 3)));
 
         // SyckTestSomeClass doesn't implement ArrayAccess: FAILURE
         try {
-            syck_load('!php/array:SyckTestSomeClass []');
+            syck_load('!php/array::SyckTestSomeClass []');
             $this->assertTrue(false);
         } catch (SyckException $e) {
@@ -188 +163 @@
         // SyckTestOtherClass doesn't exist: FAILURE
         try {
-            syck_load('!php/array:SyckTestOtherClass []');
+            syck_load('!php/array::SyckTestOtherClass []');
             $this->assertTrue(false);
         } catch (SyckException $e) {
@@ -201 +176 @@
 
         // ArrayObject implements ArrayAccess: OK
-        $this->assertEquals(new ArrayObject(), syck_load('!php/hash:ArrayObject {}'));
+        $this->assertEquals(new ArrayObject(), syck_load('!php/hash::ArrayObject {}'));
         $this->assertEquals(
             new ArrayObject(array('a' => 1, 'b' => 2, 3 => 3, 4 => 'd', 'e' => 5)),
-            syck_load('!php/hash:ArrayObject {a: 1, b: 2, 3: 3, 4: d, e: 5}')
+            syck_load('!php/hash::ArrayObject {a: 1, b: 2, 3: 3, 4: d, e: 5}')
         );
 
         // SyckTestSomeClass doesn't implement ArrayAccess: FAILURE
         try {
-            syck_load('!php/hash:SyckTestSomeClass {}');
+            syck_load('!php/hash::SyckTestSomeClass {}');
             $this->assertTrue(false);
         } catch (SyckException $e) {
@@ -217 +192 @@
         // SyckTestOtherClass doesn't exist: FAILURE
         try {
-            syck_load('!php/hash:SyckTestOtherClass {}');
+            syck_load('!php/hash::SyckTestOtherClass {}');
             $this->assertTrue(false);
         } catch (SyckException $e) {
@@ -226 +201 @@
     public function testSerializable()
     {
-        $obj = syck_load('!php:MySerializable teststring');
+        $obj = syck_load('!php/object::MySerializable teststring');
 
         $this->assertType('MySerializable', $obj);