bjori Mon Aug 6 22:02:32 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/zip/tests oo_properties.phpt
Modified files: /php-src/ext/zip php_zip.c Log: MFH: - Fix isset/empty($ZipArchive->property) MFH: - Add test http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.37&r2=1.1.2.38&diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.1.2.37 php-src/ext/zip/php_zip.c:1.1.2.38 --- php-src/ext/zip/php_zip.c:1.1.2.37 Mon Jun 4 06:38:22 2007 +++ php-src/ext/zip/php_zip.c Mon Aug 6 22:02:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.37 2007/06/04 06:38:22 tony2001 Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38 2007/08/06 22:02:32 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -449,6 +449,55 @@ } /* }}} */ +static int php_zip_has_property(zval *object, zval *member, int type TSRMLS_DC) /* {{{ */ +{ + ze_zip_object *obj; + zval tmp_member; + zip_prop_handler *hnd; + zend_object_handlers *std_hnd; + int ret, retval = 0; + + if (member->type != IS_STRING) { + tmp_member = *member; + zval_copy_ctor(&tmp_member); + convert_to_string(&tmp_member); + member = &tmp_member; + } + + ret = FAILURE; + obj = (ze_zip_object *)zend_objects_get_address(object TSRMLS_CC); + + if (obj->prop_handler != NULL) { + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + } + + if (ret == SUCCESS) { + zval *tmp; + + if (type == 2) { + retval = 1; + } else if (php_zip_property_reader(obj, hnd, &tmp, 1 TSRMLS_CC) == SUCCESS) { + tmp->refcount = 1; + tmp->is_ref = 0; + if (type == 1) { + retval = zend_is_true(tmp); + } else if (type == 0) { + retval = (Z_TYPE_P(tmp) != IS_NULL); + } + zval_ptr_dtor(&tmp); + } + } else { + std_hnd = zend_get_std_object_handlers(); + retval = std_hnd->has_property(object, member, type TSRMLS_CC); + } + + if (member == &tmp_member) { + zval_dtor(member); + } + return retval; +} +/* }}} */ + static HashTable *php_zip_get_properties(zval *object TSRMLS_DC)/* {{{ */ { ze_zip_object *obj; @@ -1965,6 +2014,7 @@ zip_object_handlers.get_properties = php_zip_get_properties; zip_object_handlers.read_property = php_zip_read_property; + zip_object_handlers.has_property = php_zip_has_property; INIT_CLASS_ENTRY(ce, "ZipArchive", zip_class_functions); ce.create_object = php_zip_object_new; @@ -2051,7 +2101,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Zip", "enabled"); - php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.37 2007/06/04 06:38:22 tony2001 Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38 2007/08/06 22:02:32 bjori Exp $"); php_info_print_table_row(2, "Zip version", "2.0.0"); php_info_print_table_row(2, "Libzip version", "0.7.1"); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/oo_properties.phpt?view=markup&rev=1.1 Index: php-src/ext/zip/tests/oo_properties.phpt +++ php-src/ext/zip/tests/oo_properties.phpt --TEST-- ziparchive::properties isset()/empty() checks --SKIPIF-- <?php /* $Id: oo_properties.phpt,v 1.1 2007/08/06 21:59:11 bjori Exp $ */ if(!extension_loaded('zip')) die('skip'); ?> --FILE-- <?php $dirname = dirname(__FILE__) . '/'; $file = $dirname . '__property_test.zip'; copy($dirname . 'test_with_comment.zip', $file); $zip = new ZipArchive; if (!$zip->open($file)) { exit('failed'); } printf("zip->status (%d):\n\tempty(): %d\n\tisset(): %d\n", $zip->status, empty($zip->status), isset($zip->status)); printf("zip->numFiles (%d):\n\tempty(): %d\n\tisset(): %d\n", $zip->numFiles, empty($zip->numFiles), isset($zip->numFiles)); printf("zip->bogus (%d):\n\tempty(): %d\n\tisset(): %d\n", $zip->bogus, empty($zip->bogus), isset($zip->bogus)); $zip->addEmptyDir('emptydir'); printf("zip->status (%d):\n\tempty(): %d\n\tisset(): %d\n", $zip->status, empty($zip->status), isset($zip->status)); printf("zip->numFiles (%d):\n\tempty(): %d\n\tisset(): %d\n", $zip->numFiles, empty($zip->numFiles), isset($zip->numFiles)); printf("zip->filename (%d):\n\tempty(): %d\n\tisset(): %d\n", strlen($zip->filename), empty($zip->filename), isset($zip->filename)); printf("zip->comment (%d):\n\tempty(): %d\n\tisset(): %d\n", strlen($zip->comment), empty($zip->comment), isset($zip->comment)); @unlink($file); ?> --EXPECTF-- zip->status (0): empty(): 1 isset(): 1 zip->numFiles (4): empty(): 0 isset(): 1 Notice: Undefined property: ZipArchive::$bogus in %s on line %d zip->bogus (0): empty(): 1 isset(): 0 zip->status (0): empty(): 1 isset(): 1 zip->numFiles (5): empty(): 0 isset(): 1 zip->filename (0): empty(): 1 isset(): 1 zip->comment (19): empty(): 0 isset(): 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php