[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun May 25 01:31:53 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1305r2=1.1306diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1305 ZendEngine2/ChangeLog:1.1306 --- ZendEngine2/ChangeLog:1.1305Thu May 22 01:31:44 2008 +++ ZendEngine2/ChangeLog Sun May 25 01:31:52 2008 @@ -1,3 +1,357 @@ +2008-05-24 Sebastian Bergmann [EMAIL PROTECTED] + +* tests/bug26077.phpt + tests/bug26077.phpt + tests/bug26229.phpt + tests/bug26229.phpt + tests/bug26698.phpt + tests/bug26698.phpt + tests/bug27268.phpt + tests/bug27268.phpt + tests/bug27598.phpt + tests/bug27598.phpt + tests/bug28377.phpt + tests/bug28377.phpt + tests/bug29104.phpt + tests/bug29104.phpt + tests/bug29210.phpt + tests/bug29210.phpt + tests/bug29505.phpt + tests/bug29505.phpt + tests/bug29890.phpt + tests/bug29890.phpt + tests/bug29896.phpt + tests/bug29896.phpt + tests/bug29944.phpt + tests/bug29944.phpt + tests/bug30080.phpt + tests/bug30080.phpt + tests/bug30140.phpt + tests/bug30140.phpt + tests/bug30161.phpt + tests/bug30161.phpt + tests/bug30394.phpt + tests/bug30394.phpt + tests/bug30451.phpt + tests/bug30451.phpt + tests/bug30519.phpt + tests/bug30519.phpt + tests/bug30702.phpt + tests/bug30702.phpt + tests/bug30791.phpt + tests/bug30791.phpt + tests/bug30820.phpt + tests/bug30820.phpt + tests/bug30828.phpt + tests/bug30828.phpt + tests/bug30889.phpt + tests/bug30889.phpt + tests/bug30922.phpt + tests/bug30922.phpt + tests/bug31177-2.phpt + tests/bug31177-2.phpt + tests/bug31177.phpt + tests/bug31177.phpt + tests/bug31525.phpt + tests/bug31525.phpt + tests/bug32296.phpt + tests/bug32296.phpt + tests/bug32322.phpt + tests/bug32427.phpt + tests/bug32427.phpt + tests/bug32428.phpt + tests/bug32428.phpt + tests/bug32596.phpt + tests/bug32596.phpt + tests/bug32660.phpt + tests/bug32660.phpt + tests/bug32674.phpt + tests/bug32674.phpt + tests/bug32799.phpt + tests/bug32799.phpt + tests/bug32833.phpt + tests/bug32833.phpt + tests/bug32993.phpt + tests/bug32993.phpt + tests/bug33116.phpt + tests/bug33116.phpt + tests/bug33171.phpt + tests/bug33171.phpt + tests/bug33257.phpt + tests/bug33257.phpt + tests/bug33277.phpt + tests/bug33277.phpt + tests/bug33318.phpt + tests/bug33318.phpt + tests/bug33558.phpt + tests/bug33558.phpt + tests/bug33732.phpt + tests/bug33732.phpt + tests/bug33996.phpt + tests/bug33996.phpt + tests/bug33999.phpt + tests/bug33999.phpt + tests/bug34064.phpt + tests/bug34064.phpt + tests/bug34065.phpt + tests/bug34065.phpt + tests/bug34137.phpt + tests/bug34137.phpt + tests/bug34199.phpt + tests/bug34260.phpt + tests/bug34260.phpt + tests/bug34467.phpt + tests/bug34467.phpt + tests/bug34518.phpt + tests/bug34518.phpt + tests/bug34617.phpt + tests/bug34617.phpt + tests/bug34786.phpt + tests/bug34786.phpt + tests/bug34879.phpt + tests/bug34879.phpt + tests/bug34893.phpt + tests/bug34893.phpt + tests/bug35017.phpt + tests/bug35017.phpt + tests/bug35106.phpt + tests/bug35106.phpt + tests/bug35163.phpt + tests/bug35163.phpt + tests/bug35163_2.phpt + tests/bug35163_2.phpt + tests/bug35163_3.phpt + tests/bug35163_3.phpt + tests/bug35239.phpt + tests/bug35239.phpt + tests/bug35393.phpt + tests/bug35393.phpt + tests/bug35411.phpt + tests/bug35411.phpt + tests/bug35437.phpt + tests/bug35437.phpt + tests/bug35470.phpt + tests/bug35470.phpt + tests/bug36071.phpt + tests/bug36071.phpt + tests/bug36214.phpt + tests/bug36214.phpt + tests/bug36303.phpt + tests/bug36303.phpt + tests/bug36513.phpt + tests/bug36513.phpt + tests/bug36568.phpt + tests/bug36568.phpt + tests/bug37046.phpt + tests/bug37046.phpt + tests/bug37144.phpt + tests/bug37144.phpt + tests/bug37715.phpt + tests/bug37715.phpt + tests/bug38146.phpt + tests/bug38146.phpt + tests/bug38211.phpt + tests/bug38211.phpt + tests/bug38220.phpt + tests/bug38220.phpt + tests/bug38234.phpt + tests/bug38234.phpt + tests/bug38287.phpt + tests/bug38287.phpt + tests/bug38469.phpt + tests/bug38469.phpt + tests/bug38623.phpt + tests/bug38623.phpt + tests/bug38942.phpt + tests/bug38942.phpt + tests/bug39017.phpt +
[PHP-CVS] cvs: php-src /ext/standard image.c php_image.h /ext/standard/tests/image image_type_to_mime_type_variation3.phpt
helly Sat May 24 11:53:35 2008 UTC
Added files:
/php-src/ext/standard/tests/image
image_type_to_mime_type_variation3.phpt
Modified files:
/php-src/ext/standard image.c php_image.h
Log:
- Add constants and new test (test from testfest.php.net)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.132r2=1.133diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.132 php-src/ext/standard/image.c:1.133
--- php-src/ext/standard/image.c:1.132 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/image.cSat May 24 11:53:35 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.132 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: image.c,v 1.133 2008/05/24 11:53:35 helly Exp $ */
#include php.h
#include stdio.h
@@ -89,6 +89,8 @@
REGISTER_LONG_CONSTANT(IMAGETYPE_JPEG2000,IMAGE_FILETYPE_JPC,
CONST_CS | CONST_PERSISTENT); /* keep alias */
REGISTER_LONG_CONSTANT(IMAGETYPE_XBM, IMAGE_FILETYPE_XBM,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_ICO, IMAGE_FILETYPE_ICO,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IMAGETYPE_UNKNOWN, IMAGE_FILETYPE_UNKNOWN,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IMAGETYPE_COUNT, IMAGE_FILETYPE_COUNT,
CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_image.h?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/standard/php_image.h
diff -u php-src/ext/standard/php_image.h:1.33
php-src/ext/standard/php_image.h:1.34
--- php-src/ext/standard/php_image.h:1.33 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/php_image.hSat May 24 11:53:35 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_image.h,v 1.33 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: php_image.h,v 1.34 2008/05/24 11:53:35 helly Exp $ */
#ifndef PHP_IMAGE_H
#define PHP_IMAGE_H
@@ -50,8 +50,9 @@
IMAGE_FILETYPE_WBMP,
/* IMAGE_FILETYPE_JPEG2000 is a userland alias for IMAGE_FILETYPE_JPC */
IMAGE_FILETYPE_XBM,
- IMAGE_FILETYPE_ICO
+ IMAGE_FILETYPE_ICO,
/* WHEN EXTENDING: PLEASE ALSO REGISTER IN
image.c:PHP_MINIT_FUNCTION(imagetypes) */
+ IMAGE_FILETYPE_COUNT
} image_filetype;
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
+++ php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
--TEST--
image_type_to_mime_type() (passinf equivalent integer values)
--CREDITS--
Sanjay Mantoor [EMAIL PROTECTED]
--FILE--
?php
/* Prototype : string image_type_to_mime_type(int imagetype)
* Description: Get Mime-Type for image-type returned by getimagesize,
exif_read_data, exif_thumbnail, exif_imagetype
* Source code: ext/standard/image.c
*/
echo *** Testing image_type_to_mime_type() : usage variations ***\n;
for($imagetype = 0; $imagetype = IMAGETYPE_COUNT; ++$imagetype) {
echo \n-- Iteration $imagetype --\n;
var_dump(image_type_to_mime_type($imagetype));
}
?
===DONE===
--EXPECTREGEX--
\*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
-- Iteration 0 --
string\(24\) application\/octet-stream
-- Iteration 1 --
string\(9\) image\/gif
-- Iteration 2 --
string\(10\) image\/jpeg
-- Iteration 3 --
string\(9\) image\/png
-- Iteration 4 --
string\(29\) application\/x-shockwave-flash
-- Iteration 5 --
string\(9\) image\/psd
-- Iteration 6 --
string\(9\) image\/bmp
-- Iteration 7 --
string\(10\) image\/tiff
-- Iteration 8 --
string\(10\) image\/tiff
-- Iteration 9 --
string\(24\) application\/octet-stream
-- Iteration 10 --
string\(9\) image\/jp2
-- Iteration 11 --
string\(24\) application\/octet-stream
-- Iteration 12 --
string\(24\) application\/octet-stream
-- Iteration 13 --
string\(2[49]\) application\/(x-shockwave-flash|octet-stream)
-- Iteration 14 --
string\(9\) image\/iff
-- Iteration 15 --
string\(18\) image\/vnd.wap.wbmp
-- Iteration 16 --
string\(9\) image\/xbm
-- Iteration 17 --
string\(24\) image\/vnd.microsoft.icon
-- Iteration 18 --
string\(24\) application\/octet-stream
===DONE===
--UEXPECTREGEX--
\*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
-- Iteration 0 --
unicode\(24\) application\/octet-stream
-- Iteration 1 --
unicode\(9\) image\/gif
-- Iteration 2 --
unicode\(10\) image\/jpeg
-- Iteration 3 --
unicode\(9\) image\/png
-- Iteration 4 --
unicode\(29\) application\/x-shockwave-flash
-- Iteration 5 --
unicode\(9\) image\/psd
-- Iteration 6 --
unicode\(9\) image\/bmp
-- Iteration 7 --
unicode\(10\) image\/tiff
-- Iteration 8 --
unicode\(10\) image\/tiff
-- Iteration 9 --
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard image.c php_image.h /ext/standard/tests/image image_type_to_mime_type_variation3.phpt
helly Sat May 24 11:53:55 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/image
image_type_to_mime_type_variation3.phpt
Modified files:
/php-src/ext/standard image.c php_image.h
Log:
- MFH Add constants and new test (test from testfest.php.net)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2.2.5.2.3r2=1.114.2.2.2.5.2.4diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.114.2.2.2.5.2.3
php-src/ext/standard/image.c:1.114.2.2.2.5.2.4
--- php-src/ext/standard/image.c:1.114.2.2.2.5.2.3 Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/image.cSat May 24 11:53:55 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.114.2.2.2.5.2.3 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: image.c,v 1.114.2.2.2.5.2.4 2008/05/24 11:53:55 helly Exp $ */
#include php.h
#include stdio.h
@@ -89,6 +89,8 @@
REGISTER_LONG_CONSTANT(IMAGETYPE_JPEG2000,IMAGE_FILETYPE_JPC,
CONST_CS | CONST_PERSISTENT); /* keep alias */
REGISTER_LONG_CONSTANT(IMAGETYPE_XBM, IMAGE_FILETYPE_XBM,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_ICO, IMAGE_FILETYPE_ICO,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IMAGETYPE_UNKNOWN, IMAGE_FILETYPE_UNKNOWN,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IMAGETYPE_COUNT, IMAGE_FILETYPE_COUNT,
CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_image.h?r1=1.29.2.1.2.1.2.2r2=1.29.2.1.2.1.2.3diff_format=u
Index: php-src/ext/standard/php_image.h
diff -u php-src/ext/standard/php_image.h:1.29.2.1.2.1.2.2
php-src/ext/standard/php_image.h:1.29.2.1.2.1.2.3
--- php-src/ext/standard/php_image.h:1.29.2.1.2.1.2.2 Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/php_image.hSat May 24 11:53:55 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_image.h,v 1.29.2.1.2.1.2.2 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: php_image.h,v 1.29.2.1.2.1.2.3 2008/05/24 11:53:55 helly Exp $ */
#ifndef PHP_IMAGE_H
#define PHP_IMAGE_H
@@ -50,8 +50,9 @@
IMAGE_FILETYPE_WBMP,
/* IMAGE_FILETYPE_JPEG2000 is a userland alias for IMAGE_FILETYPE_JPC */
IMAGE_FILETYPE_XBM,
- IMAGE_FILETYPE_ICO
+ IMAGE_FILETYPE_ICO,
/* WHEN EXTENDING: PLEASE ALSO REGISTER IN
image.c:PHP_MINIT_FUNCTION(imagetypes) */
+ IMAGE_FILETYPE_COUNT
} image_filetype;
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
+++ php-src/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
--TEST--
image_type_to_mime_type() (passinf equivalent integer values)
--CREDITS--
Sanjay Mantoor [EMAIL PROTECTED]
--FILE--
?php
/* Prototype : string image_type_to_mime_type(int imagetype)
* Description: Get Mime-Type for image-type returned by getimagesize,
exif_read_data, exif_thumbnail, exif_imagetype
* Source code: ext/standard/image.c
*/
echo *** Testing image_type_to_mime_type() : usage variations ***\n;
for($imagetype = 0; $imagetype = IMAGETYPE_COUNT; ++$imagetype) {
echo \n-- Iteration $imagetype --\n;
var_dump(image_type_to_mime_type($imagetype));
}
?
===DONE===
--EXPECTREGEX--
\*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
-- Iteration 0 --
string\(24\) application\/octet-stream
-- Iteration 1 --
string\(9\) image\/gif
-- Iteration 2 --
string\(10\) image\/jpeg
-- Iteration 3 --
string\(9\) image\/png
-- Iteration 4 --
string\(29\) application\/x-shockwave-flash
-- Iteration 5 --
string\(9\) image\/psd
-- Iteration 6 --
string\(9\) image\/bmp
-- Iteration 7 --
string\(10\) image\/tiff
-- Iteration 8 --
string\(10\) image\/tiff
-- Iteration 9 --
string\(24\) application\/octet-stream
-- Iteration 10 --
string\(9\) image\/jp2
-- Iteration 11 --
string\(24\) application\/octet-stream
-- Iteration 12 --
string\(24\) application\/octet-stream
-- Iteration 13 --
string\(2[49]\) application\/(x-shockwave-flash|octet-stream)
-- Iteration 14 --
string\(9\) image\/iff
-- Iteration 15 --
string\(18\) image\/vnd.wap.wbmp
-- Iteration 16 --
string\(9\) image\/xbm
-- Iteration 17 --
string\(24\) image\/vnd.microsoft.icon
-- Iteration 18 --
string\(24\) application\/octet-stream
===DONE===
--UEXPECTREGEX--
\*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
-- Iteration 0 --
unicode\(24\) application\/octet-stream
-- Iteration 1 --
unicode\(9\) image\/gif
-- Iteration 2 --
unicode\(10\) image\/jpeg
-- Iteration 3 --
unicode\(9\) image\/png
-- Iteration 4 --
unicode\(29\) application\/x-shockwave-flash
--
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection/tests reflectionClass_getExtensionName_basic.phpt reflectionClass_getExtensionName_variation.phpt reflectionClass_getExtension_basic.phpt reflection
Hi Robin, ext/reflection can't be disabled any longer since 5.3. So the SKIPIF can be removed completely. cu, Lars Am Freitag, den 23.05.2008, 21:14 + schrieb Robin Fernandes: robinfFri May 23 21:14:07 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/reflection/tests reflectionClass_getExtension_variation.phpt reflectionClass_isFinal_basic.phpt reflectionClass_isAbstract_basic.phpt reflectionClass_getExtension_basic.phpt reflectionClass_getExtensionName_basic.phpt reflectionClass_getInterfaceNames_basic.phpt reflectionClass_getExtensionName_variation.phpt Modified files: /php-src/ext/reflection/tests reflectionClass_hasMethod_basic.phpt reflectionClass_isInterface_basic.phpt reflectionClass_getModifiers_basic.phpt reflectionClass_isIterateable_variation1.phpt reflectionClass_hasProperty_basic.phpt reflectionClass_hasConstant_basic.phpt reflectionClass_getParentClass.phpt reflectionClass_isIterateable_basic.phpt Log: More basic ReflectionClass tests from Dutch TestFest. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php signature.asc Description: Dies ist ein digital signierter Nachrichtenteil
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c /ext/phar/tests config.xml front.phar.phpt /ext/phar/tests/files blog.phar blog.phar.inc config.xml
sfoxSat May 24 13:13:48 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/files blog.phar.inc config.xml
Removed files:
/php-src/ext/phar/tests config.xml
Modified files:
/php-src/ext/phar phar_object.c
/php-src/ext/phar/tests/files blog.phar
/php-src/ext/phar/tests front.phar.phpt
Log:
We shouldn't need a full path to the mount
- Fixed under Windows, cleaned up test
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.11r2=1.266.2.12diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.11
php-src/ext/phar/phar_object.c:1.266.2.12
--- php-src/ext/phar/phar_object.c:1.266.2.11 Thu May 22 06:33:09 2008
+++ php-src/ext/phar/phar_object.c Sat May 24 13:13:47 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.266.2.11 2008/05/22 06:33:09 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.12 2008/05/24 13:13:47 sfox Exp $ */
#include phar_internal.h
#include func_interceptors.h
@@ -456,6 +456,10 @@
fname = zend_get_executed_filename(TSRMLS_C);
fname_len = strlen(fname);
+#ifdef PHP_WIN32
+ phar_unixify_path_separators(fname, fname_len);
+#endif
+
if (fname_len 7 !memcmp(fname, phar://, 7) SUCCESS ==
phar_split_fname(fname, fname_len, arch, arch_len, entry, entry_len, 2, 0
TSRMLS_CC)) {
efree(entry);
entry = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/files/blog.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/front.phar.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/front.phar.phpt
diff -u php-src/ext/phar/tests/front.phar.phpt:1.1.2.1
php-src/ext/phar/tests/front.phar.phpt:1.1.2.2
--- php-src/ext/phar/tests/front.phar.phpt:1.1.2.1 Sun May 18 23:41:08 2008
+++ php-src/ext/phar/tests/front.phar.phpt Sat May 24 13:13:47 2008
@@ -13,4 +13,13 @@
--FILE_EXTERNAL--
files/blog.phar
--EXPECT--
-string(0)
\ No newline at end of file
+string(167) xml version=1.0 encoding=UTF-8
+config
+ database
+ hostlocalhost/name
+ usersquirrel/user
+ passnuts/pass
+ dbhoard/db
+ /database
+/config
+
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/files/blog.phar.inc
+++ php-src/ext/phar/tests/files/blog.phar.inc
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/config.xml?view=markuprev=1.1
Index: php-src/ext/phar/tests/files/config.xml
+++ php-src/ext/phar/tests/files/config.xml
--
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 regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt
colder Sat May 24 13:25:24 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/spl/tests regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt Log: Add tests from testfest http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_flags_basic.phpt?view=markuprev=1.1 Index: php-src/ext/spl/tests/regexIterator_flags_basic.phpt +++ php-src/ext/spl/tests/regexIterator_flags_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_mode_basic.phpt?view=markuprev=1.1 Index: php-src/ext/spl/tests/regexIterator_mode_basic.phpt +++ php-src/ext/spl/tests/regexIterator_mode_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?view=markuprev=1.1 Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt +++ php-src/ext/spl/tests/regexIterator_setMode_error.phpt -- 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 regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt
colder Sat May 24 13:40:33 2008 UTC
Modified files:
/php-src/ext/spl/tests regexIterator_flags_basic.phpt
regexIterator_mode_basic.phpt
regexIterator_setMode_error.phpt
Log:
Add tests from testfest
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_flags_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_flags_basic.phpt
diff -u /dev/null php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.2
--- /dev/null Sat May 24 13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_flags_basic.phptSat May 24
13:40:33 2008
@@ -0,0 +1,26 @@
+--TEST--
+SPL: RegexIterator::getFlags() and setFlags() basic tests
+--SKIPIF--
+?php extension_loaded('spl') or die('skip'); ?
+--CREDITS--
+Felix De Vliegher [EMAIL PROTECTED]
+--FILE--
+?php
+
+$array = array('foo', 'bar', 'baz');
+$iterator = new ArrayIterator($array);
+$regexIterator = new RegexIterator($iterator, /f/, null,
RegexIterator::USE_KEY);
+
+var_dump($regexIterator-getFlags() === RegexIterator::USE_KEY);
+
+// Test a change in flags, there's only one class constant so it has to be
another int value
+$regexIterator-setFlags(3);
+var_dump($regexIterator-getFlags() === RegexIterator::USE_KEY);
+$regexIterator-setFlags(RegexIterator::USE_KEY);
+var_dump($regexIterator-getFlags() === RegexIterator::USE_KEY);
+
+?
+--EXPECT--
+bool(true)
+bool(false)
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_mode_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_mode_basic.phpt
diff -u /dev/null php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.2
--- /dev/null Sat May 24 13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_mode_basic.phpt Sat May 24 13:40:33 2008
@@ -0,0 +1,34 @@
+--TEST--
+SPL: RegexIterator::getMode() and setMode() basic tests
+--SKIPIF--
+?php extension_loaded('spl') or die('skip'); ?
+--CREDITS--
+Felix De Vliegher [EMAIL PROTECTED]
+--FILE--
+?php
+
+$array = array('foo', 'bar', 'baz');
+$iterator = new ArrayIterator($array);
+$regexIterator = new RegexIterator($iterator, /f/);
+
+var_dump($regexIterator-getMode() === RegexIterator::MATCH);
+
+$regexIterator-setMode(RegexIterator::MATCH);
+var_dump($regexIterator-getMode() === RegexIterator::MATCH);
+
+$regexIterator-setMode(RegexIterator::GET_MATCH);
+var_dump($regexIterator-getMode() === RegexIterator::GET_MATCH);
+
+$regexIterator-setMode(RegexIterator::ALL_MATCHES);
+var_dump($regexIterator-getMode() === RegexIterator::ALL_MATCHES);
+
+$regexIterator-setMode(RegexIterator::SPLIT);
+var_dump($regexIterator-getMode() === RegexIterator::SPLIT);
+
+?
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt
diff -u /dev/null php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.2
--- /dev/null Sat May 24 13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_setMode_error.phpt Sat May 24
13:40:33 2008
@@ -0,0 +1,30 @@
+--TEST--
+SPL: RegexIterator::setMode() error tests
+--SKIPIF--
+?php extension_loaded('spl') or die('skip'); ?
+--CREDITS--
+Felix De Vliegher [EMAIL PROTECTED]
+--FILE--
+?php
+
+$array = array('foo', 'bar', 'baz');
+$regexIterator = new RegexIterator(new ArrayIterator($array), /f/);
+
+var_dump($regexIterator-getMode());
+
+try {
+ $regexIterator-setMode(7);
+} catch (InvalidArgumentException $e) {
+ var_dump($e-getMessage());
+ var_dump($e-getCode());
+}
+
+$regexIterator-setMode('foo');
+
+?
+--EXPECTF--
+int(0)
+string(14) Illegal mode 7
+int(0)
+
+Warning: RegexIterator::setMode() expects parameter 1 to be long, string given
in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/spl/tests regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt
Hi Etienne,
ext/spl can't be disabled any longer too ;-)
cu, Lars
Am Samstag, den 24.05.2008, 13:40 + schrieb Etienne Kneuss:
colderSat May 24 13:40:33 2008 UTC
Modified files:
/php-src/ext/spl/testsregexIterator_flags_basic.phpt
regexIterator_mode_basic.phpt
regexIterator_setMode_error.phpt
Log:
Add tests from testfest
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_flags_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_flags_basic.phpt
diff -u /dev/null php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.2
--- /dev/null Sat May 24 13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_flags_basic.phpt Sat May 24
13:40:33 2008
@@ -0,0 +1,26 @@
+--TEST--
+SPL: RegexIterator::getFlags() and setFlags() basic tests
+--SKIPIF--
+?php extension_loaded('spl') or die('skip'); ?
+--CREDITS--
+Felix De Vliegher [EMAIL PROTECTED]
+--FILE--
+?php
+
+$array = array('foo', 'bar', 'baz');
+$iterator = new ArrayIterator($array);
+$regexIterator = new RegexIterator($iterator, /f/, null,
RegexIterator::USE_KEY);
+
+var_dump($regexIterator-getFlags() === RegexIterator::USE_KEY);
+
+// Test a change in flags, there's only one class constant so it has to be
another int value
+$regexIterator-setFlags(3);
+var_dump($regexIterator-getFlags() === RegexIterator::USE_KEY);
+$regexIterator-setFlags(RegexIterator::USE_KEY);
+var_dump($regexIterator-getFlags() === RegexIterator::USE_KEY);
+
+?
+--EXPECT--
+bool(true)
+bool(false)
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_mode_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_mode_basic.phpt
diff -u /dev/null php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.2
--- /dev/null Sat May 24 13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_mode_basic.phpt Sat May 24
13:40:33 2008
@@ -0,0 +1,34 @@
+--TEST--
+SPL: RegexIterator::getMode() and setMode() basic tests
+--SKIPIF--
+?php extension_loaded('spl') or die('skip'); ?
+--CREDITS--
+Felix De Vliegher [EMAIL PROTECTED]
+--FILE--
+?php
+
+$array = array('foo', 'bar', 'baz');
+$iterator = new ArrayIterator($array);
+$regexIterator = new RegexIterator($iterator, /f/);
+
+var_dump($regexIterator-getMode() === RegexIterator::MATCH);
+
+$regexIterator-setMode(RegexIterator::MATCH);
+var_dump($regexIterator-getMode() === RegexIterator::MATCH);
+
+$regexIterator-setMode(RegexIterator::GET_MATCH);
+var_dump($regexIterator-getMode() === RegexIterator::GET_MATCH);
+
+$regexIterator-setMode(RegexIterator::ALL_MATCHES);
+var_dump($regexIterator-getMode() === RegexIterator::ALL_MATCHES);
+
+$regexIterator-setMode(RegexIterator::SPLIT);
+var_dump($regexIterator-getMode() === RegexIterator::SPLIT);
+
+?
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt
diff -u /dev/null php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.2
--- /dev/null Sat May 24 13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_setMode_error.phptSat May 24
13:40:33 2008
@@ -0,0 +1,30 @@
+--TEST--
+SPL: RegexIterator::setMode() error tests
+--SKIPIF--
+?php extension_loaded('spl') or die('skip'); ?
+--CREDITS--
+Felix De Vliegher [EMAIL PROTECTED]
+--FILE--
+?php
+
+$array = array('foo', 'bar', 'baz');
+$regexIterator = new RegexIterator(new ArrayIterator($array), /f/);
+
+var_dump($regexIterator-getMode());
+
+try {
+ $regexIterator-setMode(7);
+} catch (InvalidArgumentException $e) {
+ var_dump($e-getMessage());
+ var_dump($e-getCode());
+}
+
+$regexIterator-setMode('foo');
+
+?
+--EXPECTF--
+int(0)
+string(14) Illegal mode 7
+int(0)
+
+Warning: RegexIterator::setMode() expects parameter 1 to be long, string
given in %s on line %d
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
[PHP-CVS] cvs: php-src /ext/phar phar.c phar_internal.h phar_object.c tar.c
sfoxSat May 24 13:59:57 2008 UTC
Modified files:
/php-src/ext/phar phar.c phar_internal.h phar_object.c tar.c
Log:
- MFB fix offset detection in tar files
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.374r2=1.375diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.374 php-src/ext/phar/phar.c:1.375
--- php-src/ext/phar/phar.c:1.374 Sat May 17 20:07:38 2008
+++ php-src/ext/phar/phar.c Sat May 24 13:59:56 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.374 2008/05/17 20:07:38 cellog Exp $ */
+/* $Id: phar.c,v 1.375 2008/05/24 13:59:56 sfox Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -101,7 +101,7 @@
* When all uses of a phar have been concluded, this frees the manifest
* and the phar slot
*/
-static void phar_destroy_phar_data(phar_archive_data *phar TSRMLS_DC) /* {{{ */
+void phar_destroy_phar_data(phar_archive_data *phar TSRMLS_DC) /* {{{ */
{
if (phar-alias phar-alias != phar-fname) {
efree(phar-alias);
@@ -3025,7 +3025,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.374 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.375 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_internal.h?r1=1.112r2=1.113diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.112
php-src/ext/phar/phar_internal.h:1.113
--- php-src/ext/phar/phar_internal.h:1.112 Sat May 17 20:07:38 2008
+++ php-src/ext/phar/phar_internal.hSat May 24 13:59:56 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_internal.h,v 1.112 2008/05/17 20:07:38 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.113 2008/05/24 13:59:56 sfox Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -395,6 +395,7 @@
void phar_request_initialize(TSRMLS_D);
void phar_object_init(TSRMLS_D);
+void phar_destroy_phar_data(phar_archive_data *phar TSRMLS_DC);
int phar_open_entry_file(phar_archive_data *phar, phar_entry_info *entry, char
**error TSRMLS_DC);
int phar_open_filename(char *fname, int fname_len, char *alias, int alias_len,
int options, phar_archive_data** pphar, char **error TSRMLS_DC);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.277r2=1.278diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.277
php-src/ext/phar/phar_object.c:1.278
--- php-src/ext/phar/phar_object.c:1.277Wed May 21 20:39:33 2008
+++ php-src/ext/phar/phar_object.c Sat May 24 13:59:56 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.277 2008/05/21 20:39:33 cellog Exp $ */
+/* $Id: phar_object.c,v 1.278 2008/05/24 13:59:56 sfox Exp $ */
#include phar_internal.h
#include func_interceptors.h
@@ -1918,6 +1918,15 @@
if (SUCCESS == zend_hash_find((PHAR_GLOBALS-phar_fname_map), newpath,
phar-fname_len, (void **) pphar)) {
if ((*pphar)-fname_len == phar-fname_len
!memcmp((*pphar)-fname, phar-fname, phar-fname_len)) {
if (!zend_hash_num_elements(phar-manifest)) {
+ (*pphar)-is_tar = phar-is_tar;
+ (*pphar)-is_zip = phar-is_zip;
+ (*pphar)-is_data = phar-is_data;
+ (*pphar)-flags = phar-flags;
+ (*pphar)-fp = phar-fp;
+ phar-fp = NULL;
+ phar_destroy_phar_data(phar TSRMLS_CC);
+ phar = *pphar;
+ newpath = oldpath;
goto its_ok;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.56r2=1.57diff_format=u
Index: php-src/ext/phar/tar.c
diff -u php-src/ext/phar/tar.c:1.56 php-src/ext/phar/tar.c:1.57
--- php-src/ext/phar/tar.c:1.56 Thu May 15 23:46:32 2008
+++ php-src/ext/phar/tar.c Sat May 24 13:59:56 2008
@@ -225,10 +225,11 @@
entry.is_tar = 1;
entry.is_crc_checked = 1;
entry.phar = myphar;
+ pos += sizeof(buf);
do {
phar_entry_info *newentry;
- pos += sizeof(buf);
+ pos = php_stream_tell(fp);
hdr = (tar_header*) buf;
sum1 =
[PHP-CVS] cvs: php-src /ext/phar phar.c phar_object.c tar.c util.c zip.c
sfoxSat May 24 14:18:31 2008 UTC
Modified files:
/php-src/ext/phar phar.c phar_object.c tar.c util.c zip.c
Log:
- MFB major fixes
* found felipe's segfault in util.c and fixed the segfault (3 tests fail
due to odd behavior of . and .. on this machine)
* fixed serious flaws in the setting/resetting of is_data - now it works
properly. Assume
all new PharData are tar-based, and allow passing Phar::ZIP to PharData
constructor to override this
* fix broken earlier commit, introduced segfault that broke 20 tests here
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.375r2=1.376diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.375 php-src/ext/phar/phar.c:1.376
--- php-src/ext/phar/phar.c:1.375 Sat May 24 13:59:56 2008
+++ php-src/ext/phar/phar.c Sat May 24 14:18:31 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.375 2008/05/24 13:59:56 sfox Exp $ */
+/* $Id: phar.c,v 1.376 2008/05/24 14:18:31 sfox Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -406,7 +406,6 @@
}
}
}
- phar-is_data = is_data (phar-is_tar || phar-is_zip);
if (pphar) {
*pphar = phar;
}
@@ -1033,12 +1032,12 @@
}
if (ext_len 3 (z = memchr(ext_str, 'z', ext_len)) ((ext_str +
ext_len) - z = 2) !memcmp(z + 1, ip, 2)) {
- // assume zip-based phar
+ /* assume zip-based phar */
return phar_open_or_create_zip(fname, fname_len, alias,
alias_len, is_data, options, pphar, error TSRMLS_CC);
}
if (ext_len 3 (z = memchr(ext_str, 't', ext_len)) ((ext_str +
ext_len) - z = 2) !memcmp(z + 1, ar, 2)) {
- // assume tar-based phar
+ /* assume tar-based phar */
return phar_open_or_create_tar(fname, fname_len, alias,
alias_len, is_data, options, pphar, error TSRMLS_CC);
}
@@ -1140,6 +1139,9 @@
if (is_data) {
alias = NULL;
alias_len = 0;
+ mydata-is_data = 1;
+ /* assume tar format, PharData can specify other */
+ mydata-is_tar = 1;
} else {
phar_archive_data **fd_ptr;
@@ -3025,7 +3027,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.375 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.376 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.278r2=1.279diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.278
php-src/ext/phar/phar_object.c:1.279
--- php-src/ext/phar/phar_object.c:1.278Sat May 24 13:59:56 2008
+++ php-src/ext/phar/phar_object.c Sat May 24 14:18:31 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.278 2008/05/24 13:59:56 sfox Exp $ */
+/* $Id: phar_object.c,v 1.279 2008/05/24 14:18:31 sfox Exp $ */
#include phar_internal.h
#include func_interceptors.h
@@ -1120,7 +1120,7 @@
/* {{{ proto void Phar::__construct(string fname [, int flags [, string
alias]])
* Construct a Phar archive object
- * {{{ proto void PharData::__construct(string fname [, int flags [, string
alias]])
+ * {{{ proto void PharData::__construct(string fname [[, int flags [, string
alias]], int file format = Phar::TAR])
* Construct a PharData archive object
*/
PHP_METHOD(Phar, __construct)
@@ -1130,22 +1130,13 @@
#else
char *fname, *alias = NULL, *error, *arch = NULL, *entry = NULL,
*save_fname, *objname;
int fname_len, alias_len = 0, arch_len, entry_len, is_data;
- long flags = 0;
+ long flags = 0, format = 0;
phar_archive_object *phar_obj;
phar_archive_data *phar_data;
zval *zobj = getThis(), arg1, arg2;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|ls!, fname,
fname_len, flags, alias, alias_len) == FAILURE) {
- return;
- }
-
phar_obj = (phar_archive_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
- if (phar_obj-arc.archive) {
- zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, Cannot call constructor twice);
- return;
- }
-
PHAR_STR(phar_obj-std.ce-name, objname);
if
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c basic_functions.h
pajoye Sat May 24 14:36:16 2008 UTC
Modified files:
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
- [DOC] restore get_magic_quotes_gpc and get_magic_quotes_runtime
they always return false.
(let save the world, spare bandwidth and kill the trolls 1/2)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.899r2=1.900diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.899
php-src/ext/standard/basic_functions.c:1.900
--- php-src/ext/standard/basic_functions.c:1.899Mon May 12 08:46:49 2008
+++ php-src/ext/standard/basic_functions.c Sat May 24 14:36:16 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.899 2008/05/12 08:46:49 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.900 2008/05/24 14:36:16 pajoye Exp $ */
#include php.h
#include php_streams.h
@@ -769,6 +769,14 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_get_magic_quotes_gpc, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_get_magic_quotes_runtime, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_log, 0, 0, 1)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, message_type)
@@ -3384,6 +3392,9 @@
PHP_FE(set_time_limit,
arginfo_set_time_limit)
PHP_FE(get_cfg_var,
arginfo_get_cfg_var)
+ 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)
PHP_FE(error_get_last,
arginfo_error_get_last)
@@ -4884,6 +4895,22 @@
}
/* }}} */
+/* {{{ proto mixed get_magic_quotes_runtime(void) U
+ Get the value of a PHP configuration option */
+PHP_FUNCTION(get_magic_quotes_runtime)
+{
+ RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto mixed get_magic_quotes_gpc(void) U
+ Get the value of a PHP configuration option */
+PHP_FUNCTION(get_magic_quotes_gpc)
+{
+ RETURN_FALSE;
+}
+/* }}} */
+
/*
1st arg = error message
2nd arg = error option
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.163r2=1.164diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.163
php-src/ext/standard/basic_functions.h:1.164
--- php-src/ext/standard/basic_functions.h:1.163Tue Apr 15 08:43:48 2008
+++ php-src/ext/standard/basic_functions.h Sat May 24 14:36:16 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.163 2008/04/15 08:43:48 jani Exp $ */
+/* $Id: basic_functions.h,v 1.164 2008/05/24 14:36:16 pajoye Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -71,7 +71,6 @@
PHP_FUNCTION(set_time_limit);
PHP_FUNCTION(get_cfg_var);
-PHP_FUNCTION(set_magic_quotes_runtime);
PHP_FUNCTION(get_magic_quotes_runtime);
PHP_FUNCTION(get_magic_quotes_gpc);
--
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_heap.c
colder Sat May 24 14:37:53 2008 UTC Modified files: /php-src/ext/splspl_heap.c Log: Also register the get_iterator handler for Max/Min Heap http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.5r2=1.6diff_format=u Index: php-src/ext/spl/spl_heap.c diff -u php-src/ext/spl/spl_heap.c:1.5 php-src/ext/spl/spl_heap.c:1.6 --- php-src/ext/spl/spl_heap.c:1.5 Tue May 20 12:04:37 2008 +++ php-src/ext/spl/spl_heap.c Sat May 24 14:37:53 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_heap.c,v 1.5 2008/05/20 12:04:37 tony2001 Exp $ */ +/* $Id: spl_heap.c,v 1.6 2008/05/24 14:37:53 colder Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -1183,6 +1183,9 @@ REGISTER_SPL_SUB_CLASS_EX(SplMinHeap, SplHeap, spl_heap_object_new, spl_funcs_SplMinHeap); REGISTER_SPL_SUB_CLASS_EX(SplMaxHeap, SplHeap, spl_heap_object_new, spl_funcs_SplMaxHeap); + spl_ce_SplMaxHeap-get_iterator = spl_heap_get_iterator; + spl_ce_SplMinHeap-get_iterator = spl_heap_get_iterator; + REGISTER_SPL_STD_CLASS_EX(SplPriorityQueue, spl_heap_object_new, spl_funcs_SplPriorityQueue); memcpy(spl_handler_SplPriorityQueue, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); -- 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 spl_heap.c
colder Sat May 24 14:38:04 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/splspl_heap.c Log: MFH: Also register the get_iterator handler for Max/Min Heap http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.1.2.4r2=1.1.2.5diff_format=u Index: php-src/ext/spl/spl_heap.c diff -u php-src/ext/spl/spl_heap.c:1.1.2.4 php-src/ext/spl/spl_heap.c:1.1.2.5 --- php-src/ext/spl/spl_heap.c:1.1.2.4 Fri Feb 29 09:26:01 2008 +++ php-src/ext/spl/spl_heap.c Sat May 24 14:38:04 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_heap.c,v 1.1.2.4 2008/02/29 09:26:01 colder Exp $ */ +/* $Id: spl_heap.c,v 1.1.2.5 2008/05/24 14:38:04 colder Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -1166,6 +1166,9 @@ REGISTER_SPL_SUB_CLASS_EX(SplMinHeap, SplHeap, spl_heap_object_new, spl_funcs_SplMinHeap); REGISTER_SPL_SUB_CLASS_EX(SplMaxHeap, SplHeap, spl_heap_object_new, spl_funcs_SplMaxHeap); + spl_ce_SplMaxHeap-get_iterator = spl_heap_get_iterator; + spl_ce_SplMinHeap-get_iterator = spl_heap_get_iterator; + REGISTER_SPL_STD_CLASS_EX(SplPriorityQueue, spl_heap_object_new, spl_funcs_SplPriorityQueue); memcpy(spl_handler_SplPriorityQueue, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); -- 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 fileobject_005.phpt heap_009.phpt
colder Sat May 24 16:48:15 2008 UTC
Added files:
/php-src/ext/spl/tests heap_009.phpt fileobject_005.phpt
Log:
New tests from testfest
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_009.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/heap_009.phpt
+++ php-src/ext/spl/tests/heap_009.phpt
--TEST--
SPL: SplHeap and friends, throw: An iterator cannot be used with foreach by
reference
--CREDITS--
Thomas Koch [EMAIL PROTECTED]
#Hackday Webtuesday 2008-05-24
--SKIPIF--
?php if (!extension_loaded(spl)) print skip; ?
--FILE--
?php
function testForException( $heap )
{
try
{
foreach( $heap as $item );
}
catch( RuntimeException $e )
{
echo $e-getMessage(),\n;
}
}
// 1. SplMinHeap emtpy
$heap = new SplMinHeap;
testForException( $heap );
// 2. SplMinHeap non-emtpy
$heap = new SplMinHeap;
$heap-insert( 1 );
testForException( $heap );
// 3. SplMaxHeap emtpy
$heap = new SplMaxHeap;
testForException( $heap );
// 4. SplMaxHeap non-emtpy
$heap = new SplMaxHeap;
$heap-insert( 1 );
testForException( $heap );
// 5. SplPriorityQueue empty
$heap = new SplPriorityQueue;
testForException( $heap );
// 6. SplPriorityQueue non-empty
$heap = new SplPriorityQueue;
$heap-insert( 1, 2 );
testForException( $heap );
?
==DONE==
--EXPECT--
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
==DONE==
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_005.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/fileobject_005.phpt
+++ php-src/ext/spl/tests/fileobject_005.phpt
--TEST--
SPL: SplFileObject truncate tests
--SKIPIF--
?php if (!extension_loaded(spl)) print skip; ?
--CREDITS--
Mark Ammann
#Hackday Webtuesday 2008-05-24
--FILE--
?php
set_include_path(dirname(dirname(__FILE__)));
$path = dirname(__FILE__).DIRECTORY_SEPARATOR.'fileobject_005.txt';
touch($path);
$fo = new SplFileObject('tests'.DIRECTORY_SEPARATOR.'fileobject_005.txt', 'w+',
true);
$fo-fwrite(blahlubba);
var_dump($fo-ftruncate(4));
$fo-rewind();
var_dump($fo-fgets(8));
$fo-rewind();
$fo-fwrite(blahlubba);
// This should throw a warning and return NULL since an argument is missing
var_dump($fo-ftruncate());
?
==DONE==
--CLEAN--
?php
$path = dirname(__FILE__).DIRECTORY_SEPARATOR.'fileobject_005.txt';
unlink($path);
?
--EXPECTF--
bool(true)
string(4) blah
Warning: SplFileObject::ftruncate() expects exactly 1 parameter, 0 given in %s
on line %d
NULL
==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) /ext/spl/tests fileobject_005.phpt heap_009.phpt
colder Sat May 24 16:49:04 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests heap_009.phpt fileobject_005.phpt
Log:
New tests from testfest
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_009.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/heap_009.phpt
+++ php-src/ext/spl/tests/heap_009.phpt
--TEST--
SPL: SplHeap and friends, throw: An iterator cannot be used with foreach by
reference
--CREDITS--
Thomas Koch [EMAIL PROTECTED]
#Hackday Webtuesday 2008-05-24
--SKIPIF--
?php if (!extension_loaded(spl)) print skip; ?
--FILE--
?php
function testForException( $heap )
{
try
{
foreach( $heap as $item );
}
catch( RuntimeException $e )
{
echo $e-getMessage(),\n;
}
}
// 1. SplMinHeap emtpy
$heap = new SplMinHeap;
testForException( $heap );
// 2. SplMinHeap non-emtpy
$heap = new SplMinHeap;
$heap-insert( 1 );
testForException( $heap );
// 3. SplMaxHeap emtpy
$heap = new SplMaxHeap;
testForException( $heap );
// 4. SplMaxHeap non-emtpy
$heap = new SplMaxHeap;
$heap-insert( 1 );
testForException( $heap );
// 5. SplPriorityQueue empty
$heap = new SplPriorityQueue;
testForException( $heap );
// 6. SplPriorityQueue non-empty
$heap = new SplPriorityQueue;
$heap-insert( 1, 2 );
testForException( $heap );
?
==DONE==
--EXPECT--
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
An iterator cannot be used with foreach by reference
==DONE==
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_005.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/fileobject_005.phpt
+++ php-src/ext/spl/tests/fileobject_005.phpt
--TEST--
SPL: SplFileObject truncate tests
--SKIPIF--
?php if (!extension_loaded(spl)) print skip; ?
--CREDITS--
Mark Ammann
#Hackday Webtuesday 2008-05-24
--FILE--
?php
set_include_path(dirname(dirname(__FILE__)));
$path = dirname(__FILE__).DIRECTORY_SEPARATOR.'fileobject_005.txt';
touch($path);
$fo = new SplFileObject('tests'.DIRECTORY_SEPARATOR.'fileobject_005.txt', 'w+',
true);
$fo-fwrite(blahlubba);
var_dump($fo-ftruncate(4));
$fo-rewind();
var_dump($fo-fgets(8));
$fo-rewind();
$fo-fwrite(blahlubba);
// This should throw a warning and return NULL since an argument is missing
var_dump($fo-ftruncate());
?
==DONE==
--CLEAN--
?php
$path = dirname(__FILE__).DIRECTORY_SEPARATOR.'fileobject_005.txt';
unlink($path);
?
--EXPECTF--
bool(true)
string(4) blah
Warning: SplFileObject::ftruncate() expects exactly 1 parameter, 0 given in %s
on line %d
NULL
==DONE==
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Sat May 24 18:28:04 2008 UTC Modified files: /CVSROOTavail Log: give those with phpdoc access docweb access too http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1398r2=1.1399diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1398 CVSROOT/avail:1.1399 --- CVSROOT/avail:1.1398Sat May 17 13:01:22 2008 +++ CVSROOT/avail Sat May 24 18:28:04 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 +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 # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa|Zend/tests,ZendEngine2/tests @@ -40,10 +40,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c!
[PHP-CVS] cvs: php-src /ext/spl/tests regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt
sebastian Sat May 24 14:17:44 2008 UTC
Modified files:
/php-src/ext/spl/tests regexIterator_flags_basic.phpt
regexIterator_mode_basic.phpt
regexIterator_setMode_error.phpt
Log:
Drop SKIPIF check for ext/spl.
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_flags_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/regexIterator_flags_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.2
php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.3
--- php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.2Sat May 24
13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_flags_basic.phptSat May 24
14:17:44 2008
@@ -1,7 +1,5 @@
--TEST--
SPL: RegexIterator::getFlags() and setFlags() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
--CREDITS--
Felix De Vliegher [EMAIL PROTECTED]
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_mode_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/regexIterator_mode_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.2
php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.3
--- php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.2 Sat May 24
13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_mode_basic.phpt Sat May 24 14:17:44 2008
@@ -1,7 +1,5 @@
--TEST--
SPL: RegexIterator::getMode() and setMode() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
--CREDITS--
Felix De Vliegher [EMAIL PROTECTED]
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt
diff -u php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.2
php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.3
--- php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.2 Sat May 24
13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_setMode_error.phpt Sat May 24
14:17:44 2008
@@ -1,7 +1,5 @@
--TEST--
SPL: RegexIterator::setMode() error tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
--CREDITS--
Felix De Vliegher [EMAIL PROTECTED]
--FILE--
--
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 regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt
sebastian Sat May 24 14:17:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl/tests regexIterator_flags_basic.phpt
regexIterator_mode_basic.phpt
regexIterator_setMode_error.phpt
Log:
MFH: Drop SKIPIF check for ext/spl.
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_flags_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_flags_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.1.2.1
php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.1.2.2
--- php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.1.2.1Sat May
24 13:25:24 2008
+++ php-src/ext/spl/tests/regexIterator_flags_basic.phptSat May 24
14:17:55 2008
@@ -1,7 +1,5 @@
--TEST--
SPL: RegexIterator::getFlags() and setFlags() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
--CREDITS--
Felix De Vliegher [EMAIL PROTECTED]
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_mode_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_mode_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.1.2.1
php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.1.2.2
--- php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.1.2.1 Sat May 24
13:25:24 2008
+++ php-src/ext/spl/tests/regexIterator_mode_basic.phpt Sat May 24 14:17:55 2008
@@ -1,7 +1,5 @@
--TEST--
SPL: RegexIterator::getMode() and setMode() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
--CREDITS--
Felix De Vliegher [EMAIL PROTECTED]
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt
diff -u php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.1.2.1
php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.1.2.2
--- php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.1.2.1 Sat May
24 13:25:24 2008
+++ php-src/ext/spl/tests/regexIterator_setMode_error.phpt Sat May 24
14:17:55 2008
@@ -1,7 +1,5 @@
--TEST--
SPL: RegexIterator::setMode() error tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
--CREDITS--
Felix De Vliegher [EMAIL PROTECTED]
--FILE--
--
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 testclass
sebastian Sat May 24 14:14:28 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl/tests testclass Log: MFH: dos2unix http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/testclass?r1=1.1r2=1.1.6.1diff_format=u Index: php-src/ext/spl/tests/testclass diff -u php-src/ext/spl/tests/testclass:1.1 php-src/ext/spl/tests/testclass:1.1.6.1 --- php-src/ext/spl/tests/testclass:1.1 Wed Mar 2 01:14:41 2005 +++ php-src/ext/spl/tests/testclass Sat May 24 14:14:28 2008 @@ -1,5 +1,5 @@ -?php - -echo __FILE__ . \n; - +?php + +echo __FILE__ . \n; + ? \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
