Changeset 268 for trunk

Timestamp:

07/15/2007 07:24:00 (17 months ago)

Author:

indeyets

Message:

0.9.1 pecl release (see CHANGELOG for details)

Location:

trunk/ext/php

Files:

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

trunk/ext/php/CHANGELOG

@@ -1 +1 @@
 --- %YAML:1.0
+- version: 0.9.1
+  date: 2007-07-15
+  status: beta
+  changes:
+    - fixed handling of invalid merge-references [pecl#11585]
+    - fixed tsrm-incompatibility introduced in 0.9
+    - added support for timestamps in syck_load
+    - added support for DateTime in syck_dump
+    - fixed dumping of associative-arrays
+
 - version: 0.9
   date: 2007-07-11

trunk/ext/php/TODO

@@ -1 +1 @@
 --- 
 General:
-  - "switch requirements to php 5.2 and remove redundant code"
   - "write more phpunit tests"
   - "syck_load_from_file(string $url[, resource $context])"
@@ -8 +7 @@
   - "add PHP6 (unicode strings) support"
 load:
-  - "Add support for datatypes":
-    - merge
-    - "timestamp#iso8601"
-    - "timestamp#spaced"
-    - "timestamp#ymd"
-    - timestamp
   - objects:
     - "!php/hash:YAML::ClassName"
@@ -22 +15 @@
   - merge
   - objects:
-    - "Datetime": {as: "timestamp#iso8601"}
     - Iterator:
       as: map

trunk/ext/php/package.xml

@@ -13 +13 @@
     <active>yes</active>
   </lead>
-  <date>2007-07-11</date>
+  <date>2007-07-15</date>
   <version>
-   <release>0.9</release>
+   <release>0.9.1</release>
    <api>1.0</api>
   </version>
@@ -24 +24 @@
   <license uri="http://www.php.net/license">PHP License</license>
   <notes>
-- this is the first release in PECL
-- added several unit-tests
-- fixed a bunch of vartype-errors
-- added support for sexagesimal numbers
+- fixed handling of invalid merge-references [pecl#11585]
+- fixed tsrm-incompatibility introduced in 0.9
+- added support for timestamps in syck_load
+- added support for DateTime in syck_dump
+- fixed dumping of associative-arrays
   </notes>
   <contents>
@@ -55 +56 @@
   <providesextension>syck</providesextension>
   <extsrcrelease></extsrcrelease>
+  <changelog>
+    <release>
+        <date>2007-07-11</date>
+        <version>
+         <release>0.9.0</release>
+         <api>1.0</api>
+        </version>
+        <stability>
+         <release>beta</release>
+         <api>beta</api>
+        </stability>
+        <license uri="http://www.php.net/license">PHP License</license>
+        <notes>
+      - this is the first release in PECL
+      - added several unit-tests
+      - fixed a bunch of vartype-errors
+      - added support for sexagesimal numbers
+        </notes>
+    </release>
+  </changelog>
 </package>

trunk/ext/php/phpext.c

@@ -27 +27 @@
 #include "php.h"
 #include "zend_exceptions.h"
+#include "zend_interfaces.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
@@ -71 +72 @@
         size_t output_size;
         size_t output_alloc;
+        unsigned char level;
         zval **stack;
-        unsigned char level;
 } php_syck_emitter_xtra;
 
@@ -104 +105 @@
 {
         while (ptr->output_size + len > ptr->output_alloc) {
-                ptr->output_alloc += 8192;
-                ptr->output = erealloc(ptr->output, ptr->output_alloc);
+                if (ptr->output_alloc == 0) {
+                        ptr->output_alloc = 8192;
+                        ptr->output = emalloc(ptr->output_alloc);
+                } else {
+                        ptr->output_alloc += 8192;
+                        ptr->output = erealloc(ptr->output, ptr->output_alloc);
+                }
         }
 
@@ -196 +202 @@
                         } else if (strcmp(n->type_id, "bool") == 0) {
                                 /* implicit boolean */
+                                TSRMLS_FETCH();
                                 char *ptr = n->data.str->ptr;
                                 size_t len = n->data.str->len;
@@ -306 +313 @@
                         } else if (strcmp(n->type_id, "float#neginf") == 0) {
                                 ZVAL_DOUBLE(o, -inf());
-                        } else if (strcmp(n->type_id, "merge") == 0) {
-                                /* This thing doesn't work, anyway */
-                                /*
+                        } else if (strncmp(n->type_id, "timestamp", 9) == 0) {
                                 TSRMLS_FETCH();
-                                object_init_ex(o, merge_key_entry);
-                                */
+                                zval fname, param, *params[1];
+
+                                ZVAL_STRING(&fname, "date_create", 1);
+                                INIT_ZVAL(param);
+                                params[0] = &param;
+                                ZVAL_STRINGL(params[0], n->data.str->ptr, n->data.str->len, 1);
+
+                                call_user_function(EG(function_table), NULL, &fname, o, 1, params TSRMLS_CC);
+
+                                zval_dtor(&fname);
+                                zval_dtor(params[0]);
                         } else {
+                                php_error(E_NOTICE, "syck extension didn't handle %s type => treating as a string", n->type_id);
                                 ZVAL_STRINGL(o, n->data.str->ptr, n->data.str->len, 1);
                         }
@@ -319 +334 @@
                 case syck_seq_kind:
                 {
-                        SYMID oid;
                         size_t i;
-                        zval *o2;
 
                         array_init(o);
 
                         for (i = 0; i < n->data.list->idx; i++) {
-                                oid = syck_seq_read(n, i);
+                                SYMID oid = syck_seq_read(n, i);
+                                zval *o2;
+
                                 syck_lookup_sym(p, oid, (char **) &o2); /* retrieving child-node */
 
@@ -339 +354 @@
                         size_t i;
                         zval *o2, *o3;
+                        zval *res;
 
                         array_init(o);
@@ -360 +376 @@
 
         return syck_add_sym(p, (char *)o); /* storing node */
+}
+
+SyckNode * php_syck_badanchor_handler(SyckParser *p, char *str)
+{
+        TSRMLS_FETCH();
+        SyckNode *res;
+        char *endl = p->cursor;
+
+        while (*endl != '\0' && *endl != '\n')
+                endl++;
+
+        endl[0] = '\0';
+
+        res = syck_alloc_str();
+
+        zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "bad anchor \"%s\" on line %d, col %d", str, p->linect, p->cursor - p->lineptr - strlen(str));
+
+        return res;
 }
 
@@ -421 +455 @@
 
                 case IS_STRING:
-                        syck_emit_scalar(e, "string", scalar_none, 0, 0, 0, Z_STRVAL_P(data), Z_STRLEN_P(data));
+                        syck_emit_scalar(e, "str", scalar_none, 0, 0, 0, Z_STRVAL_P(data), Z_STRLEN_P(data));
                 break;
 
@@ -448 +482 @@
 
                                 for (zend_hash_internal_pointer_reset(tbl); zend_hash_has_more_elements(tbl) == SUCCESS; zend_hash_move_forward(tbl)) {
-                                        zval **ppzval, *kzval;
+                                        zval **ppzval, kzval;
                                         char *key;
                                         size_t key_len, idx;
@@ -455 +489 @@
                                         zend_hash_get_current_data(tbl, (void **)&ppzval);
 
-                                        ZVAL_STRINGL(kzval, key, key_len - 1, 0);
-                                        if (psex_push_obj(bonus, kzval)) {
+                                        ZVAL_STRINGL(&kzval, key, key_len - 1, 1);
+
+                                        if (psex_push_obj(bonus, &kzval)) {
                                                 syck_emit_item(e, bonus->level);
                                                 psex_pop_obj(bonus);
@@ -466 +501 @@
                                         }
 
+                                        zval_dtor(&kzval);
                                 }
 
@@ -474 +510 @@
 
                 case IS_OBJECT:
+                {
+                        TSRMLS_FETCH();
+                        char *name;
+                        zend_uint name_len;
+                        zend_class_entry *ce = Z_OBJCE_P(data);
+
+                        zend_get_object_classname(data, &name, &name_len TSRMLS_CC);
+
+                        if (strncmp(name, "DateTime", name_len) == 0) {
+                                zval *retval;
+                                zval constant;
+
+                                zend_get_constant("DateTime::ISO8601", 17, &constant TSRMLS_CC);
+                                zend_call_method_with_1_params(&data, ce, NULL, "format", &retval, &constant);
+
+                                zval_dtor(&constant);
+
+                                syck_emit_scalar(e, "tag:yaml.org,2002:timestamp#iso8601", scalar_none, 0, 0, 0, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+                                zval_dtor(retval);
+                                efree(retval);
+                        }
+
+                        efree(name);
+                }
                 break;
 
@@ -510 +570 @@
 
         syck_parser_handler(parser, php_syck_handler);
+        syck_parser_bad_anchor_handler(parser, php_syck_badanchor_handler);
         syck_parser_error_handler(parser, php_syck_ehandler);
 
@@ -522 +583 @@
                 *return_value = *obj;
                 zval_copy_ctor(return_value);
-
                 zval_ptr_dtor(&obj);
         }

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

@@ -5 +5 @@
 
 require_once "PHPUnit/Framework/TestCase.php";
+
+error_reporting(E_ALL);
 
 class TestLoad extends PHPUnit_Framework_TestCase
@@ -124 +126 @@
     }
 
-    public function testDefault()
+    public function testTimestamps()
     {
+        // canonical
+        $this->assertType('DateTime', syck_load("2001-12-15T02:59:43.1Z"));
+        // iso8601
+        $this->assertType('DateTime', syck_load("2001-12-14t21:59:43.10-05:00"));
+        // spaced
+        $this->assertType('DateTime', syck_load("2001-12-14 21:59:43.10 -05"));
+        // date
+        $this->assertType('DateTime', syck_load("2002-12-14"));
     }
 }