Changeset 274 for trunk

Timestamp:

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

Author:

indeyets

Message:

- added support for loading explicitly typed DateTime? (with timestamp-compatible value)
- fixed loading of maps with numeric keys
- added rudimentary support for loading ArrayAccess?-compatible classes (todo, todo, todo…)

Location:

trunk/ext/php

Files:

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

trunk/ext/php/CHANGELOG

@@ -7 +7 @@
     - gcc-2.95 compatibility (patch by Brian J. France)
     - fixed dumping of mixed arrays and numeric-arrays starting from non-zero digit
+    - added support for loading explicitly typed DateTime (with timestamp-compatible value)
+    - fixed loading of maps with numeric keys
 
 - version: 0.9.1

trunk/ext/php/TODO

@@ -10 +10 @@
     - "!php/hash:YAML::ClassName"
     - "!php/array:YAML::ClassName"
-    - "!php:YAML::Datetime"
     - "!php:YAML::ClassName (?)"
+  - allow user to assign custom handler for loading any other type of objects (java, ruby, etc.)
 dump:
   - merge

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) {
+                        } else if (strncmp(n->type_id, "timestamp", 9) == 0 || strcmp(n->type_id, "php:YAML::Datetime") == 0) {
                                 zval fname, param, *params[1];
                                 TSRMLS_FETCH();
@@ -381 +381 @@
                 case syck_seq_kind:
                 {
-                        size_t i;
-
-                        array_init(o);
-
-                        for (i = 0; i < n->data.list->idx; i++) {
-                                SYMID oid = syck_seq_read(n, i);
-                                zval *o2;
-
-                                syck_lookup_sym(p, oid, (char **) &o2); /* retrieving child-node */
-
-                                add_index_zval(o, i, o2);
+                        if (NULL == n->type_id || strcmp(n->type_id, "php/array") == 0) {
+                                size_t i;
+
+                                /* Just an array */
+                                array_init(o);
+
+                                for (i = 0; i < n->data.list->idx; i++) {
+                                        SYMID oid = syck_seq_read(n, i);
+                                        zval *o2;
+
+                                        syck_lookup_sym(p, oid, (char **) &o2); /* retrieving child-node */
+
+                                        add_index_zval(o, i, o2);
+                                }
+                        } else if (strncmp(n->type_id, "php/array:", 10) == 0) {
+                                /* some classm which implements ArrayAccess */
+                                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 + 10, classname_len + 1);
+
+                                if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+                                        zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect, p->cursor - p->lineptr, p->lineptr);
+                                        efree(classname);
+                                        break;
+                                }
+
+                                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);
+                                        efree(classname);
+                                        break;
+                                }
+
+                                /*
+                                 * TODO: add filling of ArrayAccess object with values
+                                 */
+                                array_init(o);
+
+                                efree(classname);
+                        } else {
+                                /* something else */
+                                php_error(E_NOTICE, "syck extension didn't handle %s type", n->type_id);
                         }
                 }
@@ -398 +431 @@
                 case syck_map_kind:
                 {
-                        SYMID oid;
-                        size_t i;
-                        zval *o2, *o3;
-                        zval *res;
-
-                        array_init(o);
-
-                        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) {
-                                        oid = syck_map_read(n, map_value, i);
-                                        syck_lookup_sym(p, oid, (char **) &o3); /* retrieving value-node */
-
-                                        add_assoc_zval(o, o2->value.str.val, o3);
-                                }
-
-                                zval_ptr_dtor(&o2);
+                        if (NULL == n->type_id || strcmp(n->type_id, "php/hash") == 0) {
+                                SYMID oid;
+                                size_t i;
+                                zval *o2, *o3;
+                                zval *res;
+
+                                array_init(o);
+
+                                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 */
+
+                                                if (o2->type == IS_LONG) {
+                                                        add_index_zval(o, Z_LVAL_P(o2), o3);
+                                                } else {
+                                                        add_assoc_zval(o, Z_STRVAL_P(o2), o3);
+                                                }
+                                        }
+
+                                        zval_ptr_dtor(&o2);
+                                }
+                        } else if (strncmp(n->type_id, "php/hash:", 9) == 0) {
+                                /* some classm which implements ArrayAccess */
+                                size_t classname_len = strlen(n->type_id) - 9;
+                                char *classname = emalloc(classname_len + 1);
+                                zend_class_entry **ce;
+                                TSRMLS_FETCH();
+
+                                strncpy(classname, n->type_id + 9, classname_len + 1);
+
+                                if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+                                        zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect, p->cursor - p->lineptr, p->lineptr);
+                                        efree(classname);
+                                        break;
+                                }
+
+                                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);
+                                        efree(classname);
+                                        break;
+                                }
+
+                                /*
+                                 * TODO: add filling of ArrayAccess object with values
+                                 */
+                                array_init(o);
+
+                                efree(classname);
+                        } else {
+                                /* something else */
+                                php_error(E_NOTICE, "syck extension didn't handle %s type", n->type_id);
                         }
                 }

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

@@ -7 +7 @@
 
 error_reporting(E_ALL);
+
+class SyckTestSomeClass {}
+
 
 class TestLoad extends PHPUnit_Framework_TestCase
@@ -136 +139 @@
         // date
         $this->assertType('DateTime', syck_load("2002-12-14"));
+
+        // explicit
+        $this->assertType('DateTime', syck_load("!php:YAML::Datetime 2002-12-14"));
+    }
+
+    public function testArray()
+    {
+        $this->assertEquals(syck_load('[]'), array());
+        $this->assertEquals(syck_load('[a, b, c]'), array('a', 'b', 'c'));
+        $this->assertEquals(syck_load('!php/array []'), array());
+
+        // ArrayObject implements ArrayAccess: OK
+        $this->assertEquals(syck_load('!php/array:ArrayObject []'), array());
+
+        // SyckTestSomeClass doesn't implement ArrayAccess: FAILURE
+        try {
+            syck_load('!php/array:SyckTestSomeClass []');
+            $this->assertTrue(false);
+        } catch (SyckException $e) {
+            $this->assertTrue(true);
+        }
+
+        // SyckTestOtherClass doesn't exist: FAILURE
+        try {
+            syck_load('!php/array:SyckTestOtherClass []');
+            $this->assertTrue(false);
+        } catch (SyckException $e) {
+            $this->assertTrue(true);
+        }
+    }
+
+    public function testHash()
+    {
+        $this->assertEquals(syck_load('{}'), array());
+        $this->assertEquals(syck_load('{0: a, 1: b, 2: c}'), array('a', 'b', 'c'));
+
+        // ArrayObject implements ArrayAccess: OK
+        $this->assertEquals(syck_load('!php/hash:ArrayObject {}'), array());
+
+        // SyckTestSomeClass doesn't implement ArrayAccess: FAILURE
+        try {
+            syck_load('!php/hash:SyckTestSomeClass {}');
+            $this->assertTrue(false);
+        } catch (SyckException $e) {
+            $this->assertTrue(true);
+        }
+
+        // SyckTestOtherClass doesn't exist: FAILURE
+        try {
+            syck_load('!php/hash:SyckTestOtherClass {}');
+            $this->assertTrue(false);
+        } catch (SyckException $e) {
+            $this->assertTrue(true);
+        }
     }
 }