Changeset 276 for trunk/ext/php

Timestamp:

10/05/2007 01:52:32 (14 months ago)

Author:

indeyets

Message:

added support for loading maps into classes which implement ArrayAccess? (!php/hash:ClassName)

Location:

trunk/ext/php

Files:

• CHANGELOG (modified) (1 diff)
• TODO (modified) (1 diff)
• phpext.c (modified) (4 diffs)
• phpunit-tests/TestLoad.php (modified) (1 diff)

trunk/ext/php/CHANGELOG

@@ -9 +9 @@
     - added support for loading explicitly typed DateTime (with timestamp-compatible value)
     - fixed loading of maps with numeric keys
-    - added support for loading sequences into classes which implement ArrayAccess 
+    - 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)
 
 - version: 0.9.1

trunk/ext/php/TODO

@@ -8 +8 @@
 load:
   - objects:
-    - "!php/hash:ClassName"
     - "!php:ClassName (?)"
   - allow user to assign custom handler for loading any other type of objects (java, ruby, etc.)

trunk/ext/php/phpext.c

@@ -396 +396 @@
                                 }
                         } else if (strncmp(n->type_id, "php/array:", 10) == 0) {
-                                /* some class which implements ArrayIterator */
+                                /* some class which implements ArrayAccess */
                                 size_t i;
                                 size_t classname_len = strlen(n->type_id) - 10;
@@ -428 +428 @@
                                                 efree(key);
                                         }
+
+                                        if (zend_hash_exists(&(*ce)->function_table, "__wakeup", 9)) {
+                                                zend_call_method_with_0_params(&o, *ce, NULL, "__wakeup", NULL);
+                                        }
                                 } else {
-                                        zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Class %s doesn't implement ArrayIterator on line %d, col %d: '%s'", classname, p->linect, p->cursor - p->lineptr, p->lineptr);
+                                        zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Class %s doesn't implement ArrayAccess on line %d, col %d: '%s'", classname, p->linect, p->cursor - p->lineptr, p->lineptr);
                                         efree(classname);
                                         break;
@@ -473 +477 @@
                         } else if (strncmp(n->type_id, "php/hash:", 9) == 0) {
                                 /* some classm which implements ArrayAccess */
+                                SYMID oid;
+                                size_t i;
+                                zval *o2, *o3;
                                 size_t classname_len = strlen(n->type_id) - 9;
                                 char *classname = emalloc(classname_len + 1);
@@ -492 +499 @@
                                 }
 
-                                /*
-                                 * TODO: add filling of ArrayAccess object with values
-                                 */
-                                array_init(o);
+                                object_init_ex(o, *ce);
+
+                                for (i = 0; i < n->data.pairs->idx; i++) {
+                                        oid = syck_map_read(n, map_key, i);
+                                        syck_lookup_sym(p, oid, (char **) &o2); /* retrieving key-node */
+
+                                        if (o2->type == IS_STRING || o2->type == IS_LONG) {
+                                                oid = syck_map_read(n, map_value, i);
+                                                syck_lookup_sym(p, oid, (char **) &o3); /* retrieving value-node */
+
+                                                zend_call_method_with_2_params(&o, *ce, NULL, "offsetset", NULL, o2, o3);
+                                                zval_ptr_dtor(&o3);
+                                        }
+
+                                        zval_ptr_dtor(&o2);
+                                }
+
+                                if (zend_hash_exists(&(*ce)->function_table, "__wakeup", 9)) {
+                                        zend_call_method_with_0_params(&o, *ce, NULL, "__wakeup", NULL);
+                                }
 
                                 efree(classname);

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

@@ -177 +177 @@
 
         // ArrayObject implements ArrayAccess: OK
-        $this->assertEquals(syck_load('!php/hash:ArrayObject {}'), array());
+        $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}')
+        );
 
         // SyckTestSomeClass doesn't implement ArrayAccess: FAILURE