Changeset 275 for trunk

Timestamp:

10/04/2007 17:54:50 (14 months ago)

Author:

indeyets

Message:

- added support for loading sequences into classes which implement ArrayAccess?

Location:

trunk/ext/php

Files:

• CHANGELOG (modified) (1 diff)
• TODO (modified) (2 diffs)
• phpext.c (modified) (2 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 
 
 - version: 0.9.1

trunk/ext/php/TODO

@@ -8 +8 @@
 load:
   - objects:
-    - "!php/hash:YAML::ClassName"
-    - "!php/array:YAML::ClassName"
-    - "!php:YAML::ClassName (?)"
+    - "!php/hash:ClassName"
+    - "!php:ClassName (?)"
   - allow user to assign custom handler for loading any other type of objects (java, ruby, etc.)
 dump:
@@ -17 +16 @@
     - Iterator:
       as: map
-      label: "!php/hash:YAML::ClassName"
+      label: "!php/hash:ClassName"
     - ArrayAccess:
       as: sequence
-      label: "!php/array:YAML::ClassName"
+      label: "!php/array:ClassName"
     - Generic object (?)

trunk/ext/php/phpext.c

@@ -396 +396 @@
                                 }
                         } else if (strncmp(n->type_id, "php/array:", 10) == 0) {
-                                /* some classm which implements ArrayAccess */
+                                /* some class which implements ArrayIterator */
+                                size_t i;
                                 size_t classname_len = strlen(n->type_id) - 10;
                                 char *classname = emalloc(classname_len + 1);
@@ -410 +411 @@
                                 }
 
-                                if (0 == instanceof_function_ex(*ce, zend_ce_arrayaccess, 1 TSRMLS_CC)) {
-                                        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);
+                                if (0 != instanceof_function_ex(*ce, zend_ce_arrayaccess, 1 TSRMLS_CC)) {
+                                        object_init_ex(o, *ce);
+
+                                        for (i = 0; i < n->data.list->idx; i++) {
+                                                SYMID oid = syck_seq_read(n, i);
+                                                zval *o2;
+                                                zval *key;
+
+                                                syck_lookup_sym(p, oid, (char **) &o2); /* retrieving child-node */
+
+                                                MAKE_STD_ZVAL(key);
+                                                ZVAL_LONG(key, i);
+
+                                                zend_call_method_with_2_params(&o, *ce, NULL, "offsetset", NULL, key, o2);
+                                                zval_ptr_dtor(&o2);
+                                                efree(key);
+                                        }
+                                } 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);
                                         efree(classname);
                                         break;
                                 }
 
-                                /*
-                                 * TODO: add filling of ArrayAccess object with values
-                                 */
-                                array_init(o);
+
 
                                 efree(classname);

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

@@ -151 +151 @@
 
         // ArrayObject implements ArrayAccess: OK
-        $this->assertEquals(syck_load('!php/array:ArrayObject []'), array());
+        $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