Changeset 277 for trunk/ext

Timestamp:

10/05/2007 04:48:38 (14 months ago)

Author:

indeyets

Message:

added support for loading classes which implement Serializable (php:ClassName)

Location:

trunk/ext/php

Files:

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

trunk/ext/php/CHANGELOG

@@ -11 +11 @@
     - 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)
 
 - version: 0.9.1

trunk/ext/php/TODO

@@ -7 +7 @@
   - "add PHP6 (unicode strings) support"
 load:
-  - objects:
-    - "!php:ClassName (?)"
   - allow user to assign custom handler for loading any other type of objects (java, ruby, etc.)
 dump:

trunk/ext/php/phpext.c

@@ -142 +142 @@
  *   0 for sequential numeric arrays
  *   1 for insequential or associative arrays
- */
+**/
 static int psex_determine_array_type(HashTable *myht TSRMLS_DC) /* {{{ */
 {
@@ -373 +373 @@
                                 zval_dtor(&fname);
                                 zval_dtor(params[0]);
+                        } else if (strncmp(n->type_id, "php:", 4) == 0) {
+                                size_t classname_len = strlen(n->type_id) - 4;
+                                char *classname = emalloc(classname_len + 1);
+                                zend_class_entry **ce;
+                                zval param;
+                                TSRMLS_FETCH();
+
+                                strncpy(classname, n->type_id + 4, 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_serializable, 1 TSRMLS_CC)) {
+                                        zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Class %s doesn't implement Serializable on line %d, col %d: '%s'", classname, p->linect, p->cursor - p->lineptr, p->lineptr);
+                                        efree(classname);
+                                        break;
+                                }
+                                efree(classname);
+
+                                object_init_ex(o, *ce);
+                                ZVAL_STRINGL(&param, n->data.str->ptr, n->data.str->len, 1);
+                                zend_call_method_with_1_params(&o, *ce, NULL, "unserialize", NULL, &param);
                         } else {
                                 php_error(E_NOTICE, "syck extension didn't handle %s type => treating as a string", n->type_id);

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

@@ -10 +10 @@
 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
@@ -199 +223 @@
         }
     }
+
+    public function testSerializable()
+    {
+        $obj = syck_load('!php:MySerializable teststring');
+
+        $this->assertType('MySerializable', $obj);
+        $this->assertSame('teststring', $obj->test());
+    }
 }