[PHP-CVS] cvs: CVSROOT / avail
pajoye Sun Mar 5 00:45:47 2006 UTC Modified files: /CVSROOTavail Log: - peardoc karma http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1101&r2=1.1102&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1101 CVSROOT/avail:1.1102 --- CVSROOT/avail:1.1101Sun Mar 5 00:38:10 2006 +++ CVSROOT/avail Sun Mar 5 00:45:47 2006 @@ -319,7 +319,7 @@ avail|aashley|pear/Auth avail|delatbabel|pear/Net_LDAP avail|nabeel|pecl/axis2 -avail|fela|pear/Image_Puzzle +avail|fela|pear/Image_Puzzle,peardoc avail|migurski|pear/Services_JSON # Curl modules -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Sun Mar 5 00:38:10 2006 UTC Modified files: /CVSROOTavail Log: - fela (image_puzzle) and migurski (services_json) pear karma http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1100&r2=1.1101&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1100 CVSROOT/avail:1.1101 --- CVSROOT/avail:1.1100Sat Mar 4 23:36:58 2006 +++ CVSROOT/avail Sun Mar 5 00:38:10 2006 @@ -319,6 +319,8 @@ avail|aashley|pear/Auth avail|delatbabel|pear/Net_LDAP avail|nabeel|pecl/axis2 +avail|fela|pear/Image_Puzzle +avail|migurski|pear/Services_JSON # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Sat Mar 4 23:36:58 2006 UTC Modified files: /CVSROOTavail Log: - nabeel for pecl/axis2 http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1099&r2=1.1100&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1099 CVSROOT/avail:1.1100 --- CVSROOT/avail:1.1099Fri Mar 3 15:29:19 2006 +++ CVSROOT/avail Sat Mar 4 23:36:58 2006 @@ -318,6 +318,7 @@ avail|colder|pear/Math_Derivative avail|aashley|pear/Auth avail|delatbabel|pear/Net_LDAP +avail|nabeel|pecl/axis2 # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl.php spl_directory.c
helly Sat Mar 4 22:56:11 2006 UTC
Modified files:
/php-src/ext/splspl.php spl_directory.c
Log:
- Need to change a few things to exception based error handling
- Drop erroneus/useless RecursiveDirectoryIterator::getSubPathInfo()
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl.php?r1=1.71&r2=1.72&diff_format=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.71 php-src/ext/spl/spl.php:1.72
--- php-src/ext/spl/spl.php:1.71Tue Feb 21 23:21:53 2006
+++ php-src/ext/spl/spl.php Sat Mar 4 22:56:11 2006
@@ -948,8 +948,8 @@
*/
function setFileClass(string class_name = "SplFileObject") {/**/}
- /** @param class_name name of class used with getFileInfo(),
getPathInfo(),
-*getSubPathInfo(). Must be derived from
SplFileInfo.
+ /** @param class_name name of class used with getFileInfo(),
getPathInfo().
+* Must be derived from SplFileInfo.
*/
function setInfoClass(string class_name = "SplFileInfo") {/**/}
}
@@ -1041,13 +1041,6 @@
/** @return the current sub path
*/
function getSubPathname() {/**/}
-
- /** @return SplFileInfo created for the current sub path
-* @param class_name name of class to instantiate
-* @see SplFileInfo::setInfoClass()
-*/
- function getSubPathInfo(string $class_name = NULL) {/**/}
-
}
/** @ingroup SPL
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.78&r2=1.79&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.78
php-src/ext/spl/spl_directory.c:1.79
--- php-src/ext/spl/spl_directory.c:1.78Mon Feb 27 22:31:07 2006
+++ php-src/ext/spl/spl_directory.c Sat Mar 4 22:56:11 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.78 2006/02/27 22:31:07 helly Exp $ */
+/* $Id: spl_directory.c,v 1.79 2006/03/04 22:56:11 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -748,26 +748,30 @@
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
zend_class_entry *ce = spl_ce_SplFileObject;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
FAILURE) {
- return;
+ php_set_error_handling(EH_THROW, spl_ce_UnexpectedValueException
TSRMLS_CC);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
SUCCESS) {
+ intern->file_class = ce;
}
- intern->file_class = ce;
+ php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
/* }}} */
/* {{{ proto SplFileObject SplFileInfo::setInfoClass([string class_name])
- Class to use in getFileInfo(), getPathInfo(), getSubPathInfo() */
+ Class to use in getFileInfo(), getPathInfo() */
SPL_METHOD(SplFileInfo, setInfoClass)
{
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
zend_class_entry *ce = spl_ce_SplFileInfo;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
FAILURE) {
- return;
+ php_set_error_handling(EH_THROW, spl_ce_UnexpectedValueException
TSRMLS_CC);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
SUCCESS) {
+ intern->info_class = ce;
}
- intern->info_class = ce;
+ php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
/* }}} */
@@ -778,11 +782,13 @@
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
zend_class_entry *ce = intern->info_class;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
FAILURE) {
- return;
+ php_set_error_handling(EH_THROW, spl_ce_UnexpectedValueException
TSRMLS_CC);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
SUCCESS) {
+ spl_filesystem_object_create_type(ht, intern, SPL_FS_INFO, ce,
return_value TSRMLS_CC);
}
- spl_filesystem_object_create_type(ht, intern, SPL_FS_INFO, ce,
return_value TSRMLS_CC);
+ php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
/* }}} */
@@ -793,11 +799,13 @@
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
zend_class_entry *ce = intern->info_class;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
FAILURE) {
- return;
+ php_set_error_handling(EH_THROW, spl_ce_UnexpectedValueException
TSRMLS_CC);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) ==
SUCCESS) {
+ spl_filesystem_object_create_info(intern, intern->path,
intern->path_len, 1, ce, return_value TSR
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
helly Sat Mar 4 17:01:16 2006 UTC
Modified files:
/php-src/ext/splspl_iterators.c
Log:
- Make the ctor static and not inline
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.117&r2=1.118&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.117
php-src/ext/spl/spl_iterators.c:1.118
--- php-src/ext/spl/spl_iterators.c:1.117 Fri Mar 3 23:34:49 2006
+++ php-src/ext/spl/spl_iterators.c Sat Mar 4 17:01:16 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.117 2006/03/03 23:34:49 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.118 2006/03/04 17:01:16 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -843,7 +843,7 @@
static inline int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more
TSRMLS_DC);
-inline spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS,
zend_class_entry *ce_base, zend_class_entry *ce_inner, dual_it_type dit_type)
+static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS,
zend_class_entry *ce_base, zend_class_entry *ce_inner, dual_it_type dit_type)
{
zval *zobject, *retval;
spl_dual_it_object *intern;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_array.c
helly Sat Mar 4 16:45:45 2006 UTC
Modified files:
/php-src/ext/splspl_array.c
Log:
- WS/CS
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.99&r2=1.100&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.99 php-src/ext/spl/spl_array.c:1.100
--- php-src/ext/spl/spl_array.c:1.99Tue Feb 21 20:12:42 2006
+++ php-src/ext/spl/spl_array.c Sat Mar 4 16:45:45 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.99 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: spl_array.c,v 1.100 2006/03/04 16:45:45 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -900,7 +900,7 @@
return;
}
}
-
+
spl_array_rewind(intern TSRMLS_CC);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
@@ -975,15 +975,14 @@
{
zval *object = getThis(), *tmp, **array;
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
-
- array_init(return_value);
+
+ array_init(return_value);
zend_hash_copy(HASH_OF(return_value), spl_array_get_hash_table(intern,
0 TSRMLS_CC), (copy_ctor_func_t) zval_add_ref, &tmp, sizeof(zval*));
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &array) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- if (Z_TYPE_PP(array) == IS_OBJECT && intern ==
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC))
- {
+ if (Z_TYPE_PP(array) == IS_OBJECT && intern ==
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC)) {
zval_ptr_dtor(&intern->array);
array = &object;
intern->array = object;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests spl_003.phpt
helly Sat Mar 4 16:40:55 2006 UTC Modified files: /php-src/ext/spl/tests spl_003.phpt Log: - One skipif section is enough http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/spl_003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/spl/tests/spl_003.phpt diff -u php-src/ext/spl/tests/spl_003.phpt:1.3 php-src/ext/spl/tests/spl_003.phpt:1.4 --- php-src/ext/spl/tests/spl_003.phpt:1.3 Wed Dec 21 22:21:54 2005 +++ php-src/ext/spl/tests/spl_003.phpt Sat Mar 4 16:40:54 2006 @@ -2,8 +2,6 @@ SPL: class_parents() and class_implements() --SKIPIF-- ---SKIPIF-- - --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_engine.c spl_engine.h
helly Sat Mar 4 16:32:59 2006 UTC
Modified files:
/php-src/ext/splspl_engine.c spl_engine.h
Log:
- Drop dead code
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_engine.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/spl/spl_engine.c
diff -u php-src/ext/spl/spl_engine.c:1.21 php-src/ext/spl/spl_engine.c:1.22
--- php-src/ext/spl/spl_engine.c:1.21 Sun Jan 1 13:09:54 2006
+++ php-src/ext/spl/spl_engine.cSat Mar 4 16:32:59 2006
@@ -43,20 +43,6 @@
}
/* }}} */
-/* {{{ spl_is_instance_of */
-int spl_is_instance_of(zval **obj, zend_class_entry *ce TSRMLS_DC)
-{
- /* Ensure everything needed is available before checking for the type.
-*/
- zend_class_entry *instance_ce;
-
- if (obj && (instance_ce = spl_get_class_entry(*obj TSRMLS_CC)) != NULL)
{
- return instanceof_function(instance_ce, ce TSRMLS_CC);
- }
- return 0;
-}
-/* }}} */
-
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_engine.h?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/spl/spl_engine.h
diff -u php-src/ext/spl/spl_engine.h:1.21 php-src/ext/spl/spl_engine.h:1.22
--- php-src/ext/spl/spl_engine.h:1.21 Tue Feb 21 20:12:42 2006
+++ php-src/ext/spl/spl_engine.hSat Mar 4 16:32:59 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_engine.h,v 1.21 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: spl_engine.h,v 1.22 2006/03/04 16:32:59 helly Exp $ */
#ifndef SPL_ENGINE_H
#define SPL_ENGINE_H
@@ -60,8 +60,6 @@
}
/* }}} */
-int spl_is_instance_of(zval **obj, zend_class_entry *ce TSRMLS_DC);
-
#endif /* SPL_ENGINE_H */
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
