[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt branches/PHP_5_4/ext/pdo_sqli
felipe Sun, 19 Jun 2011 12:33:49 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312277
Log:
- New tests (code coverage++)
Changed paths:
A
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
A
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
A
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
A
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
A
php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
A php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
Added:
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
===
---
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
2011-06-19 12:33:49 UTC (rev 312277)
@@ -0,0 +1,17 @@
+--TEST--
+PDO_sqlite: Testing invalid callback for sqliteCreateAggregate()
+--SKIPIF--
+
+--FILE--
+sqliteCreateAggregate('foo', 'a', '');
+$pdo->sqliteCreateAggregate('foo', 'strlen', '');
+
+?>
+--EXPECTF--
+Warning: PDO::sqliteCreateAggregate(): function 'a' is not callable in %s on
line %d
+
+Warning: PDO::sqliteCreateAggregate(): function '' is not callable in %s on
line %d
Added:
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
===
---
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
2011-06-19 12:33:49 UTC (rev 312277)
@@ -0,0 +1,15 @@
+--TEST--
+PDO_sqlite: Testing getAttribute()
+--SKIPIF--
+
+--FILE--
+getAttribute(PDO::ATTR_SERVER_VERSION));
+var_dump($pdo->getAttribute(PDO::ATTR_CLIENT_VERSION));
+
+?>
+--EXPECTF--
+string(%d) "%s"
+string(%d) "%s"
Added:
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
===
---
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
2011-06-19 12:33:49 UTC (rev 312277)
@@ -0,0 +1,17 @@
+--TEST--
+PDO_sqlite: Testing invalid callback for sqliteCreateAggregate()
+--SKIPIF--
+
+--FILE--
+sqliteCreateAggregate('foo', 'a', '');
+$pdo->sqliteCreateAggregate('foo', 'strlen', '');
+
+?>
+--EXPECTF--
+Warning: PDO::sqliteCreateAggregate(): function 'a' is not callable in %s on
line %d
+
+Warning: PDO::sqliteCreateAggregate(): function '' is not callable in %s on
line %d
Added:
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
===
---
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
2011-06-19 12:33:49 UTC (rev 312277)
@@ -0,0 +1,15 @@
+--TEST--
+PDO_sqlite: Testing getAttribute()
+--SKIPIF--
+
+--FILE--
+getAttribute(PDO::ATTR_SERVER_VERSION));
+var_dump($pdo->getAttribute(PDO::ATTR_CLIENT_VERSION));
+
+?>
+--EXPECTF--
+string(%d) "%s"
+string(%d) "%s"
Added:
php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
===
--- php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
(rev 0)
+++ php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt
2011-06-19 12:33:49 UTC (rev 312277)
@@ -0,0 +1,17 @@
+--TEST--
+PDO_sqlite: Testing invalid callback for sqliteCreateAggregate()
+--SKIPIF--
+
+--FILE--
+sqliteCreateAggregate('foo', 'a', '');
+$pdo->sqliteCreateAggregate('foo', 'strlen', '');
+
+?>
+--EXPECTF--
+Warning: PDO::sqliteCreateAggregate(): function 'a' is not callable in %s on
line %d
+
+Warning: PDO::sqliteCreateAggregate(): function '' is not callable in %s on
line %d
Added: php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
===
--- php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
(rev 0)
+++ php/php-src/trunk/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
2011-06-19 12:33:49 UTC (rev 312277)
@@ -0,0 +1,15 @@
+--TEST--
+PDO_sqlite: Testing getAttribute()
+--SKIPIF--
+
+--FILE--
+getAttribute(PDO::ATTR_SERVER_VERSION));
+var_dump($pdo->getAttribute(PDO::ATTR
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt trunk/ext/fileinfo/tests/finfo_open_001.phpt
felipe Sun, 19 Jun 2011 12:58:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=312279 Log: - Fix test Changed paths: U php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt U php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt Modified: php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt === --- php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt 2011-06-19 12:47:24 UTC (rev 312278) +++ php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt 2011-06-19 12:58:56 UTC (rev 312279) @@ -14,7 +14,7 @@ ?> --EXPECTF-- -Warning: finfo_open(): Failed to load magic database at ''. in %s on line %d +Warning: finfo_open() expects parameter 2 to be a valid path, string given in %s on line %d bool(false) resource(%d) of type (file_info) resource(%d) of type (file_info) Modified: php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt === --- php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt2011-06-19 12:47:24 UTC (rev 312278) +++ php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt2011-06-19 12:58:56 UTC (rev 312279) @@ -14,7 +14,7 @@ ?> --EXPECTF-- -Warning: finfo_open(): Failed to load magic database at ''. in %s on line %d +Warning: finfo_open() expects parameter 2 to be a valid path, string given in %s on line %d bool(false) resource(%d) of type (file_info) resource(%d) of type (file_info) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/file.c trunk/ext/standard/file.c
felipe Sun, 19 Jun 2011 13:20:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312280
Log:
- Missing usage of 'p' parameter specifier
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/file.c
U php/php-src/trunk/ext/standard/file.c
Modified: php/php-src/branches/PHP_5_4/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/file.c2011-06-19 12:58:56 UTC
(rev 312279)
+++ php/php-src/branches/PHP_5_4/ext/standard/file.c2011-06-19 13:20:12 UTC
(rev 312280)
@@ -381,7 +381,7 @@
memset(&md, 0, sizeof(md));
/* Parse arguments */
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename,
&filename_len, &use_include_path) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|b", &filename,
&filename_len, &use_include_path) == FAILURE) {
return;
}
@@ -534,7 +534,7 @@
php_stream_context *context = NULL;
/* Parse arguments */
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|br!ll",
&filename, &filename_len, &use_include_path, &zcontext, &offset, &maxlen) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|br!ll",
&filename, &filename_len, &use_include_path, &zcontext, &offset, &maxlen) ==
FAILURE) {
return;
}
@@ -590,7 +590,7 @@
php_stream *srcstream = NULL;
char mode[3] = "wb";
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/|lr!",
&filename, &filename_len, &data, &flags, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pz/|lr!",
&filename, &filename_len, &data, &flags, &zcontext) == FAILURE) {
return;
}
@@ -735,7 +735,7 @@
php_stream_context *context = NULL;
/* Parse arguments */
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lr!",
&filename, &filename_len, &flags, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|lr!",
&filename, &filename_len, &flags, &zcontext) == FAILURE) {
return;
}
if (flags < 0 || flags > (PHP_FILE_USE_INCLUDE_PATH |
PHP_FILE_IGNORE_NEW_LINES | PHP_FILE_SKIP_EMPTY_LINES |
PHP_FILE_NO_DEFAULT_CONTEXT)) {
@@ -1349,7 +1349,7 @@
zend_bool recursive = 0;
php_stream_context *context;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbr", &dir,
&dir_len, &mode, &recursive, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|lbr", &dir,
&dir_len, &mode, &recursive, &zcontext) == FAILURE) {
RETURN_FALSE;
}
@@ -1390,7 +1390,7 @@
php_stream *stream;
php_stream_context *context = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|br!",
&filename, &filename_len, &use_include_path, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|br!",
&filename, &filename_len, &use_include_path, &zcontext) == FAILURE) {
RETURN_FALSE;
}
@@ -1463,7 +1463,7 @@
php_stream_wrapper *wrapper;
php_stream_context *context;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|r", &old_name,
&old_name_len, &new_name, &new_name_len, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pp|r", &old_name,
&old_name_len, &new_name, &new_name_len, &zcontext) == FAILURE) {
RETURN_FALSE;
}
@@ -1500,7 +1500,7 @@
zval *zcontext = NULL;
php_stream_context *context = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &filename,
&filename_len, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|r", &filename,
&filename_len, &zcontext) == FAILURE) {
RETURN_FALSE;
}
@@ -2469,7 +2469,7 @@
int pattern_len, filename_len;
long flags = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &pattern,
&pattern_len, &filename, &filename_len, &flags) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pp|l", &pattern,
&pattern_len, &filename, &filename_len, &flags) == FAILURE) {
return;
}
Modified: php/php-src/trunk/ext/standard/file.c
===
--- php/php-src/trunk/ext/standard/file.c 2011-06-19 12:58:56 UTC (rev
312279)
+++ php/php-src/trunk/ext/standard/file.c 2011-06-19 13:20:12 UTC (rev
312280)
@@ -381,7 +381,7 @@
memset(&md, 0, sizeof(md));
/* Parse arguments */
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename,
&filename_len, &use_include_path) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|b",
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/file.c branches/PHP_5_4/ext/standard/file.c trunk/ext/standard/file.c
felipe Sun, 19 Jun 2011 14:27:33 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312284
Log:
- Added missing void param check in sys_get_temp_dir
- Fixed param check of umask()
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/file.c
U php/php-src/branches/PHP_5_4/ext/standard/file.c
U php/php-src/trunk/ext/standard/file.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/file.c2011-06-19 13:39:50 UTC
(rev 312283)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.c2011-06-19 14:27:33 UTC
(rev 312284)
@@ -1498,7 +1498,10 @@
{
long arg1 = 0;
int oldumask;
- int arg_count = ZEND_NUM_ARGS();
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
+ }
oldumask = umask(077);
@@ -1506,12 +1509,9 @@
BG(umask) = oldumask;
}
- if (arg_count == 0) {
+ if (ZEND_NUM_ARGS() == 0) {
umask(oldumask);
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l",
&arg1) == FAILURE) {
- RETURN_FALSE;
- }
umask(arg1);
}
@@ -2605,6 +2605,9 @@
Returns directory path used for temporary files */
PHP_FUNCTION(sys_get_temp_dir)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
RETURN_STRING((char *)php_get_temporary_directory(), 1);
}
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/file.c2011-06-19 13:39:50 UTC
(rev 312283)
+++ php/php-src/branches/PHP_5_4/ext/standard/file.c2011-06-19 14:27:33 UTC
(rev 312284)
@@ -1413,7 +1413,10 @@
{
long arg1 = 0;
int oldumask;
- int arg_count = ZEND_NUM_ARGS();
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
+ }
oldumask = umask(077);
@@ -1421,12 +1424,9 @@
BG(umask) = oldumask;
}
- if (arg_count == 0) {
+ if (ZEND_NUM_ARGS() == 0) {
umask(oldumask);
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l",
&arg1) == FAILURE) {
- RETURN_FALSE;
- }
umask(arg1);
}
@@ -2491,6 +2491,9 @@
Returns directory path used for temporary files */
PHP_FUNCTION(sys_get_temp_dir)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
RETURN_STRING((char *)php_get_temporary_directory(), 1);
}
/* }}} */
Modified: php/php-src/trunk/ext/standard/file.c
===
--- php/php-src/trunk/ext/standard/file.c 2011-06-19 13:39:50 UTC (rev
312283)
+++ php/php-src/trunk/ext/standard/file.c 2011-06-19 14:27:33 UTC (rev
312284)
@@ -1413,7 +1413,10 @@
{
long arg1 = 0;
int oldumask;
- int arg_count = ZEND_NUM_ARGS();
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
+ }
oldumask = umask(077);
@@ -1421,12 +1424,9 @@
BG(umask) = oldumask;
}
- if (arg_count == 0) {
+ if (ZEND_NUM_ARGS() == 0) {
umask(oldumask);
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l",
&arg1) == FAILURE) {
- RETURN_FALSE;
- }
umask(arg1);
}
@@ -2491,6 +2491,9 @@
Returns directory path used for temporary files */
PHP_FUNCTION(sys_get_temp_dir)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
RETURN_STRING((char *)php_get_temporary_directory(), 1);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/file.c branches/PHP_5_4/ext/standard/file.c trunk/ext/standard/file.c
felipe Sun, 19 Jun 2011 14:50:44 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312285
Log:
- Opss, restore old behavior
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/file.c
U php/php-src/branches/PHP_5_4/ext/standard/file.c
U php/php-src/trunk/ext/standard/file.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/file.c2011-06-19 14:27:33 UTC
(rev 312284)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.c2011-06-19 14:50:44 UTC
(rev 312285)
@@ -1499,15 +1499,15 @@
long arg1 = 0;
int oldumask;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
- RETURN_FALSE;
- }
-
oldumask = umask(077);
if (BG(umask) == -1) {
BG(umask) = oldumask;
}
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
+ }
if (ZEND_NUM_ARGS() == 0) {
umask(oldumask);
Modified: php/php-src/branches/PHP_5_4/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/file.c2011-06-19 14:27:33 UTC
(rev 312284)
+++ php/php-src/branches/PHP_5_4/ext/standard/file.c2011-06-19 14:50:44 UTC
(rev 312285)
@@ -1414,15 +1414,15 @@
long arg1 = 0;
int oldumask;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
- RETURN_FALSE;
- }
-
oldumask = umask(077);
if (BG(umask) == -1) {
BG(umask) = oldumask;
}
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
+ }
if (ZEND_NUM_ARGS() == 0) {
umask(oldumask);
Modified: php/php-src/trunk/ext/standard/file.c
===
--- php/php-src/trunk/ext/standard/file.c 2011-06-19 14:27:33 UTC (rev
312284)
+++ php/php-src/trunk/ext/standard/file.c 2011-06-19 14:50:44 UTC (rev
312285)
@@ -1414,15 +1414,15 @@
long arg1 = 0;
int oldumask;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
- RETURN_FALSE;
- }
-
oldumask = umask(077);
if (BG(umask) == -1) {
BG(umask) = oldumask;
}
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
+ }
if (ZEND_NUM_ARGS() == 0) {
umask(oldumask);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt branches/PHP_5_4/ext/
felipe Sun, 19 Jun 2011 15:43:16 + Revision: http://svn.php.net/viewvc?view=revision&revision=312286 Log: - Fix tests Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_error.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/fnmatch_variation.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/mkdir_rmdir_variation2.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13.phpt U php/php-src/trunk/ext/standard/tests/file/file_get_contents_variation8.phpt U php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation8.phpt U php/php-src/trunk/ext/standard/tests/file/file_variation2.phpt U php/php-src/trunk/ext/standard/tests/file/fnmatch_error.phpt U php/php-src/trunk/ext/standard/tests/file/fnmatch_variation.phpt U php/php-src/trunk/ext/standard/tests/file/mkdir_rmdir_variation2.phpt U php/php-src/trunk/ext/standard/tests/file/readfile_variation10.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation13.phpt Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt 2011-06-19 14:50:44 UTC (rev 312285) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8.phpt 2011-06-19 15:43:16 UTC (rev 312286) @@ -69,15 +69,15 @@ bool(false) -- Iteration 6 -- -Warning: file_get_contents(): Filename cannot be empty in %s on line %d -bool(false) +Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s on line %d +NULL -- Iteration 7 -- -Warning: file_get_contents() expects parameter 1 to be string, array given in %s on line %d +Warning: file_get_contents() expects parameter 1 to be a valid path, array given in %s on line %d NULL -- Iteration 8 -- -Warning: file_get_contents(/no/such/file/dir): failed to open stream: %s in %s on line %d +Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 9 -- Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt 2011-06-19 14:50:44 UTC (rev 312285) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8.phpt 2011-06-19 15:43:16 UTC (rev 312286) @@ -71,11 +71,11 @@ 9 bytes written to: -- Iteration 6 -- -Warning: file_put_contents(): Filename cannot be empty in %s on line %d +Warning: file_put_contents() expects parameter 1 to be a valid path, string given in %s on line %d Failed to write data to: -- Iteration 7 -- -Warning: file_put_contents() expects parameter 1 to be string, array given in %s on line %d +Warning: file_put_contents() expects parameter 1 to be a valid path, array given in %s on line %d Failed to write data to: Array -- Iteration 8 -- Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt 2011-06-19 14:50:44 UTC (rev 312285) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_variation2.phpt 2011-06-19 15:43:16 UTC (rev 312286) @@ -145,19 +145,19 @@ bool(false) --empty array-- -Error: 2 - file() expects parameter 1 to be string, array given, %s(%d) +Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d) NULL --int indexed array-- -Error: 2 - file() expects parameter 1 to be string, array given, %s(%d) +Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d) NULL --associative array-- -Error: 2 - file() expects parameter 1 to be string, array given, %s(%d) +Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d) NULL --nested arrays-- -Error: 2 - file() expects parameter 1 to be string, array given, %s(%d) +Error: 2 - file() expects parameter 1 to be a valid path, array given, %s(%d) NULL --uppercase NULL-- @@ -197,7 +197,7 @@ bool(false) --instance of classWithoutToString-- -Error: 2 - file() expects parameter 1 to be string, object given, %s(%d) +Error: 2 - file() expects parameter 1 to be a valid path, object given, %s(%d) NULL --undefined var-- Modified:
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/date/tests/ DateTime_add-fall-type2-type2.phpt DateTime_add-fall-type2-type3.phpt DateTime_add-fall-type3-type2.phpt DateTime_add-fall-type3-type3.phpt
danielc Sun, 19 Jun 2011 16:46:32 + Revision: http://svn.php.net/viewvc?view=revision&revision=312287 Log: Make xfail text not reference a particular version now that 5.4 branch exists. Changed paths: U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type3-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type3-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-spring-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-spring-type2-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-spring-type3-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-spring-type3-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type2-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type3-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type3-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-spring-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-spring-type2-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-spring-type3-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-spring-type3-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-fall-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-fall-type2-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-fall-type3-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-fall-type3-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type2-type3.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type3-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type3-type3.phpt Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt === --- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt 2011-06-19 15:43:16 UTC (rev 312286) +++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt 2011-06-19 16:46:32 UTC (rev 312287) @@ -3,7 +3,7 @@ --CREDITS-- Daniel Convissor --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- --XFAIL-- -PHP < 5.4 has bugs +Various bugs exist --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/date/tests/DateTime_add-dates.phpt branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type2.phpt branches/PHP_5_4/ext/date/tests/DateTime_add-fal
danielc Sun, 19 Jun 2011 16:55:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=312288 Log: Split DateTime diff/add/sub tests into separate files to make things easier to see, test and (one hopes) fix. Changed paths: A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-dates.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type3-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type3-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-february.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-massive.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type2-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type2-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type3-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type3-type3.phpt A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-absolute.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-absolute.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-dates.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-dates.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type2-type2.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-fall-type2-type2.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type2-type3.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-fall-type2-type3.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type3-type2.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-fall-type3-type2.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type3-type3.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-fall-type3-type3.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-february.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-february.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-massive.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-massive.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-spring-type2-type2.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-spring-type2-type2.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-spring-type2-type3.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-spring-type2-type3.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-spring-type3-type2.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-spring-type3-type2.phpt:r312286) A + php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-spring-type3-type3.inc (from php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff_add_sub-spring-type3-type3.phpt:r312286) A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-absolute.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-dates.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-fall-type2-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-fall-type2-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-fall-type3-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-fall-type3-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-february.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-massive.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-spring-type2-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-spring-type2-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-spring-type3-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_days-spring-type3-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff-absolute.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff-dates.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff-fall-type2-type2.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff-fall-type2-type3.phpt A php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff-fal
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/date/tests/bug.add.zone2.phpt trunk/ext/date/tests/bug.add.zone2.phpt
danielc Sun, 19 Jun 2011 16:59:58 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312289
Log:
Provide test for DateTime::add() issue (for discussion on internals,
bugs.php.net is down).
Changed paths:
A php/php-src/branches/PHP_5_4/ext/date/tests/bug.add.zone2.phpt
A php/php-src/trunk/ext/date/tests/bug.add.zone2.phpt
Added: php/php-src/branches/PHP_5_4/ext/date/tests/bug.add.zone2.phpt
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/bug.add.zone2.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/bug.add.zone2.phpt
2011-06-19 16:59:58 UTC (rev 312289)
@@ -0,0 +1,33 @@
+--TEST--
+DateTime::add() mistakenly modifies objects having zone type 2
+--CREDITS--
+Daniel Convissor
+--XFAIL--
+Bug exists
+--FILE--
+format('Y-m-d H:i:s T') . "\n";
+echo 'Zone Type 2: ' . $date2->format('Y-m-d H:i:s T') . "\n";
+
+echo $interval->format('Add %h hours %i minutes') . "\n";
+$date3->add($interval);
+$date2->add($interval);
+
+echo 'Zone Type 3: ' . $date3->format('Y-m-d H:i:s T') . "\n";
+echo 'Zone Type 2: ' . $date2->format('Y-m-d H:i:s T') . "\n";
+
+?>
+--EXPECT--
+Zone Type 3: 2010-10-04 02:18:48 EDT
+Zone Type 2: 2010-10-04 02:18:48 EDT
+Add 2 hours 1 minutes
+Zone Type 3: 2010-10-04 04:19:48 EDT
+Zone Type 2: 2010-10-04 04:19:48 EDT
Property changes on:
php/php-src/branches/PHP_5_4/ext/date/tests/bug.add.zone2.phpt
___
Added: svn:executable
+ *
Added: php/php-src/trunk/ext/date/tests/bug.add.zone2.phpt
===
--- php/php-src/trunk/ext/date/tests/bug.add.zone2.phpt
(rev 0)
+++ php/php-src/trunk/ext/date/tests/bug.add.zone2.phpt 2011-06-19 16:59:58 UTC
(rev 312289)
@@ -0,0 +1,33 @@
+--TEST--
+DateTime::add() mistakenly modifies objects having zone type 2
+--CREDITS--
+Daniel Convissor
+--XFAIL--
+Bug exists
+--FILE--
+format('Y-m-d H:i:s T') . "\n";
+echo 'Zone Type 2: ' . $date2->format('Y-m-d H:i:s T') . "\n";
+
+echo $interval->format('Add %h hours %i minutes') . "\n";
+$date3->add($interval);
+$date2->add($interval);
+
+echo 'Zone Type 3: ' . $date3->format('Y-m-d H:i:s T') . "\n";
+echo 'Zone Type 2: ' . $date2->format('Y-m-d H:i:s T') . "\n";
+
+?>
+--EXPECT--
+Zone Type 3: 2010-10-04 02:18:48 EDT
+Zone Type 2: 2010-10-04 02:18:48 EDT
+Add 2 hours 1 minutes
+Zone Type 3: 2010-10-04 04:19:48 EDT
+Zone Type 2: 2010-10-04 04:19:48 EDT
Property changes on: php/php-src/trunk/ext/date/tests/bug.add.zone2.phpt
___
Added: svn:executable
+ *
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Sun, 19 Jun 2011 17:56:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=312294 Log: phpdoc/es karma for Roberto Soto Garrido (numerico) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-06-19 17:42:47 UTC (rev 312293) +++ SVNROOT/global_avail2011-06-19 17:56:02 UTC (rev 312294) @@ -76,7 +76,7 @@ avail|mkoula|phpdoc/cs avail|penguin,tkxs|phpdoc/da avail|kore,thorstenr,lapistano,raphaelm|phpdoc/de -avail|mgonzalezle,ianasa,gustavo,soywiz,ladderalice,ideados,fcaroberga,dulasoft,benjamin,argosback,tatai,jesusruiz,jpberdejo,lduran,sabathorn,julionc,jorgeeolayap,jesus_cova,edwincartagenah,gerardocdc,hcrow,jmperez,agarzon,chuso,jesusdiez,ruben,marcogrossisas,juanmi,bng5,lehmer,jvenegasperu,hugo_quinter|phpdoc/es +avail|mgonzalezle,ianasa,gustavo,soywiz,ladderalice,ideados,fcaroberga,dulasoft,benjamin,argosback,tatai,jesusruiz,jpberdejo,lduran,sabathorn,julionc,jorgeeolayap,jesus_cova,edwincartagenah,gerardocdc,hcrow,jmperez,agarzon,chuso,jesusdiez,ruben,marcogrossisas,juanmi,bng5,lehmer,jvenegasperu,hugo_quinter,numerico|phpdoc/es avail|parstic|phpdoc/fa avail|butera|phpdoc/it avail|magidev,mikaelkael,jpauli|phpdoc/fr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/standard/ credits_ext.h
stas Sun, 19 Jun 2011 17:56:09 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312295
Log:
re-generate credits
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/credits_ext.h
Modified: php/php-src/branches/PHP_5_4/ext/standard/credits_ext.h
===
--- php/php-src/branches/PHP_5_4/ext/standard/credits_ext.h 2011-06-19
17:56:02 UTC (rev 312294)
+++ php/php-src/branches/PHP_5_4/ext/standard/credits_ext.h 2011-06-19
17:56:09 UTC (rev 312295)
@@ -17,8 +17,8 @@
CREDIT_LINE("ctype", "Hartmut Holzgraefe");
CREDIT_LINE("cURL", "Sterling Hughes");
CREDIT_LINE("Date/Time Support", "Derick Rethans");
+CREDIT_LINE("DB-LIB (MS SQL, Sybase)", "Wez Furlong, Frank M. Kromann");
CREDIT_LINE("DBA", "Sascha Schumann, Marcus Boerger");
-CREDIT_LINE("DB-LIB (MS SQL, Sybase)", "Wez Furlong, Frank M. Kromann");
CREDIT_LINE("DOM", "Christian Stocker, Rob Richards, Marcus Boerger");
CREDIT_LINE("enchant", "Pierre-Alain Joye, Ilia Alshanetsky");
CREDIT_LINE("ereg", "Rasmus Lerdorf, Jim Winstead, Jaakko Hyvätti");
@@ -41,9 +41,9 @@
CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("Multibyte String Functions", "Tsukada Takuya, Rui Hirokawa");
CREDIT_LINE("MySQL driver for PDO", "George Schlossnagle, Wez Furlong, Ilia
Alshanetsky, Johannes Schlueter");
+CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel");
CREDIT_LINE("MySQLnd", "Georg Richter, Andrey Hristov, Ulf Wendel");
-CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong,
Christopher Jones, Oracle Corporation");
CREDIT_LINE("ODBC driver for PDO", "Wez Furlong");
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel
R. Kalowsky");
@@ -64,12 +64,12 @@
CREDIT_LINE("Sessions", "Sascha Schumann, Andrei Zmievski");
CREDIT_LINE("Shared Memory Operations", "Slava Poliakov, Ilia Alshanetsky");
CREDIT_LINE("SimpleXML", "Sterling Hughes, Marcus Boerger, Rob Richards");
-CREDIT_LINE("SNMP", "Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven
Lawrance, Johann Hanne");
+CREDIT_LINE("SNMP", "Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven
Lawrance, Johann Hanne, Boris Lytochkin");
CREDIT_LINE("SOAP", "Brad Lafountain, Shane Caraveo, Dmitry Stogov");
CREDIT_LINE("Sockets", "Chris Vandomelen, Sterling Hughes, Daniel Beulshausen,
Jason Greene");
CREDIT_LINE("SPL", "Marcus Boerger, Etienne Kneuss");
+CREDIT_LINE("SQLite 3.x driver for PDO", "Wez Furlong");
CREDIT_LINE("SQLite3", "Scott MacVicar, Ilia Alshanetsky");
-CREDIT_LINE("SQLite 3.x driver for PDO", "Wez Furlong");
CREDIT_LINE("Sybase-CT", "Zeev Suraski, Tom May, Timm Friebe");
CREDIT_LINE("System V Message based IPC", "Wez Furlong");
CREDIT_LINE("System V Semaphores", "Tom May");
@@ -77,9 +77,9 @@
CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky");
CREDIT_LINE("tokenizer", "Andrei Zmievski, Johannes Schlueter");
CREDIT_LINE("WDDX", "Andrei Zmievski");
+CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
CREDIT_LINE("XMLReader", "Rob Richards");
CREDIT_LINE("xmlrpc", "Dan Libby");
-CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
CREDIT_LINE("XMLWriter", "Rob Richards, Pierre-Alain Joye");
CREDIT_LINE("XSL", "Christian Stocker, Rob Richards");
CREDIT_LINE("Zip", "Pierre-Alain Joye");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/declare_001.phpt trunk/Zend/tests/declare_001.phpt
stas Sun, 19 Jun 2011 18:52:58 + Revision: http://svn.php.net/viewvc?view=revision&revision=312296 Log: fix test with floats - make it not produce different result on 32 and 64 bit Changed paths: U php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt U php/php-src/trunk/Zend/tests/declare_001.phpt Modified: php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt === --- php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt2011-06-19 17:56:09 UTC (rev 312295) +++ php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt2011-06-19 18:52:58 UTC (rev 312296) @@ -12,7 +12,7 @@ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/date/lib/parse_date.c branches/PHP_5_4/ext/date/lib/parse_date.re trunk/ext/date/lib/parse_date.c trunk/ext/date/lib/parse_date.re
stas Sun, 19 Jun 2011 18:55:48 + Revision: http://svn.php.net/viewvc?view=revision&revision=312297 Log: fix error reporting on missing data - don't produce double errors Changed paths: U php/php-src/branches/PHP_5_4/ext/date/lib/parse_date.c U php/php-src/branches/PHP_5_4/ext/date/lib/parse_date.re U php/php-src/trunk/ext/date/lib/parse_date.c U php/php-src/trunk/ext/date/lib/parse_date.re -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
stas Sun, 19 Jun 2011 19:03:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=312298 Log: Integrate NEWS Changed paths: U php/php-src/branches/PHP_5_4/NEWS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ configure.in main/php_version.h
stas Sun, 19 Jun 2011 20:11:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=312300 Log: 5.4.0 alpha11 Changed paths: U php/php-src/branches/PHP_5_4/configure.in U php/php-src/branches/PHP_5_4/main/php_version.h Modified: php/php-src/branches/PHP_5_4/configure.in === --- php/php-src/branches/PHP_5_4/configure.in 2011-06-19 19:32:49 UTC (rev 312299) +++ php/php-src/branches/PHP_5_4/configure.in 2011-06-19 20:11:54 UTC (rev 312300) @@ -120,7 +120,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=0 -PHP_EXTRA_VERSION="-dev" +PHP_EXTRA_VERSION="alpha1" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_4/main/php_version.h === --- php/php-src/branches/PHP_5_4/main/php_version.h 2011-06-19 19:32:49 UTC (rev 312299) +++ php/php-src/branches/PHP_5_4/main/php_version.h 2011-06-19 20:11:54 UTC (rev 312300) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.4.0-dev" +#define PHP_EXTRA_VERSION "alpha1" +#define PHP_VERSION "5.4.0alpha1" #define PHP_VERSION_ID 50400 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
stas Sun, 19 Jun 2011 20:13:45 + Revision: http://svn.php.net/viewvc?view=revision&revision=312301 Log: 5.4.0 alpha1 Changed paths: A + php/php-src/tags/php_5_4_0alpha1/ (from php/php-src/branches/PHP_5_4/:r312300) Property changes on: php/php-src/tags/php_5_4_0alpha1 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff x64 Added: svn:mergeinfo + /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS configure.in main/php_version.h
stas Sun, 19 Jun 2011 20:15:33 + Revision: http://svn.php.net/viewvc?view=revision&revision=312302 Log: Back to -dev Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/configure.in U php/php-src/branches/PHP_5_4/main/php_version.h Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-06-19 20:13:45 UTC (rev 312301) +++ php/php-src/branches/PHP_5_4/NEWS 2011-06-19 20:15:33 UTC (rev 312302) @@ -1,6 +1,6 @@ PHPNEWS ||| -20 Jun 2011, PHP 5.4.0 Alpha 1 +?? ??? 2011, PHP 5.4.0 - autoconf 2.59+ is now supported (and required) for generating the configure script with ./buildconf. Autoconf 2.60+ is desirable otherwise the configure help order may be incorrect. (Rasmus, Chris Jones) Modified: php/php-src/branches/PHP_5_4/configure.in === --- php/php-src/branches/PHP_5_4/configure.in 2011-06-19 20:13:45 UTC (rev 312301) +++ php/php-src/branches/PHP_5_4/configure.in 2011-06-19 20:15:33 UTC (rev 312302) @@ -120,7 +120,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=0 -PHP_EXTRA_VERSION="alpha1" +PHP_EXTRA_VERSION="alpha2-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_4/main/php_version.h === --- php/php-src/branches/PHP_5_4/main/php_version.h 2011-06-19 20:13:45 UTC (rev 312301) +++ php/php-src/branches/PHP_5_4/main/php_version.h 2011-06-19 20:15:33 UTC (rev 312302) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "alpha1" -#define PHP_VERSION "5.4.0alpha1" +#define PHP_EXTRA_VERSION "alpha2-dev" +#define PHP_VERSION "5.4.0alpha2-dev" #define PHP_VERSION_ID 50400 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c
felipe Sun, 19 Jun 2011 20:16:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312303
Log:
- Removed unnecessary TSRMLS_FETCH
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-06-19 20:15:33 UTC
(rev 312302)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-06-19 20:16:08 UTC
(rev 312303)
@@ -340,7 +340,6 @@
}
if (Z_TYPE_P(zv) == IS_STRING || Z_TYPE_P(zv) == IS_CONSTANT) {
zval *z = (zval*)zv;
- TSRMLS_FETCH();
Z_STRVAL_P(z) =
zend_new_interned_string(Z_STRVAL_P(zv), Z_STRLEN_P(zv)
+ 1, 1 TSRMLS_CC);
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-06-19 20:15:33 UTC (rev
312302)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-06-19 20:16:08 UTC (rev
312303)
@@ -340,7 +340,6 @@
}
if (Z_TYPE_P(zv) == IS_STRING || Z_TYPE_P(zv) == IS_CONSTANT) {
zval *z = (zval*)zv;
- TSRMLS_FETCH();
Z_STRVAL_P(z) =
zend_new_interned_string(Z_STRVAL_P(zv), Z_STRLEN_P(zv)
+ 1, 1 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c branches/PHP_5_4/Zend/zend_compile.h trunk/Zend/zend_compile.c trunk/Zend/zend_compile.h
felipe Sun, 19 Jun 2011 21:56:09 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312306
Log:
- Minor optimization (avoid to re-hash already computed var name hash)
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/branches/PHP_5_4/Zend/zend_compile.h
U php/php-src/trunk/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.h
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-06-19 21:47:58 UTC (rev 312305)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-06-19 21:56:09 UTC (rev 312306)
@@ -291,10 +291,10 @@
}
/* }}} */
-static int lookup_cv(zend_op_array *op_array, char* name, int name_len TSRMLS_DC) /* {{{ */
+static int lookup_cv(zend_op_array *op_array, char* name, int name_len, ulong hash TSRMLS_DC) /* {{{ */
{
int i = 0;
- ulong hash_value = zend_inline_hash_func(name, name_len+1);
+ ulong hash_value = hash ? hash : zend_inline_hash_func(name, name_len+1);
while (i < op_array->last_var) {
if (op_array->vars[i].name == name ||
@@ -642,7 +642,7 @@
(CG(active_op_array)->last == 0 ||
CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode != ZEND_BEGIN_SILENCE)) {
result->op_type = IS_CV;
- result->u.op.var = lookup_cv(CG(active_op_array), varname->u.constant.value.str.val, varname->u.constant.value.str.len TSRMLS_CC);
+ result->u.op.var = lookup_cv(CG(active_op_array), varname->u.constant.value.str.val, varname->u.constant.value.str.len, 0 TSRMLS_CC);
varname->u.constant.value.str.val = CG(active_op_array)->vars[result->u.op.var].name;
result->EA = 0;
return;
@@ -882,6 +882,7 @@
{
if ((opline->opcode == ZEND_FETCH_W) && (opline->op1_type == IS_CONST)
&& (Z_TYPE(CONSTANT(opline->op1.constant)) == IS_STRING)
+ && (Z_HASH_P(&CONSTANT(opline->op1.constant)) == THIS_HASHVAL)
&& (Z_STRLEN(CONSTANT(opline->op1.constant)) == (sizeof("this")-1))
&& !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this"))) {
return 1;
@@ -1290,7 +1291,7 @@
this_var = opline_ptr->result.var;
if (CG(active_op_array)->this_var == -1) {
- CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), Z_STRVAL(CONSTANT(opline_ptr->op1.constant)), Z_STRLEN(CONSTANT(opline_ptr->op1.constant)) TSRMLS_CC);
+ CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), Z_STRVAL(CONSTANT(opline_ptr->op1.constant)), Z_STRLEN(CONSTANT(opline_ptr->op1.constant)), Z_HASH_P(&CONSTANT(opline_ptr->op1.constant)) TSRMLS_CC);
Z_TYPE(CONSTANT(opline_ptr->op1.constant)) = IS_NULL;
} else {
zend_del_literal(CG(active_op_array), opline_ptr->op1.constant);
@@ -1302,7 +1303,7 @@
variable->u.op.var = CG(active_op_array)->this_var;
}
} else if (CG(active_op_array)->this_var == -1) {
-CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), estrndup("this", sizeof("this")-1), sizeof("this")-1 TSRMLS_CC);
+CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), estrndup("this", sizeof("this")-1), sizeof("this")-1, THIS_HASHVAL TSRMLS_CC);
}
}
@@ -1810,10 +1811,11 @@
zend_error(E_COMPILE_ERROR, "Cannot re-assign auto-global variable %s", Z_STRVAL(varname->u.constant));
} else {
var.op_type = IS_CV;
- var.u.op.var = lookup_cv(CG(active_op_array), varname->u.constant.value.str.val, varname->u.constant.value.str.len TSRMLS_CC);
+ var.u.op.var = lookup_cv(CG(active_op_array), varname->u.constant.value.str.val, varname->u.constant.value.str.len, 0 TSRMLS_CC);
varname->u.constant.value.str.val = CG(active_op_array)->vars[var.u.op.var].name;
var.EA = 0;
- if (Z_STRLEN(varname->u.constant) == sizeof("this")-1 &&
+ if (CG(active_op_array)->vars[var.u.op.var].hash_value == THIS_HASHVAL &&
+ Z_STRLEN(varname->u.constant) == sizeof("this")-1 &&
!memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")-1)) {
if (CG(active_op_array)->scope &&
(CG(active_op_array)->fn_flags & ZEND_ACC_STATIC) == 0) {
@@ -2699,7 +2701,7 @@
opline->op1_type = IS_CONST;
opline->op1.constant = zend_add_class_name_literal(CG(active_op_array), &catch_class.u.constant TSRMLS_CC);
opline->op2_type = IS_CV;
- opline->op2.var = lookup_cv(CG(active_op_array), catch_var->u.constant.value.str.val, catch_var->u.constant.value.str.len TSRMLS_CC);
+ opline->op2.var = lookup_cv(CG(active_op_array), catch_var->u.constant.value.str.val, catch_var->u.constant.value.str.len, 0 TSRMLS_CC);
catch_var->u.constant.value.str.val = CG(active_op_array)->vars[opline->op2.var].name;
opline->result.num = 0; /* 1 means it's the last catch in the block */
@@ -5642,7 +5644,7 @@
fetch_simple_variable(result, variable, 1 TSRMLS_CC);
/* there is a chance someone is accessing $this */
if (CG(active_op_array)->scope && CG(active_op_array)->this_var == -
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/fpm/fpm/zlog.c branches/PHP_5_4/sapi/fpm/fpm/zlog.c trunk/sapi/fpm/fpm/zlog.c
fat Mon, 20 Jun 2011 00:03:39 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312319
Log:
Removed pid in debug logs written by chrildren processes
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-06-19 23:25:45 UTC (rev 312318)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-06-20 00:03:39 UTC (rev 312319)
@@ -173,10 +173,11 @@
- PHP-FPM SAPI:
. Added xml format to the status page. (fat)
- . Remove timestamp in logs written by children processes. (fat)
+ . Removed timestamp in logs written by children processes. (fat)
. Fixed exit at FPM startup on fpm_resources_prepare() errors. (fat)
. Added master rlimit_files and rlimit_core in the global configuration
settings. (fat)
+ . Removed pid in debug logs written by chrildren processes. (fat)
- Reflection extension:
. Fixed bug #54347 (reflection_extension does not lowercase module function
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c2011-06-19 23:25:45 UTC
(rev 312318)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c2011-06-20 00:03:39 UTC
(rev 312319)
@@ -93,7 +93,11 @@
len = zlog_print_time(&tv, buf, buf_size);
}
if (zlog_level == ZLOG_DEBUG) {
- len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(),
line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);
+ if (!fpm_globals.is_child) {
+ len += snprintf(buf + len, buf_size - len, "%s: pid %d,
%s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function,
line);
+ } else {
+ len += snprintf(buf + len, buf_size - len, "%s: %s(),
line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);
+ }
} else {
len += snprintf(buf + len, buf_size - len, "%s: ",
level_names[flags & ZLOG_LEVEL_MASK]);
}
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c
===
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c2011-06-19 23:25:45 UTC
(rev 312318)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c2011-06-20 00:03:39 UTC
(rev 312319)
@@ -93,7 +93,11 @@
len = zlog_print_time(&tv, buf, buf_size);
}
if (zlog_level == ZLOG_DEBUG) {
- len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(),
line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);
+ if (!fpm_globals.is_child) {
+ len += snprintf(buf + len, buf_size - len, "%s: pid %d,
%s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function,
line);
+ } else {
+ len += snprintf(buf + len, buf_size - len, "%s: %s(),
line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);
+ }
} else {
len += snprintf(buf + len, buf_size - len, "%s: ",
level_names[flags & ZLOG_LEVEL_MASK]);
}
Modified: php/php-src/trunk/sapi/fpm/fpm/zlog.c
===
--- php/php-src/trunk/sapi/fpm/fpm/zlog.c 2011-06-19 23:25:45 UTC (rev
312318)
+++ php/php-src/trunk/sapi/fpm/fpm/zlog.c 2011-06-20 00:03:39 UTC (rev
312319)
@@ -93,7 +93,11 @@
len = zlog_print_time(&tv, buf, buf_size);
}
if (zlog_level == ZLOG_DEBUG) {
- len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(),
line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);
+ if (!fpm_globals.is_child) {
+ len += snprintf(buf + len, buf_size - len, "%s: pid %d,
%s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function,
line);
+ } else {
+ len += snprintf(buf + len, buf_size - len, "%s: %s(),
line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);
+ }
} else {
len += snprintf(buf + len, buf_size - len, "%s: ",
level_names[flags & ZLOG_LEVEL_MASK]);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c
felipe Mon, 20 Jun 2011 01:21:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312320
Log:
- Avoid re-hash here too
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-06-20 00:03:39 UTC
(rev 312319)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-06-20 01:21:47 UTC
(rev 312320)
@@ -633,8 +633,12 @@
zend_llist *fetch_list_ptr;
if (varname->op_type == IS_CONST) {
+ ulong hash = 0;
+
if (Z_TYPE(varname->u.constant) != IS_STRING) {
convert_to_string(&varname->u.constant);
+ } else if (IS_INTERNED(Z_STRVAL(varname->u.constant))) {
+ hash = INTERNED_HASH(Z_STRVAL(varname->u.constant));
}
if (!zend_is_auto_global(varname->u.constant.value.str.val,
varname->u.constant.value.str.len TSRMLS_CC) &&
!(varname->u.constant.value.str.len == (sizeof("this")-1) &&
@@ -642,7 +646,7 @@
(CG(active_op_array)->last == 0 ||
CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode !=
ZEND_BEGIN_SILENCE)) {
result->op_type = IS_CV;
- result->u.op.var = lookup_cv(CG(active_op_array),
varname->u.constant.value.str.val, varname->u.constant.value.str.len, 0
TSRMLS_CC);
+ result->u.op.var = lookup_cv(CG(active_op_array),
varname->u.constant.value.str.val, varname->u.constant.value.str.len, hash
TSRMLS_CC);
varname->u.constant.value.str.val =
CG(active_op_array)->vars[result->u.op.var].name;
result->EA = 0;
return;
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-06-20 00:03:39 UTC (rev
312319)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-06-20 01:21:47 UTC (rev
312320)
@@ -633,8 +633,12 @@
zend_llist *fetch_list_ptr;
if (varname->op_type == IS_CONST) {
+ ulong hash = 0;
+
if (Z_TYPE(varname->u.constant) != IS_STRING) {
convert_to_string(&varname->u.constant);
+ } else if (IS_INTERNED(Z_STRVAL(varname->u.constant))) {
+ hash = INTERNED_HASH(Z_STRVAL(varname->u.constant));
}
if (!zend_is_auto_global(varname->u.constant.value.str.val,
varname->u.constant.value.str.len TSRMLS_CC) &&
!(varname->u.constant.value.str.len == (sizeof("this")-1) &&
@@ -642,7 +646,7 @@
(CG(active_op_array)->last == 0 ||
CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode !=
ZEND_BEGIN_SILENCE)) {
result->op_type = IS_CV;
- result->u.op.var = lookup_cv(CG(active_op_array),
varname->u.constant.value.str.val, varname->u.constant.value.str.len, 0
TSRMLS_CC);
+ result->u.op.var = lookup_cv(CG(active_op_array),
varname->u.constant.value.str.val, varname->u.constant.value.str.len, hash
TSRMLS_CC);
varname->u.constant.value.str.val =
CG(active_op_array)->vars[result->u.op.var].name;
result->EA = 0;
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c
felipe Mon, 20 Jun 2011 01:36:23 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312321
Log:
- Simplify function code
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-06-20 01:21:47 UTC
(rev 312320)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-06-20 01:36:23 UTC
(rev 312321)
@@ -3769,27 +3769,28 @@
/* }}} */
static void zend_traits_compile_exclude_table(HashTable* exclude_table,
zend_trait_precedence **precedences, zend_class_entry *trait) {
- size_t i, j;
- if (precedences) {
- i = 0;
- while (precedences[i]) {
- if (precedences[i]->exclude_from_classes) {
- j = 0;
- while (precedences[i]->exclude_from_classes[j])
{
- if
(precedences[i]->exclude_from_classes[j] == trait) {
- zend_uint lcname_len =
precedences[i]->trait_method->mname_len;
- char* lcname =
zend_str_tolower_dup(precedences[i]->trait_method->method_name,
-
lcname_len);
- if
(zend_hash_add(exclude_table, lcname, lcname_len, NULL, 0, NULL)==FAILURE) {
-
zend_error(E_COMPILE_ERROR, "Failed to evaluate a trait precedence (%s). Method
of trait %s was defined to be excluded multiple times",
precedences[i]->trait_method->method_name, trait->name);
- }
+ size_t i = 0, j;
+
+ if (!precedences) {
+ return;
+ }
+ while (precedences[i]) {
+ if (precedences[i]->exclude_from_classes) {
+ j = 0;
+ while (precedences[i]->exclude_from_classes[j]) {
+ if (precedences[i]->exclude_from_classes[j] ==
trait) {
+ zend_uint lcname_len =
precedences[i]->trait_method->mname_len;
+ char *lcname =
zend_str_tolower_dup(precedences[i]->trait_method->method_name, lcname_len);
+ if (zend_hash_add(exclude_table,
lcname, lcname_len, NULL, 0, NULL) == FAILURE) {
efree(lcname);
+ zend_error(E_COMPILE_ERROR,
"Failed to evaluate a trait precedence (%s). Method of trait %s was defined to
be excluded multiple times", precedences[i]->trait_method->method_name,
trait->name);
}
- j++;
+ efree(lcname);
}
+ ++j;
}
- i++;
}
+ ++i;
}
}
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-06-20 01:21:47 UTC (rev
312320)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-06-20 01:36:23 UTC (rev
312321)
@@ -3769,27 +3769,28 @@
/* }}} */
static void zend_traits_compile_exclude_table(HashTable* exclude_table,
zend_trait_precedence **precedences, zend_class_entry *trait) {
- size_t i, j;
- if (precedences) {
- i = 0;
- while (precedences[i]) {
- if (precedences[i]->exclude_from_classes) {
- j = 0;
- while (precedences[i]->exclude_from_classes[j])
{
- if
(precedences[i]->exclude_from_classes[j] == trait) {
- zend_uint lcname_len =
precedences[i]->trait_method->mname_len;
- char* lcname =
zend_str_tolower_dup(precedences[i]->trait_method->method_name,
-
lcname_len);
- if
(zend_hash_add(exclude_table, lcname, lcname_len, NULL, 0, NULL)==FAILURE) {
-
zend_error(E_COMPILE_ERROR, "Failed to evaluate a trait precedence (%s). Method
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c
felipe Mon, 20 Jun 2011 02:04:13 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312322
Log:
- Optimize property finding by zend_hash_quick_find
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-06-20 01:36:23 UTC (rev 312321)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-06-20 02:04:13 UTC (rev 312322)
@@ -3851,12 +3851,12 @@
free(resulting_table);
}
-static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t current_trait, char* prop_name, int prop_name_length, zend_class_entry *coliding_ce) /* {{{ */
+static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t current_trait, char* prop_name, int prop_name_length, ulong prop_hash, zend_class_entry *coliding_ce) /* {{{ */
{
size_t i;
zend_property_info *coliding_prop;
for (i = 0; (i < current_trait) && (i < ce->num_traits); i++) {
- if (zend_hash_find(&ce->traits[i]->properties_info, prop_name, prop_name_length+1, (void **) &coliding_prop) == SUCCESS) {
+ if (zend_hash_quick_find(&ce->traits[i]->properties_info, prop_name, prop_name_length+1, prop_hash, (void **) &coliding_prop) == SUCCESS) {
return ce->traits[i];
}
}
@@ -3872,6 +3872,7 @@
zval compare_result;
char* prop_name;
int prop_name_length;
+ ulong prop_hash;
char* class_name_unused;
zend_bool prop_found;
zend_bool not_compatible;
@@ -3894,6 +3895,7 @@
/* first get the unmangeld name if necessary,
then check whether the property is already there */
if ((property_info->flags & ZEND_ACC_PPP_MASK) == ZEND_ACC_PUBLIC) {
+prop_hash = property_info->h;
prop_name = property_info->name;
prop_name_length = property_info->name_length;
prop_found = zend_hash_quick_find(&ce->properties_info,
@@ -3904,14 +3906,15 @@
zend_unmangle_property_name(property_info->name, property_info->name_length,
&class_name_unused, &prop_name);
prop_name_length = strlen(prop_name);
-prop_found = zend_hash_find(&ce->properties_info, prop_name, prop_name_length+1, (void **) &coliding_prop) == SUCCESS;
+prop_hash = zend_get_hash_value(prop_name, prop_name_length + 1);
+prop_found = zend_hash_quick_find(&ce->properties_info, prop_name, prop_name_length+1, prop_hash, (void **) &coliding_prop) == SUCCESS;
}
/* next: check for conflicts with current class */
if (prop_found) {
if (coliding_prop->flags & ZEND_ACC_SHADOW) {
/* this one is inherited, lets look it up in its own class */
- zend_hash_find(&coliding_prop->ce->properties_info, prop_name, prop_name_length+1, (void **) &coliding_prop);
+ zend_hash_quick_find(&coliding_prop->ce->properties_info, prop_name, prop_name_length+1, prop_hash, (void **) &coliding_prop);
}
if ((coliding_prop->flags & ZEND_ACC_PPP_MASK) == (property_info->flags & ZEND_ACC_PPP_MASK)) {
/* flags are identical, now the value needs to be checked */
@@ -3921,8 +3924,8 @@
ce->traits[i]->default_static_members_table[property_info->offset] TSRMLS_CC) == FAILURE;
} else {
not_compatible = compare_function(&compare_result,
- ce->default_properties_table[coliding_prop->offset],
- ce->traits[i]->default_properties_table[property_info->offset] TSRMLS_CC) == FAILURE;
+ ce->default_properties_table[coliding_prop->offset],
+ ce->traits[i]->default_properties_table[property_info->offset] TSRMLS_CC) == FAILURE;
}
} else {
/* the flags are not identical, thus, we assume properties are not compatible */
@@ -3932,14 +3935,14 @@
if (not_compatible) {
zend_error(E_COMPILE_ERROR,
"%s and %s define the same property ($%s) in the composition of %s. However, the definition differs and is considered incompatible. Class was composed",
-find_first_definition(ce, i, prop_name, prop_name_length, coliding_prop->ce)->name,
+find_first_definition(ce, i, prop_name, prop_name_length, prop_hash, coliding_prop->ce)->name,
property_info->ce->name,
prop_name,
ce->name);
} else {
zend_error(E_STRICT,
"%s and %s define the same property ($%s) in the composition of %s. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed",
-find_first_definition(ce, i, prop_name, prop_name_length, coliding_prop->ce)->name,
+find_first_definition(ce, i, prop_name, prop_name_length, prop_hash, coliding_prop->ce)->name,
property_info->ce->name,
prop_name,
ce->name);
Modified: php/php-src/trunk/Zend/zend_compile.c
===
