[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon May 26 01:32:55 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3057r2=1.3058diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3057 php-src/ChangeLog:1.3058 --- php-src/ChangeLog:1.3057Sun May 25 01:31:48 2008 +++ php-src/ChangeLog Mon May 26 01:32:54 2008 @@ -1,3 +1,43 @@ +2008-05-25 Zoe Slattery [EMAIL PROTECTED] + +* run-tests.php + run-tests.php: + Added --XFAIL-- section + +2008-05-25 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/basic_functions.c + ext/standard/tests/file/magic_quotes.phpt: + Remove E_DEPRECATED from get_magic_quotes_*() + +2008-05-25 Etienne Kneuss [EMAIL PROTECTED] + +* ext/spl/php_spl.c: + ws + +* (PHP_5_3) + ext/spl/php_spl.c + ext/spl/tests/spl_autoload_010.phpt + ext/spl/tests/spl_autoload_011.phpt: + MFH: Add a prepend param to spl_autoload_register + +* ext/spl/php_spl.c + ext/spl/tests/spl_autoload_010.phpt + ext/spl/tests/spl_autoload_010.phpt + ext/spl/tests/spl_autoload_011.phpt + ext/spl/tests/spl_autoload_011.phpt: + Add a prepend param to spl_autoload_register + +* ext/spl/tests/heap_009.phpt + ext/spl/tests/heap_009.phpt: + remove the skipif + +2008-05-25 Sebastian Bergmann [EMAIL PROTECTED] + +* ext/spl/tests/fileobject_005.phpt: + Drop SKIPIF check for ext/spl. + 2008-05-24 Etienne Kneuss [EMAIL PROTECTED] * (PHP_5_3)
[PHP-CVS] cvs: php-src /ext/spl/tests fileobject_005.phpt
sebastian Sun May 25 06:03:45 2008 UTC Modified files: /php-src/ext/spl/tests fileobject_005.phpt Log: Drop SKIPIF check for ext/spl. http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_005.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/spl/tests/fileobject_005.phpt diff -u php-src/ext/spl/tests/fileobject_005.phpt:1.1 php-src/ext/spl/tests/fileobject_005.phpt:1.2 --- php-src/ext/spl/tests/fileobject_005.phpt:1.1 Sat May 24 16:48:15 2008 +++ php-src/ext/spl/tests/fileobject_005.phpt Sun May 25 06:03:44 2008 @@ -1,7 +1,5 @@ --TEST-- SPL: SplFileObject truncate tests ---SKIPIF-- -?php if (!extension_loaded(spl)) print skip; ? --CREDITS-- Mark Ammann #Hackday Webtuesday 2008-05-24 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests fileobject_005.phpt
sebastian Sun May 25 06:05:57 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl/tests fileobject_005.phpt Log: MFH: Drop SKIPIF check for ext/spl. http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_005.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/spl/tests/fileobject_005.phpt diff -u php-src/ext/spl/tests/fileobject_005.phpt:1.1.2.2 php-src/ext/spl/tests/fileobject_005.phpt:1.1.2.3 --- php-src/ext/spl/tests/fileobject_005.phpt:1.1.2.2 Sat May 24 16:49:04 2008 +++ php-src/ext/spl/tests/fileobject_005.phpt Sun May 25 06:05:57 2008 @@ -1,7 +1,5 @@ --TEST-- SPL: SplFileObject truncate tests ---SKIPIF-- -?php if (!extension_loaded(spl)) print skip; ? --CREDITS-- Mark Ammann #Hackday Webtuesday 2008-05-24 -- 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 heap_009.phpt
colder Sun May 25 12:10:15 2008 UTC Modified files: /php-src/ext/spl/tests heap_009.phpt Log: remove the skipif http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_009.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/spl/tests/heap_009.phpt diff -u php-src/ext/spl/tests/heap_009.phpt:1.1 php-src/ext/spl/tests/heap_009.phpt:1.2 --- php-src/ext/spl/tests/heap_009.phpt:1.1 Sat May 24 16:48:15 2008 +++ php-src/ext/spl/tests/heap_009.phpt Sun May 25 12:10:14 2008 @@ -3,8 +3,6 @@ --CREDITS-- Thomas Koch [EMAIL PROTECTED] #Hackday Webtuesday 2008-05-24 ---SKIPIF-- -?php if (!extension_loaded(spl)) print skip; ? --FILE-- ?php function testForException( $heap ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests heap_009.phpt
colder Sun May 25 12:13:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl/tests heap_009.phpt Log: remove the skipif http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_009.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/spl/tests/heap_009.phpt diff -u php-src/ext/spl/tests/heap_009.phpt:1.1.2.2 php-src/ext/spl/tests/heap_009.phpt:1.1.2.3 --- php-src/ext/spl/tests/heap_009.phpt:1.1.2.2 Sat May 24 16:49:04 2008 +++ php-src/ext/spl/tests/heap_009.phpt Sun May 25 12:13:41 2008 @@ -3,8 +3,6 @@ --CREDITS-- Thomas Koch [EMAIL PROTECTED] #Hackday Webtuesday 2008-05-24 ---SKIPIF-- -?php if (!extension_loaded(spl)) print skip; ? --FILE-- ?php function testForException( $heap ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl php_spl.c /ext/spl/tests spl_autoload_010.phpt spl_autoload_011.phpt
colder Sun May 25 12:22:38 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests spl_autoload_010.phpt spl_autoload_011.phpt
Modified files:
/php-src/ext/splphp_spl.c
Log:
MFH: Add a prepend param to spl_autoload_register
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.16r2=1.52.2.28.2.17.2.17diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.16
php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.17
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.16 Tue Apr 29 09:18:26 2008
+++ php-src/ext/spl/php_spl.c Sun May 25 12:22:37 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.28.2.17.2.16 2008/04/29 09:18:26 dmitry Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.17.2.17 2008/05/25 12:22:37 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -401,7 +401,14 @@
}
} /* }}} */
-/* {{{ proto bool spl_autoload_register([mixed autoload_function =
spl_autoload [, throw = true]])
+#define HT_MOVE_TAIL_TO_HEAD(ht)
\
+ (ht)-pListTail-pListNext = (ht)-pListHead; \
+ (ht)-pListHead = (ht)-pListTail;
\
+ (ht)-pListTail = (ht)-pListHead-pListLast; \
+ (ht)-pListTail-pListNext = NULL;
\
+ (ht)-pListHead-pListLast = NULL;
+
+/* {{{ proto bool spl_autoload_register([mixed autoload_function =
spl_autoload [, throw = true [, prepend]]])
Register given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_register)
{
@@ -410,11 +417,12 @@
char *lc_name = NULL;
zval *zcallable = NULL;
zend_bool do_throw = 1;
+ zend_bool prepend = 0;
zend_function *spl_func_ptr;
autoload_func_info alfi;
zval **obj_ptr;
- if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, |zb, zcallable, do_throw) == FAILURE) {
+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, |zbb, zcallable, do_throw, prepend) == FAILURE) {
return;
}
@@ -507,9 +515,17 @@
spl_alfi.obj = NULL;
spl_alfi.ce = NULL;
zend_hash_add(SPL_G(autoload_functions),
spl_autoload, sizeof(spl_autoload), spl_alfi, sizeof(autoload_func_info),
NULL);
+ if (prepend
SPL_G(autoload_functions)-nNumOfElements 1) {
+ /* Move the newly created element to the head
of the hashtable */
+ HT_MOVE_TAIL_TO_HEAD(SPL_G(autoload_functions));
+ }
}
zend_hash_add(SPL_G(autoload_functions), lc_name,
func_name_len+1, alfi.func_ptr, sizeof(autoload_func_info), NULL);
+ if (prepend SPL_G(autoload_functions)-nNumOfElements 1) {
+ /* Move the newly created element to the head of the
hashtable */
+ HT_MOVE_TAIL_TO_HEAD(SPL_G(autoload_functions));
+ }
skip:
efree(lc_name);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_010.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/spl_autoload_010.phpt
+++ php-src/ext/spl/tests/spl_autoload_010.phpt
--TEST--
SPL: spl_autoload() and prepend
--INI--
include_path=.
--FILE--
?php
function autoloadA($name) {
echo A - $name\n;
}
function autoloadB($name) {
echo B - $name\n;
}
function autoloadC($name) {
echo C - $name\n;
class C{}
}
spl_autoload_register('autoloadA');
spl_autoload_register('autoloadB', true, true);
spl_autoload_register('autoloadC');
new C;
?
===DONE===
?php exit(0); ?
--EXPECTF--
B - C
A - C
C - C
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_011.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/spl_autoload_011.phpt
+++ php-src/ext/spl/tests/spl_autoload_011.phpt
--TEST--
SPL: spl_autoload() and object freed
--INI--
include_path=.
--FILE--
?php
class A {
public $var = 1;
public function autoload() {
echo var:.$this-var.\n;
}
public function __destruct() {
echo __destruct__\n;
}
}
$a = new A;
$a-var = 2;
spl_autoload_register(array($a, 'autoload'));
unset($a);
var_dump(class_exists(C, true));
?
===DONE===
?php exit(0); ?
--EXPECTF--
var:2
bool(false)
===DONE===
__destruct__
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
colder Sun May 25 12:23:22 2008 UTC
Modified files:
/php-src/ext/splphp_spl.c
Log:
ws
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.130r2=1.131diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.130 php-src/ext/spl/php_spl.c:1.131
--- php-src/ext/spl/php_spl.c:1.130 Sun May 25 12:17:27 2008
+++ php-src/ext/spl/php_spl.c Sun May 25 12:23:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.130 2008/05/25 12:17:27 colder Exp $ */
+/* $Id: php_spl.c,v 1.131 2008/05/25 12:23:22 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -393,11 +393,11 @@
zval_ptr_dtor(zclass_name);
} /* }}} */
-#define HT_MOVE_TAIL_TO_HEAD(ht)
\
+#define HT_MOVE_TAIL_TO_HEAD(ht)
\
(ht)-pListTail-pListNext = (ht)-pListHead; \
(ht)-pListHead = (ht)-pListTail;
\
(ht)-pListTail = (ht)-pListHead-pListLast; \
- (ht)-pListTail-pListNext = NULL;
\
+ (ht)-pListTail-pListNext = NULL;
\
(ht)-pListHead-pListLast = NULL;
/* {{{ proto bool spl_autoload_register([mixed autoload_function =
spl_autoload [, throw = true [, prepend = false]]]) U
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c /ext/spl/tests spl_autoload_010.phpt spl_autoload_011.phpt
colder Sun May 25 12:17:27 2008 UTC
Added files:
/php-src/ext/spl/tests spl_autoload_010.phpt spl_autoload_011.phpt
Modified files:
/php-src/ext/splphp_spl.c
Log:
Add a prepend param to spl_autoload_register
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.129r2=1.130diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.129 php-src/ext/spl/php_spl.c:1.130
--- php-src/ext/spl/php_spl.c:1.129 Tue Apr 29 09:18:54 2008
+++ php-src/ext/spl/php_spl.c Sun May 25 12:17:27 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.129 2008/04/29 09:18:54 dmitry Exp $ */
+/* $Id: php_spl.c,v 1.130 2008/05/25 12:17:27 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -393,7 +393,14 @@
zval_ptr_dtor(zclass_name);
} /* }}} */
-/* {{{ proto bool spl_autoload_register([mixed autoload_function =
spl_autoload [, throw = true]]) U
+#define HT_MOVE_TAIL_TO_HEAD(ht)
\
+ (ht)-pListTail-pListNext = (ht)-pListHead; \
+ (ht)-pListHead = (ht)-pListTail;
\
+ (ht)-pListTail = (ht)-pListHead-pListLast; \
+ (ht)-pListTail-pListNext = NULL;
\
+ (ht)-pListHead-pListLast = NULL;
+
+/* {{{ proto bool spl_autoload_register([mixed autoload_function =
spl_autoload [, throw = true [, prepend = false]]]) U
Register given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_register)
{
@@ -401,11 +408,12 @@
zval zfunc_name, ztmp;
zval *zcallable = NULL;
zend_bool do_throw = 1;
+ zend_bool prepend = 0;
zend_function *spl_func_ptr;
autoload_func_info alfi;
zval **obj_ptr;
- if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, |zb, zcallable, do_throw) == FAILURE) {
+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, |zbb, zcallable, do_throw, prepend) == FAILURE) {
return;
}
@@ -517,9 +525,17 @@
spl_alfi.obj = NULL;
spl_alfi.ce = NULL;
zend_hash_add(SPL_G(autoload_functions),
spl_autoload, sizeof(spl_autoload), spl_alfi, sizeof(autoload_func_info),
NULL);
+ if (prepend
SPL_G(autoload_functions)-nNumOfElements 1) {
+ /* Move the newly created element to the head
of the hashtable */
+ HT_MOVE_TAIL_TO_HEAD(SPL_G(autoload_functions));
+ }
}
zend_u_hash_add(SPL_G(autoload_functions), Z_TYPE(zfunc_name),
Z_UNIVAL(zfunc_name), Z_UNILEN(zfunc_name)+1, alfi,
sizeof(autoload_func_info), NULL);
+ if (prepend SPL_G(autoload_functions)-nNumOfElements 1) {
+ /* Move the newly created element to the head of the
hashtable */
+ HT_MOVE_TAIL_TO_HEAD(SPL_G(autoload_functions));
+ }
skip:
zval_dtor(zfunc_name);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_010.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/spl_autoload_010.phpt
+++ php-src/ext/spl/tests/spl_autoload_010.phpt
--TEST--
SPL: spl_autoload() and prepend
--INI--
include_path=.
--FILE--
?php
function autoloadA($name) {
echo A - $name\n;
}
function autoloadB($name) {
echo B - $name\n;
}
function autoloadC($name) {
echo C - $name\n;
class C{}
}
spl_autoload_register('autoloadA');
spl_autoload_register('autoloadB', true, true);
spl_autoload_register('autoloadC');
new C;
?
===DONE===
?php exit(0); ?
--EXPECTF--
B - C
A - C
C - C
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_011.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/spl_autoload_011.phpt
+++ php-src/ext/spl/tests/spl_autoload_011.phpt
--TEST--
SPL: spl_autoload() and object freed
--INI--
include_path=.
--FILE--
?php
class A {
public $var = 1;
public function autoload() {
echo var:.$this-var.\n;
}
public function __destruct() {
echo __destruct__\n;
}
}
$a = new A;
$a-var = 2;
spl_autoload_register(array($a, 'autoload'));
unset($a);
var_dump(class_exists(C, true));
?
===DONE===
?php exit(0); ?
--EXPECTF--
var:2
bool(false)
===DONE===
__destruct__
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/zip Makefile.frag config.m4 php_zip.c
On Fri, Jan 18, 2008 at 2:33 AM, Greg Beaver [EMAIL PROTECTED] wrote: cellog Fri Jan 18 00:33:15 2008 UTC Modified files: /php-src/ext/zipMakefile.frag config.m4 php_zip.c Log: MF5.3: install headers, use correct zip version http://cvs.php.net/viewvc.cgi/php-src/ext/zip/Makefile.frag?r1=1.1r2=1.2diff_format=u Index: php-src/ext/zip/Makefile.frag diff -u /dev/null php-src/ext/zip/Makefile.frag:1.2 --- /dev/null Fri Jan 18 00:33:15 2008 +++ php-src/ext/zip/Makefile.frag Fri Jan 18 00:33:15 2008 @@ -0,0 +1,28 @@ +phpincludedir=$(prefix)/include/php + +ZIP_HEADER_FILES= \ + zip.h \ + zipint.h \ + zip_alias.h \ + zipint_alias.h + +install-zip-headers: + @echo Installing ZIP headers: $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib + @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib + @for f in $(ZIP_HEADER_FILES); do \ + if test -f $(top_srcdir)/lib/$$f; then \ + $(INSTALL_DATA) $(top_srcdir)/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + elif test -f $(top_builddir)/lib/$$f; then \ + $(INSTALL_DATA) $(top_builddir)/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + elif test -f $(top_srcdir)/ext/zip/lib/$$f; then \ + $(INSTALL_DATA) $(top_srcdir)/ext/zip/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + elif test -f $(top_builddir)/ext/zip/lib/$$f; then \ + $(INSTALL_DATA) $(top_builddir)/ext/zip/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + else \ + echo hmmm; \ + fi \ echo Sayyy whaaat? :); -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c /ext/standard/tests/file magic_quotes.phpt
bjori Sun May 25 14:06:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard basic_functions.c /php-src/ext/standard/tests/filemagic_quotes.phpt Log: Remove E_DEPRECATED from get_magic_quotes_*() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.34r2=1.725.2.31.2.64.2.35diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.34 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.35 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.34 Mon May 12 08:47:01 2008 +++ php-src/ext/standard/basic_functions.c Sun May 25 14:06:13 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.34 2008/05/12 08:47:01 tony2001 Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.35 2008/05/25 14:06:13 bjori Exp $ */ #include php.h #include php_streams.h @@ -3347,8 +3347,8 @@ PHP_DEP_FALIAS(magic_quotes_runtime,set_magic_quotes_runtime, NULL) PHP_DEP_FE(set_magic_quotes_runtime, NULL) - PHP_DEP_FE(get_magic_quotes_gpc, NULL) - PHP_DEP_FE(get_magic_quotes_runtime, NULL) + PHP_FE(get_magic_quotes_gpc, NULL) + PHP_FE(get_magic_quotes_runtime, NULL) PHP_FE(import_request_variables, arginfo_import_request_variables) PHP_FE(error_log, arginfo_error_log) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/magic_quotes.phpt?r1=1.1.2.1.2.3r2=1.1.2.1.2.4diff_format=u Index: php-src/ext/standard/tests/file/magic_quotes.phpt diff -u php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.3 php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.4 --- php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.3 Thu May 8 22:21:19 2008 +++ php-src/ext/standard/tests/file/magic_quotes.phpt Sun May 25 14:06:15 2008 @@ -43,36 +43,25 @@ echo Done\n; ? --EXPECTF-- -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d int(0) - -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d int(0) Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d bool(true) - -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d int(1) Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d bool(true) - -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d int(1) string(30) some\'content\'here\and}there Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d bool(true) - -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d int(0) string(27) some'content'hereand}there Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d bool(true) - -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d int(1) string(30) some\'content\'here\and}there @@ -81,8 +70,6 @@ Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d bool(false) - -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d int(0) string(27) some'content'hereand}there Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Sun May 25 16:05:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Added --XFAIL-- section
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.19r2=1.226.2.37.2.35.2.20diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.19
php-src/run-tests.php:1.226.2.37.2.35.2.20
--- php-src/run-tests.php:1.226.2.37.2.35.2.19 Mon Mar 17 17:18:19 2008
+++ php-src/run-tests.php Sun May 25 16:05:04 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.19 2008/03/17 17:18:19 nlopess Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.20 2008/05/25 16:05:04 zoe Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -260,7 +260,7 @@
$test_files = array();
$redir_tests = array();
$test_results = array();
-$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array(), 'WARNED'
= array(), 'LEAKED' = array());
+$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array(), 'WARNED'
= array(), 'LEAKED' = array(), 'XFAILED' = array());
// If parameters given assume they represent selected tests to run.
$failed_tests_file= false;
@@ -441,7 +441,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.19
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.20
$'.\n;
exit(1);
case 'u':
@@ -712,7 +712,7 @@
/* We got failed Tests, offer the user to send an e-mail to QA team, unless
NO_INTERACTION is set */
if (!getenv('NO_INTERACTION')) {
$fp = fopen(php://stdin, r+);
- if ($sum_results['FAILED'] || $sum_results['BORKED'] ||
$sum_results['WARNED'] || $sum_results['LEAKED']) {
+ if ($sum_results['FAILED'] || $sum_results['BORKED'] ||
$sum_results['WARNED'] || $sum_results['LEAKED'] || $sum_results['XFAILED']) {
echo \nYou may have found a problem in PHP.;
}
echo \nWe would like to send this report automatically to the\n;
@@ -748,8 +748,8 @@
$failed_tests_data .= $failed_test_summary . \n;
$failed_tests_data .= get_summary(true, false) . \n;
-
- if ($sum_results['FAILED']) {
+ //Not sending XFAIL results since failure is intentional.
+ if ($sum_results['FAILED'] ) {
foreach ($PHP_FAILED_TESTS['FAILED'] as $test_info) {
$failed_tests_data .= $sep . $test_info['name']
. $test_info['info'];
$failed_tests_data .= $sep .
file_get_contents(realpath($test_info['output']));
@@ -981,7 +981,7 @@
if (!is_array($name) $result != 'REDIR')
{
$test_results[$index] = $result;
- if ($failed_tests_file ($result == 'FAILED' ||
$result == 'WARNED' || $result == 'LEAKED'))
+ if ($failed_tests_file ($result = 'XFAILED' ||
$result == 'FAILED' || $result == 'WARNED' || $result == 'LEAKED'))
{
fwrite($failed_tests_file, $index\n);
}
@@ -1627,7 +1627,11 @@
$restype[] = 'WARN';
}
if (!$passed) {
- $restype[] = 'FAIL';
+ if(isset($section_text['XFAIL'])) {
+ $restype[] = 'XFAIL';
+ }else{
+ $restype[] = 'FAIL';
+ }
}
if (!$passed) {
@@ -1840,7 +1844,7 @@
$n_total = count($test_results);
$n_total += $ignored_by_ext;
- $sum_results = array('PASSED'=0, 'WARNED'=0, 'SKIPPED'=0,
'FAILED'=0, 'BORKED'=0, 'LEAKED'=0);
+ $sum_results = array('PASSED'=0, 'WARNED'=0, 'SKIPPED'=0,
'FAILED'=0, 'BORKED'=0, 'LEAKED'=0, 'XFAILED'=0);
foreach ($test_results as $v) {
$sum_results[$v]++;
}
@@ -1859,10 +1863,11 @@
if ($x_total) {
$x_warned = (100.0 * $sum_results['WARNED']) / $x_total;
$x_failed = (100.0 * $sum_results['FAILED']) / $x_total;
+ $x_xfailed = (100.0 * $sum_results['XFAILED']) / $x_total;
$x_leaked = (100.0 * $sum_results['LEAKED']) / $x_total;
$x_passed = (100.0 * $sum_results['PASSED']) / $x_total;
} else {
- $x_warned = $x_failed = $x_passed = $x_leaked = 0;
+ $x_warned = $x_failed = $x_passed = $x_leaked = $x_xfailed = 0;
}
$summary
[PHP-CVS] cvs: php-src / run-tests.php
zoe Sun May 25 16:12:28 2008 UTC
Modified files:
/php-srcrun-tests.php
Log:
Added --XFAIL-- section
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.347r2=1.348diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.347 php-src/run-tests.php:1.348
--- php-src/run-tests.php:1.347 Wed May 21 14:01:31 2008
+++ php-src/run-tests.php Sun May 25 16:12:27 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.347 2008/05/21 14:01:31 felipe Exp $ */
+/* $Id: run-tests.php,v 1.348 2008/05/25 16:12:27 zoe Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -251,7 +251,7 @@
$test_files = array();
$redir_tests = array();
$test_results = array();
-$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array(), 'WARNED'
= array(), 'LEAKED' = array());
+$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array(), 'WARNED'
= array(), 'LEAKED' = array(), 'XFAILED' = array());
// If parameters given assume they represent selected tests to run.
$failed_tests_file= false;
@@ -447,7 +447,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.347 $'.\n;
+ echo '$Revision: 1.348 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -717,7 +717,7 @@
/* We got failed Tests, offer the user to send an e-mail to QA team, unless
NO_INTERACTION is set */
if (!getenv('NO_INTERACTION')) {
$fp = fopen(php://stdin, r+);
- if ($sum_results['FAILED'] || $sum_results['BORKED'] ||
$sum_results['WARNED'] || $sum_results['LEAKED']) {
+ if ($sum_results['FAILED'] || $sum_results['BORKED'] ||
$sum_results['WARNED'] || $sum_results['LEAKED']|| $sum_results['XFAILED']) {
echo \nYou may have found a problem in PHP.;
}
echo \nWe would like to send this report automatically to the\n;
@@ -996,7 +996,7 @@
{
$pu = $unicode_and_native $unicode_semantics
? '.u' : '';
$test_results[$index.$pu] = $result;
- if ($failed_tests_file ($result == 'FAILED'
|| $result == 'WARNED' || $result == 'LEAKED'))
+ if ($failed_tests_file ($result== 'XFAILED'
|| $result == 'FAILED' || $result == 'WARNED' || $result == 'LEAKED'))
{
fwrite($failed_tests_file, $index\n);
}
@@ -1693,7 +1693,11 @@
$restype[] = 'WARN';
}
if (!$passed) {
- $restype[] = 'FAIL';
+ if(isset($section_text['XFAIL'])) {
+$restype[] = 'XFAIL';
+}else{
+$restype[] = 'FAIL';
+}
}
if (!$passed) {
@@ -1907,7 +1911,7 @@
$n_total = count($test_results);
$n_total += $ignored_by_ext;
- $sum_results = array('PASSED'=0, 'WARNED'=0, 'SKIPPED'=0,
'FAILED'=0, 'BORKED'=0, 'LEAKED'=0);
+ $sum_results = array('PASSED'=0, 'WARNED'=0, 'SKIPPED'=0,
'FAILED'=0, 'BORKED'=0, 'LEAKED'=0, 'XFAILED' = 0);
foreach ($test_results as $v) {
$sum_results[$v]++;
}
@@ -1926,10 +1930,11 @@
if ($x_total) {
$x_warned = (100.0 * $sum_results['WARNED']) / $x_total;
$x_failed = (100.0 * $sum_results['FAILED']) / $x_total;
+ $x_xfailed = (100.0 * $sum_results['XFAILED']) / $x_total;
$x_leaked = (100.0 * $sum_results['LEAKED']) / $x_total;
$x_passed = (100.0 * $sum_results['PASSED']) / $x_total;
} else {
- $x_warned = $x_failed = $x_passed = $x_leaked = 0;
+ $x_warned = $x_failed = $x_passed = $x_leaked = $x_failed = 0;
}
$summary = ;
@@ -1953,7 +1958,9 @@
$summary .=
Tests skipped : . sprintf(%4d
(%5.1f%%),$sum_results['SKIPPED'],$percent_results['SKIPPED']) .
Tests warned: . sprintf(%4d (%5.1f%%),$sum_results['WARNED'],
$percent_results['WARNED']) . . sprintf((%5.1f%%),$x_warned) .
-Tests failed: . sprintf(%4d (%5.1f%%),$sum_results['FAILED'],
$percent_results['FAILED']) . . sprintf((%5.1f%%),$x_failed);
+Tests failed: . sprintf(%4d (%5.1f%%),$sum_results['FAILED'],
$percent_results['FAILED']) . . sprintf((%5.1f%%),$x_failed) .
+Expected fail : . sprintf(%4d
[PHP-CVS] cvs: CVSROOT / avail
helly Sun May 25 19:27:50 2008 UTC Modified files: /CVSROOTavail Log: - Upgrade Steph http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1399r2=1.1400diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1399 CVSROOT/avail:1.1400 --- CVSROOT/avail:1.1399Sat May 24 18:28:04 2008 +++ CVSROOT/avail Sun May 25 19:27:49 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb +avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa|Zend/tests,ZendEngine2/tests @@ -281,7 +281,6 @@ avail|mkoppanen|pecl/ssh2 avail|bdeshong|pecl/usblib avail|francois|pecl/phk,pecl/automap -avail|sfox|pecl/phar,php-src/win32,php-src/ext/phar avail|ramsey|pecl/uploadprogress,pecl/pdo_user avail|seariver|pecl/wxwidgets avail|pestilence669|pecl/xrange -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
helly Sun May 25 19:34:52 2008 UTC Modified files: /CVSROOTavail Log: - Steph needs access to Zend tests, too http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1400r2=1.1401diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1400 CVSROOT/avail:1.1401 --- CVSROOT/avail:1.1400Sun May 25 19:27:49 2008 +++ CVSROOT/avail Sun May 25 19:34:52 2008 @@ -20,7 +20,7 @@ avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb # Some people have access to tests in the Engine -avail|magnus,michael,zoe,jmessa|Zend/tests,ZendEngine2/tests +avail|magnus,michael,zoe,jmessa,sfox|Zend/tests,ZendEngine2/tests # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
