cvs: php-src /ext/phar phar_object.c shortarc.php stub.h /ext/phar/tests 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt
015b.phpt 016.phpt 016b.phpt 017.phpt 018.phpt 019.phpt 019b.phpt 019c.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt
028.phpt 029.phpt 030.phpt 033.phpt 033a.phpt badparameters.phpt delete.phpt delete_in_phar.phpt delete_in_phar_b.phpt delete_in_phar_confirm.phpt
dir.phpt fgc_edgecases.phpt fopen_edgecases2.phpt frontcontroller10.phpt frontcontroller11.phpt frontcontroller12.phpt frontcontroller13.phpt
frontcontroller15.phpt frontcontroller16.phpt frontcontroller2.phpt frontcontroller21.phpt frontcontroller22.phpt frontcontroller23.phpt
frontcontroller24.phpt frontcontroller25.phpt frontcontroller26.phpt frontcontroller27.phpt frontcontroller28.phpt frontcontroller29.phpt
frontcontroller3.phpt frontcontroller30.phpt frontcontroller31.phpt frontcontroller32.phpt frontcontroller33.phpt frontcon! troller34.phpt
frontcontroller6.phpt frontcontroller8.phpt frontcontroller9.phpt include_path.phpt ini_set.phpt ini_set_off.phpt invalid_alias.phpt
invalid_setstubalias.phpt metadata_read.phpt metadata_write.phpt metadata_write_commit.phpt mkdir.phpt mounteddir.phpt open_for_write_existing.phpt
open_for_write_existing_b.phpt open_for_write_existing_c.phpt open_for_write_newfile.phpt open_for_write_newfile_b.phpt open_for_write_newfile_c.phpt
opendir.phpt opendir_edgecases.phpt phar_begin_setstub_commit.phpt phar_buildfromdirectory1.phpt phar_buildfromdirectory2.phpt
phar_buildfromdirectory3.phpt phar_buildfromiterator1.phpt phar_buildfromiterator3.phpt phar_buildfromiterator5.phpt phar_buildfromiterator6.phpt
phar_buildfromiterator7.phpt phar_bz2.phpt phar_commitwrite.phpt phar_convert_again.phpt phar_convert_repeated.phpt phar_convert_tar.phpt
phar_convert_tar2.phpt phar_convert_tar3.phpt phar_convert_zip.phpt phar_create_in_cwd.phpt phar_createdefaultstub.phpt phar_ctx_00! 1.phpt
phar_decompress.phpt phar_dotted_path.phpt phar_extract.phpt phar_gzip.phpt phar_isvalidpharfilename.phpt phar_metadata_read.phpt
phar_metadata_write.phpt phar_offset_check.phpt phar_oo_001.phpt phar_oo_compressallbz2.phpt phar_oo_compressallgz.phpt phar_oo_compressed_001.phpt
phar_oo_compressed_001b.phpt phar_oo_comp

sfox Mon May 19 19:05:44 2008 UTC Modified files: /php-src/ext/phar phar_object.c shortarc.php stub.h /php-src/ext/phar/tests 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 015b.phpt 016.phpt 016b.phpt 017.phpt 018.phpt 019.phpt 019b.phpt 019c.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt 033.phpt 033a.phpt badparameters.phpt delete.phpt delete_in_phar.phpt delete_in_phar_b.phpt delete_in_phar_confirm.phpt dir.phpt fgc_edgecases.phpt fopen_edgecases2.phpt frontcontroller10.phpt frontcontroller11.phpt frontcontroller12.phpt frontcontroller13.phpt frontcontroller15.phpt frontcontroller16.phpt frontcontroller2.phpt frontcontroller21.phpt frontcontroller22.phpt frontcontroller23.phpt frontcontroller24.phpt frontcontroller25.phpt frontcontroller26.phpt frontcontroller27.phpt frontcontroller28.phpt frontcontroller29.phpt frontcontroller3.phpt frontcontroller30.phpt frontcontroller31.phpt frontcontroller32.phpt frontcontroller33.phpt frontcontroller34.phpt frontcontroller6.phpt frontcontroller8.phpt frontcontroller9.phpt include_path.phpt ini_set.phpt ini_set_off.phpt invalid_alias.phpt invalid_setstubalias.phpt metadata_read.phpt metadata_write.phpt metadata_write_commit.phpt mkdir.phpt mounteddir.phpt open_for_write_existing.phpt open_for_write_existing_b.phpt open_for_write_existing_c.phpt open_for_write_newfile.phpt open_for_write_newfile_b.phpt open_for_write_newfile_c.phpt opendir.phpt opendir_edgecases.phpt phar_begin_setstub_commit.phpt phar_buildfromdirectory1.phpt phar_buildfromdirectory2.phpt phar_buildfromdirectory3.phpt phar_buildfromiterator1.phpt phar_buildfromiterator3.phpt phar_buildfromiterator5.phpt phar_buildfromiterator6.phpt phar_buildfromiterator7.phpt phar_bz2.phpt phar_commitwrite.phpt phar_convert_again.phpt phar_convert_repeated.phpt phar_convert_tar.phpt phar_convert_tar2.phpt phar_convert_tar3.phpt phar_convert_zip.phpt phar_create_in_cwd.phpt phar_createdefaultstub.phpt phar_ctx_001.phpt phar_decompress.phpt phar_dotted_path.phpt phar_extract.phpt phar_gzip.phpt phar_isvalidpharfilename.phpt phar_metadata_read.phpt phar_metadata_write.phpt phar_offset_check.phpt phar_oo_001.phpt phar_oo_compressallbz2.phpt phar_oo_compressallgz.phpt phar_oo_compressed_001.phpt phar_oo_compressed_001b.phpt phar_oo_compressed_002.phpt phar_oo_compressed_002b.phpt phar_oo_getmodified.phpt phar_oo_iswriteable.phpt phar_oo_uncompressall.phpt phar_setalias.phpt phar_setalias2.phpt phar_setdefaultstub.phpt phar_stub.phpt phar_stub_error.phpt phar_stub_write.phpt phar_stub_write_file.phpt phar_unlinkarchive.phpt pharfileinfo_construct.phpt pharfileinfo_getcrc32.phpt readfile_edgecases.phpt refcount1.phpt rename.phpt withphar_web.phpt /php-src/ext/phar/tests/files nophar.phar phar_oo_test.inc phar_test.inc /php-src/ext/phar/tests/tar all.phpt frontcontroller10.phar.phpt frontcontroller11.phar.phpt frontcontroller12.phar.phpt frontcontroller13.phar.phpt frontcontroller15.phar.phpt frontcontroller16.phar.phpt frontcontroller2.phar.phpt frontcontroller21.phar.phpt frontcontroller3.phar.phpt frontcontroller9.phar.phpt open_for_write_existing.phpt open_for_write_existing_b.phpt open_for_write_existing_c.phpt open_for_write_newfile.phpt open_for_write_newfile_b.phpt open_for_write_newfile_c.phpt phar_begin_setstub_commit.phpt phar_buildfromiterator5.phpt phar_buildfromiterator6.phpt phar_buildfromiterator7.phpt phar_convert_phar.phpt phar_convert_phar2.phpt phar_convert_phar3.phpt phar_stub.phpt phar_stub_error.phpt refcount1.phpt tar_003.phpt tar_004.phpt tar_bz2.phpt tar_gzip.phpt /php-src/ext/phar/tests/tar/files make_invalid_tar.php.inc tarmaker.php.inc /php-src/ext/phar/tests/zip all.phpt frontcontroller10.phar.phpt frontcontroller11.phar.phpt frontcontroller12.phar.phpt frontcontroller13.phar.phpt frontcontroller15.phar.phpt frontcontroller16.phar.phpt frontcontroller2.phar.phpt frontcontroller21.phar.phpt frontcontroller3.phar.phpt frontcontroller9.phar.phpt metadata_write_commit.phpt open_for_write_existing.phpt open_for_write_existing_b.phpt open_for_write_existing_c.phpt open_for_write_newfile.phpt open_for_write_newfile_b.phpt open_for_write_newfile_c.phpt phar_begin_setstub_commit.phpt phar_buildfromiterator5.phpt phar_buildfromiterator6.phpt phar_buildfromiterator7.phpt phar_convert_phar.phpt Log: - IS_UNICODE checks and conversions - stub and creation file updates - far too many test updates to think about

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.273&r2=1.274&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.273 php-src/ext/phar/phar_object.c:1.274 --- php-src/ext/phar/phar_object.c:1.273 Sun May 18 23:41:17 2008 +++ php-src/ext/phar/phar_object.c Mon May 19 19:05:41 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar_object.c,v 1.273 2008/05/18 23:41:17 cellog Exp $ */ +/* $Id: phar_object.c,v 1.274 2008/05/19 19:05:41 sfox Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -635,7 +635,12 @@ return; } switch (Z_TYPE_P(retval_ptr)) { - case IS_STRING : +#if PHP_VERSION_ID >= 60000 + case IS_UNICODE: + zval_unicode_to_string(retval_ptr TSRMLS_CC); + /* break intentionally omitted */ +#endif + case IS_STRING: efree(entry); if (fci.retval_ptr_ptr != &retval_ptr) { entry = estrndup(Z_STRVAL_PP(fci.retval_ptr_ptr), Z_STRLEN_PP(fci.retval_ptr_ptr)); @@ -831,7 +836,12 @@ RETURN_FALSE; } break; - case IS_STRING : +#if PHP_VERSION_ID >= 60000 + case IS_UNICODE: + zval_unicode_to_string(*(val) TSRMLS_CC); + /* break intentionally omitted */ +#endif + case IS_STRING: PHAR_SET_USER_MIME(PHAR_MIME_OTHER) break; default : @@ -884,10 +894,18 @@ zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "unable to retrieve array value in Phar::mungServer()"); return; } + +#if PHP_VERSION_ID >= 60000 + if (Z_TYPE_PP(data) == IS_UNICODE) { + zval_unicode_to_string(*(data) TSRMLS_CC); + } +#endif + if (Z_TYPE_PP(data) != IS_STRING) { zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME"); return; } + if (!php_self && Z_STRLEN_PP(data) == sizeof("PHP_SELF")-1 && !strncmp(Z_STRVAL_PP(data), "PHP_SELF", sizeof("PHP_SELF")-1)) { if (SUCCESS != zend_hash_add_empty_element(&(PHAR_GLOBALS->phar_SERVER_mung_list), "PHP_SELF", sizeof("PHP_SELF")-1)) { zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "Unable to add PHP_SELF to Phar::mungServer() list of values to mung"); @@ -1340,16 +1358,21 @@ } if (!value) { /* failure in get_current_data */ - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned no value", ce->name); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned no value", ce->name); return ZEND_HASH_APPLY_STOP; } switch (Z_TYPE_PP(value)) { - case IS_STRING : +#if PHP_VERSION_ID >= 60000 + case IS_UNICODE: + zval_unicode_to_string(*(value) TSRMLS_CC); + /* break intentionally omitted */ +#endif + case IS_STRING: break; - case IS_RESOURCE : + case IS_RESOURCE: php_stream_from_zval_no_verify(fp, value); if (!fp) { - zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Iterator %s returned an invalid stream handle", ce->name); + zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Iterator %v returned an invalid stream handle", ce->name); return ZEND_HASH_APPLY_STOP; } if (iter->funcs->get_current_key) { @@ -1359,29 +1382,28 @@ return ZEND_HASH_APPLY_STOP; } - PHAR_STR(key, str_key); - if (key_type == HASH_KEY_IS_LONG) { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned an invalid key (must return a string)", ce->name); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned an invalid key (must return a string)", ce->name); return ZEND_HASH_APPLY_STOP; } + PHAR_STR(key, str_key); save = str_key; if (str_key[str_key_len - 1] == '\0') str_key_len--; } else { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned an invalid key (must return a string)", ce->name); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned an invalid key (must return a string)", ce->name); return ZEND_HASH_APPLY_STOP; } close_fp = 0; opened = (char *) estrndup(str, sizeof("[stream]") + 1); goto after_open_fp; - case IS_OBJECT : + case IS_OBJECT: if (instanceof_function(Z_OBJCE_PP(value), spl_ce_SplFileInfo TSRMLS_CC)) { char *test = NULL; zval dummy; spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(*value TSRMLS_CC); if (!base_len) { - zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Iterator %s returns an SplFileInfo object, so base directory must be specified", ce->name); + zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Iterator %v returns an SplFileInfo object, so base directory must be specified", ce->name); return ZEND_HASH_APPLY_STOP; } switch (intern->type) { @@ -1411,7 +1433,11 @@ goto phar_spl_fileinfo; case SPL_FS_INFO: case SPL_FS_FILE: +#if PHP_VERSION_ID >= 60000 fname = expand_filepath(intern->file_name.s, NULL TSRMLS_CC); +#else + fname = expand_filepath(intern->file_name, NULL TSRMLS_CC); +#endif fname_len = strlen(fname); save = fname; is_splfileinfo = 1; @@ -1420,7 +1446,7 @@ } /* fall-through */ default : - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned an invalid value (must return a string)", ce->name); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned an invalid value (must return a string)", ce->name); return ZEND_HASH_APPLY_STOP; } @@ -1447,7 +1473,7 @@ str_key_len--; } } else { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned a path \"%s\" that is not in the base directory \"%s\"", ce->name, fname, base); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned a path \"%s\" that is not in the base directory \"%s\"", ce->name, fname, base); if (save) { efree(save); efree(temp); @@ -1462,22 +1488,21 @@ return ZEND_HASH_APPLY_STOP; } - PHAR_STR(key, str_key); - if (key_type == HASH_KEY_IS_LONG) { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned an invalid key (must return a string)", ce->name); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned an invalid key (must return a string)", ce->name); return ZEND_HASH_APPLY_STOP; } + PHAR_STR(key, str_key); save = str_key; if (str_key[str_key_len - 1] == '\0') str_key_len--; } else { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned an invalid key (must return a string)", ce->name); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned an invalid key (must return a string)", ce->name); return ZEND_HASH_APPLY_STOP; } } #if PHP_MAJOR_VERSION < 6 if (PG(safe_mode) && (!php_checkuid(fname, NULL, CHECKUID_ALLOW_ONLY_FILE))) { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned a path \"%s\" that safe mode prevents opening", ce->name, fname); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned a path \"%s\" that safe mode prevents opening", ce->name, fname); if (save) { efree(save); } @@ -1489,7 +1514,7 @@ #endif if (php_check_open_basedir(fname TSRMLS_CC)) { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned a path \"%s\" that open_basedir prevents opening", ce->name, fname); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned a path \"%s\" that open_basedir prevents opening", ce->name, fname); if (save) { efree(save); } @@ -1502,7 +1527,7 @@ /* try to open source file, then create internal phar file and copy contents */ fp = php_stream_open_wrapper(fname, "rb", STREAM_MUST_SEEK|0, &opened); if (!fp) { - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %s returned a file that could not be opened \"%s\"", ce->name, fname); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Iterator %v returned a file that could not be opened \"%s\"", ce->name, fname); if (save) { efree(save); } @@ -3789,6 +3814,11 @@ switch (Z_TYPE_P(zval_files)) { case IS_NULL: goto all_files; +#if PHP_VERSION_ID >= 60000 + case IS_UNICODE: + zval_unicode_to_string(zval_files TSRMLS_CC); + /* break intentionally omitted */ +#endif case IS_STRING: filename = Z_STRVAL_P(zval_files); filename_len = Z_STRLEN_P(zval_files); @@ -3802,6 +3832,11 @@ zval **zval_file; if (zend_hash_index_find(Z_ARRVAL_P(zval_files), i, (void **) &zval_file) == SUCCESS) { switch (Z_TYPE_PP(zval_file)) { +#if PHP_VERSION_ID >= 60000 + case IS_UNICODE: + zval_unicode_to_string(*(zval_file) TSRMLS_CC); + /* break intentionally omitted */ +#endif case IS_STRING: break; default: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/shortarc.php?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/phar/shortarc.php diff -u php-src/ext/phar/shortarc.php:1.13 php-src/ext/phar/shortarc.php:1.14 --- php-src/ext/phar/shortarc.php:1.13 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/shortarc.php Mon May 19 19:05:41 2008 @@ -114,15 +114,15 @@ { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); - $L = unpack('V', $a = fread($fp, 4)); - $m = ''; + $L = unpack('V', $a = (binary)fread($fp, 4)); + $m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } - $last = fread($fp, $read); + $last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stub.h?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/phar/stub.h diff -u php-src/ext/phar/stub.h:1.14 php-src/ext/phar/stub.h:1.15 --- php-src/ext/phar/stub.h:1.14 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/stub.h Mon May 19 19:05:41 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: stub.h,v 1.14 2008/05/14 21:27:31 sfox Exp $ */ +/* $Id: stub.h,v 1.15 2008/05/19 19:05:41 sfox Exp $ */ static inline void phar_get_stub(const char *index_php, const char *web, size_t *len, char **stub, const int name_len, const int web_len TSRMLS_DC) { @@ -24,10 +24,11 @@ static const char newstub1_0[] = "';\n\nif (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {\nPhar::interceptFileFuncs();\nset_include_path('phar://' . __FILE__ . PATH_SEPARATOR . get_include_path());\nPhar::webPhar(null, $web);\ninclude 'phar://' . __FILE__ . '/' . Extract_Phar::START;\nreturn;\n}\n\nif (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {\nExtract_Phar::go(true);\n$mimes = array(\n'phps' => 2,\n'c' => 'text/plain',\n'cc' => 'text/plain',\n'cpp' => 'text/plain',\n'c++' => 'text/plain',\n'dtd' => 'text/plain',\n'h' => 'text/plain',\n'log' => 'text/plain',\n'rng' => 'text/plain',\n'txt' => 'text/plain',\n'xsd' => 'text/plain',\n'php' => 1,\n'inc' => 1,\n'avi' => 'video/avi',\n'bmp' => 'image/bmp',\n'css' => 'text/css',\n'gif' => 'image/gif',\n'htm' => 'text/html',\n'html' => 'text/html',\n'htmls' => 'text/html',\n'ico' => 'image/x-ico',! \n'jpe' => 'image/jpeg',\n'jpg' => 'image/jpeg',\n'jpeg' => 'image/jpeg',\n'js' => 'application/x-javascript',\n'midi' => 'audio/midi',\n'mid' => 'audio/midi',\n'mod' => 'audio/mod',\n'mov' => 'movie/quicktime',\n'mp3' => 'audio/mp3',\n'mpg' => 'video/mpeg',\n'mpeg' => 'video/mpeg',\n'pdf' => 'application/pdf',\n'png' => 'image/png',\n'swf' => 'application/shockwave-flash',\n'tif' => 'image/tiff',\n'tiff' => 'image/tiff',\n'wav' => 'audio/wav',\n'xbm' => 'image/xbm',\n'xml' => 'text/xml',\n);\n\nheader(\"Cache-Control: no-cache, must-revalidate\");\nheader(\"Pragma: no-cache\");\n\n$basename = basename(__FILE__);\nif (!strpos($_SERVER['REQUEST_URI'], $basename)) {\nchdir(Extract_Phar::$temp);\ninclude $web;\nreturn;\n}\n$pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));\nif (!$pt || $pt == '/') {\n$pt = $web;\nheader('HTTP/1.1 301 Moved Permanently');\nheader('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);\nexit;\n}\n! $a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);\nif (! $a || strlen(dirname($a)) < strlen("; static const char newstub1_1[] = "Extract_Phar::$temp)) {\nheader('HTTP/1.0 404 Not Found');\necho \"<html>\\n <head>\\n <title>File Not Found<title>\\n </head>\\n <body>\\n <h1>404 - File \", $pt, \" Not Found</h1>\\n </body>\\n</html>\";\nexit;\n}\n$b = pathinfo($a);\nif (!isset($b['extension'])) {\nheader('Content-Type: text/plain');\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\nif (isset($mimes[$b['extension']])) {\nif ($mimes[$b['extension']] === 1) {\ninclude $a;\nexit;\n}\nif ($mimes[$b['extension']] === 2) {\nhighlight_file($a);\nexit;\n}\nheader('Content-Type: ' .$mimes[$b['extension']]);\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\n}\n\nclass Extract_Phar\n{\nstatic $temp;\nstatic $origdir;\nconst GZ = 0x1000;\nconst BZ2 = 0x2000;\nconst MASK = 0x3000;\nconst START = '"; static const char newstub2[] = "';\nconst LEN = "; - static const char newstub3_0[] = ";\n\nstatic function go($return = false)\n{\n$fp = fopen(__FILE__, 'rb');\nfseek($fp, self::LEN);\n$L = unpack('V', $a = fread($fp, 4));\n$m = '';\n\ndo {\n$read = 8192;\nif ($L[1] - strlen($m) < 8192) {\n$read = $L[1] - strlen($m);\n}\n$last = fread($fp, $read);\n$m .= $last;\n} while (strlen($last) && strlen($m) < $L[1]);\n\nif (strlen($m) < $L[1]) {\ndie('ERROR: manifest length read was \"' .\nstrlen($m) .'\" should be \"' .\n$L[1] . '\"');\n}\n\n$info = self::_unpack($m);\n$f = $info['c'];\n\nif ($f & self::GZ) {\nif (!function_exists('gzinflate')) {\ndie('Error: zlib extension is not enabled -' .\n' gzinflate() function needed for zlib-compressed .phars');\n}\n}\n\nif ($f & self::BZ2) {\nif (!function_exists('bzdecompress')) {\ndie('Error: bzip2 extension is not enabled -' .\n' bzdecompress() function needed for bz2-compressed .phars');\n}\n}\n\n$temp = self::tmpdir();\n\nif (!$temp || !is_writable($temp)) {\n$sessionpath = session_sa! ve_path();\nif (strpos ($sessionpath, \";\") !== false)\n$sessionpath = substr ($sessionpath, strpos ($sessionpath, \";\")+1);\nif (!file_exists($sessionpath) || !is_dir($sessionpath)) {\ndie('Could not locate temporary directory to extract phar');\n}\n$temp = $sessionpath;\n}\n\n$temp .= '/pharextract/'.basename(__FILE__, '.phar');\nself::$temp = $temp;\nself::$origdir = getcwd();\n@mkdir($temp, 0777, true);\n$temp = realpath($temp);\n\nif (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {\nself::_removeTmpFiles($temp, getcwd());\n@mkdir($temp, 0777, true);\n@file_put_contents($temp . '/' . md5_file(__FILE__), '');\n\nforeach ($info['m'] as $path => $file) {\n$a = !file_exists(dirname($temp . '/' . $path));\n@mkdir(dirname($temp . '/' . $path), 0777, true);\nclearstatcache();\n\nif ($path[strlen($path) - 1] == '/') {\n@mkdir($temp . '/' . $path, 0777);\n} else {\nfile_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp));\n@chmod($temp . '! /' . $path, 0666);\n}\n}\n}\n\nchdir($temp);\n\nif (!$return) {\ninclu de self::START;\n}\n}\n\nstatic fun"; - static const char newstub3_1[] = "ction tmpdir()\n{\nif (strpos(PHP_OS, 'WIN') !== false) {\nif ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {\nreturn $var;\n}\nif (is_dir('/temp') || mkdir('/temp')) {\nreturn realpath('/temp');\n}\nreturn false;\n}\nif ($var = getenv('TMPDIR')) {\nreturn $var;\n}\nreturn realpath('/tmp');\n}\n\nstatic function _unpack($m)\n{\n$info = unpack('V', substr($m, 0, 4));\n $l = unpack('V', substr($m, 10, 4));\n$m = substr($m, 14 + $l[1]);\n$s = unpack('V', substr($m, 0, 4));\n$o = 0;\n$start = 4 + $s[1];\n$ret['c'] = 0;\n\nfor ($i = 0; $i < $info[1]; $i++) {\n $len = unpack('V', substr($m, $start, 4));\n$start += 4;\n $savepath = substr($m, $start, $len[1]);\n$start += $len[1];\n $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));\n$ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]\n& 0xffffffff);\n$ret['m'][$savepath][7] = $o;\n$o += $ret['m'][$savepath][2];\n$start += 24 + $ret['m! '][$savepath][5];\n$ret['c'] |= $ret['m'][$savepath][4] & self::MASK;\n}\nreturn $ret;\n}\n\nstatic function extractFile($path, $entry, $fp)\n{\n$data = '';\n$c = $entry[2];\n\nwhile ($c) {\nif ($c < 8192) {\n$data .= @fread($fp, $c);\n$c = 0;\n} else {\n$c -= 8192;\n$data .= @fread($fp, 8192);\n}\n}\n\nif ($entry[4] & self::GZ) {\n$data = gzinflate($data);\n} elseif ($entry[4] & self::BZ2) {\n$data = bzdecompress($data);\n}\n\nif (strlen($data) != $entry[0]) {\ndie(\"Invalid internal .phar file (size error \" . strlen($data) . \" != \" .\n$stat[7] . \")\");\n}\n\nif ($entry[3] != sprintf(\"%u\", crc32((binary)$data) & 0xffffffff)) {\ndie(\"Invalid internal .phar file (checksum error)\");\n}\n\nreturn $data;\n}\n\nstatic function _removeTmpFiles($temp, $origdir)\n{\nchdir($temp);\n\nforeach (glob('*') as $f) {\nif (file_exists($f)) {\nis_dir($f) ? @rmdir($f) : @unlink($f);\nif (file_exists($f) && is_dir($f)) {\nself::_removeTmpFiles($f, getcwd());\n}\n}\n}\n\n@rmdir($temp);! \nclearstatcache();\nchdir($origdir);\n}\n}\n\nExtract_Phar::go();\n__ HALT_COMPILER(); ?>"; + static const char newstub3_0[] = ";\n\nstatic function go($return = false)\n{\n$fp = fopen(__FILE__, 'rb');\nfseek($fp, self::LEN);\n$L = unpack('V', $a = (binary)fread($fp, 4));\n$m = (binary)'';\n\ndo {\n$read = 8192;\nif ($L[1] - strlen($m) < 8192) {\n$read = $L[1] - strlen($m);\n}\n$last = (binary)fread($fp, $read);\n$m .= $last;\n} while (strlen($last) && strlen($m) < $L[1]);\n\nif (strlen($m) < $L[1]) {\ndie('ERROR: manifest length read was \"' .\nstrlen($m) .'\" should be \"' .\n$L[1] . '\"');\n}\n\n$info = self::_unpack($m);\n$f = $info['c'];\n\nif ($f & self::GZ) {\nif (!function_exists('gzinflate')) {\ndie('Error: zlib extension is not enabled -' .\n' gzinflate() function needed for zlib-compressed .phars');\n}\n}\n\nif ($f & self::BZ2) {\nif (!function_exists('bzdecompress')) {\ndie('Error: bzip2 extension is not enabled -' .\n' bzdecompress() function needed for bz2-compressed .phars');\n}\n}\n\n$temp = self::tmpdir();\n\nif (!$temp || !is_writable($temp)) {\n$! sessionpath = session_save_path();\nif (strpos ($sessionpath, \";\") !== false)\n$sessionpath = substr ($sessionpath, strpos ($sessionpath, \";\")+1);\nif (!file_exists($sessionpath) || !is_dir($sessionpath)) {\ndie('Could not locate temporary directory to extract phar');\n}\n$temp = $sessionpath;\n}\n\n$temp .= '/pharextract/'.basename(__FILE__, '.phar');\nself::$temp = $temp;\nself::$origdir = getcwd();\n@mkdir($temp, 0777, true);\n$temp = realpath($temp);\n\nif (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {\nself::_removeTmpFiles($temp, getcwd());\n@mkdir($temp, 0777, true);\n@file_put_contents($temp . '/' . md5_file(__FILE__), '');\n\nforeach ($info['m'] as $path => $file) {\n$a = !file_exists(dirname($temp . '/' . $path));\n@mkdir(dirname($temp . '/' . $path), 0777, true);\nclearstatcache();\n\nif ($path[strlen($path) - 1] == '/') {\n@mkdir($temp . '/' . $path, 0777);\n} else {\nfile_put_contents($temp . '/' . $path, self::extractFile($path, $file, ! $fp));\n@chmod($temp . '/' . $path, 0666);\n}\n}\n}\n\nchdir($temp);\n \nif (!$return) {\ninclude self::ST"; + static const char newstub3_1[] = "ART;\n}\n}\n\nstatic function tmpdir()\n{\nif (strpos(PHP_OS, 'WIN') !== false) {\nif ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {\nreturn $var;\n}\nif (is_dir('/temp') || mkdir('/temp')) {\nreturn realpath('/temp');\n}\nreturn false;\n}\nif ($var = getenv('TMPDIR')) {\nreturn $var;\n}\nreturn realpath('/tmp');\n}\n\nstatic function _unpack($m)\n{\n$info = unpack('V', substr($m, 0, 4));\n $l = unpack('V', substr($m, 10, 4));\n$m = substr($m, 14 + $l[1]);\n$s = unpack('V', substr($m, 0, 4));\n$o = 0;\n$start = 4 + $s[1];\n$ret['c'] = 0;\n\nfor ($i = 0; $i < $info[1]; $i++) {\n $len = unpack('V', substr($m, $start, 4));\n$start += 4;\n $savepath = substr($m, $start, $len[1]);\n$start += $len[1];\n $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));\n$ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]\n& 0xffffffff);\n$ret['m'][$savepath][7] = $o;\n$o += $ret['m'][$savepath][2];! \n$start += 24 + $ret['m'][$savepath][5];\n$ret['c'] |= $ret['m'][$savepath][4] & self::MASK;\n}\nreturn $ret;\n}\n\nstatic function extractFile($path, $entry, $fp)\n{\n$data = '';\n$c = $entry[2];\n\nwhile ($c) {\nif ($c < 8192) {\n$data .= @fread($fp, $c);\n$c = 0;\n} else {\n$c -= 8192;\n$data .= @fread($fp, 8192);\n}\n}\n\nif ($entry[4] & self::GZ) {\n$data = gzinflate($data);\n} elseif ($entry[4] & self::BZ2) {\n$data = bzdecompress($data);\n}\n\nif (strlen($data) != $entry[0]) {\ndie(\"Invalid internal .phar file (size error \" . strlen($data) . \" != \" .\n$stat[7] . \")\");\n}\n\nif ($entry[3] != sprintf(\"%u\", crc32((binary)$data) & 0xffffffff)) {\ndie(\"Invalid internal .phar file (checksum error)\");\n}\n\nreturn $data;\n}\n\nstatic function _removeTmpFiles($temp, $origdir)\n{\nchdir($temp);\n\nforeach (glob('*') as $f) {\nif (file_exists($f)) {\nis_dir($f) ? @rmdir($f) : @unlink($f);\nif (file_exists($f) && is_dir($f)) {\nself::_removeTmpFiles($f, getcwd());\n}! \n}\n}\n\n@rmdir($temp);\nclearstatcache();\nchdir($origdir);\n}\n}\n\ nExtract_Phar::go();\n__HALT_COMPIL"; + static const char newstub3_2[] = "ER(); ?>"; - static const int newstub_len = 6641; + static const int newstub_len = 6665; - *len = spprintf(stub, name_len + web_len + newstub_len, "%s%s%s%s%s%s%d%s%s", newstub0, web, newstub1_0, newstub1_1, index_php, newstub2, name_len + web_len + newstub_len, newstub3_0, newstub3_1); + *len = spprintf(stub, name_len + web_len + newstub_len, "%s%s%s%s%s%s%d%s%s%s", newstub0, web, newstub1_0, newstub1_1, index_php, newstub2, name_len + web_len + newstub_len, newstub3_0, newstub3_1, newstub3_2); } http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/008.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/008.phpt diff -u php-src/ext/phar/tests/008.phpt:1.11 php-src/ext/phar/tests/008.phpt:1.12 --- php-src/ext/phar/tests/008.phpt:1.11 Fri Jan 4 16:26:42 2008 +++ php-src/ext/phar/tests/008.phpt Mon May 19 19:05:42 2008 @@ -4,10 +4,10 @@ <?php if (!extension_loaded("phar")) die("skip");?> --FILE-- <?php -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; -$file .= pack('V', 500) . 'notenough'; +$file .= pack('V', 500) . (binary)'notenough'; file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/009.phpt?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/phar/tests/009.phpt diff -u php-src/ext/phar/tests/009.phpt:1.12 php-src/ext/phar/tests/009.phpt:1.13 --- php-src/ext/phar/tests/009.phpt:1.12 Fri Jan 4 16:26:42 2008 +++ php-src/ext/phar/tests/009.phpt Mon May 19 19:05:42 2008 @@ -6,10 +6,10 @@ phar.require_hash=0 --FILE-- <?php -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; -$file .= pack('VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . str_repeat('A', 500); +$file .= pack('VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . (binary)str_repeat('A', 500); file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/010.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/phar/tests/010.phpt diff -u php-src/ext/phar/tests/010.phpt:1.13 php-src/ext/phar/tests/010.phpt:1.14 --- php-src/ext/phar/tests/010.phpt:1.13 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/010.phpt Mon May 19 19:05:42 2008 @@ -6,14 +6,14 @@ phar.require_hash=0 --FILE-- <?php -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; // this fails because the manifest length does not include the other 10 byte manifest data -$manifest = pack('V', 1) . 'a' . pack('VVVVVV', 0, time(), 0, crc32((binary)''), 0x00000000, 0); -$file .= pack('VVnVV', strlen($manifest), 1, 0x1000, 0x00000000, 3) . 'hio' . pack('V', 0) . $manifest; +$manifest = pack('V', 1) . (binary)'a' . pack('VVVVVV', 0, time(), 0, crc32((binary)''), 0x00000000, 0); +$file .= pack('VVnVV', strlen($manifest), 1, 0x1000, 0x00000000, 3) . (binary)'hio' . pack('V', 0) . (binary)$manifest; file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/011.phpt?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/phar/tests/011.phpt diff -u php-src/ext/phar/tests/011.phpt:1.14 php-src/ext/phar/tests/011.phpt:1.15 --- php-src/ext/phar/tests/011.phpt:1.14 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/011.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/012.phpt?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/phar/tests/012.phpt diff -u php-src/ext/phar/tests/012.phpt:1.12 php-src/ext/phar/tests/012.phpt:1.13 --- php-src/ext/phar/tests/012.phpt:1.12 Mon Mar 3 08:41:14 2008 +++ php-src/ext/phar/tests/012.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/013.phpt?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/phar/tests/013.phpt diff -u php-src/ext/phar/tests/013.phpt:1.16 php-src/ext/phar/tests/013.phpt:1.17 --- php-src/ext/phar/tests/013.phpt:1.16 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/013.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; // filesize should be 1, and is 2 $files = array(); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/014.phpt?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/phar/tests/014.phpt diff -u php-src/ext/phar/tests/014.phpt:1.14 php-src/ext/phar/tests/014.phpt:1.15 --- php-src/ext/phar/tests/014.phpt:1.14 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/014.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; // wrong crc32 $files = array(); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/015.phpt?r1=1.15&r2=1.16&diff_format=u Index: php-src/ext/phar/tests/015.phpt diff -u php-src/ext/phar/tests/015.phpt:1.15 php-src/ext/phar/tests/015.phpt:1.16 --- php-src/ext/phar/tests/015.phpt:1.15 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/015.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a'] = array('cont'=>'a','comp'=>chr(75) . chr(4) . chr(0) /* 'a' gzdeflated */, 'flags'=>0x00001000); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/015b.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/phar/tests/015b.phpt diff -u php-src/ext/phar/tests/015b.phpt:1.9 php-src/ext/phar/tests/015b.phpt:1.10 --- php-src/ext/phar/tests/015b.phpt:1.9 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/015b.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a'] = array('cont'=>'Hello World', 'comp'=>pack('H*', '425a6834314159265359065c89da0000009780400000400080060490002000310c082031a916c41d41e2ee48a70a1200cb913b40'),'flags'=>0x00002000); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/016.phpt?r1=1.20&r2=1.21&diff_format=u Index: php-src/ext/phar/tests/016.phpt diff -u php-src/ext/phar/tests/016.phpt:1.20 php-src/ext/phar/tests/016.phpt:1.21 --- php-src/ext/phar/tests/016.phpt:1.20 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/016.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; // file length is too short $files = array(); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/016b.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/016b.phpt diff -u php-src/ext/phar/tests/016b.phpt:1.11 php-src/ext/phar/tests/016b.phpt:1.12 --- php-src/ext/phar/tests/016b.phpt:1.11 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/016b.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; // file length is too short $files = array(); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/017.phpt?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/phar/tests/017.phpt diff -u php-src/ext/phar/tests/017.phpt:1.14 php-src/ext/phar/tests/017.phpt:1.15 --- php-src/ext/phar/tests/017.phpt:1.14 Mon Apr 14 15:58:11 2008 +++ php-src/ext/phar/tests/017.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/018.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/phar/tests/018.phpt diff -u php-src/ext/phar/tests/018.phpt:1.13 php-src/ext/phar/tests/018.phpt:1.14 --- php-src/ext/phar/tests/018.phpt:1.13 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/018.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; @@ -19,10 +19,12 @@ include $fname; $dir = opendir('phar://hio/'); + while (false !== ($a = readdir($dir))) { var_dump($a); var_dump(is_dir('phar://hio/' . $a)); } + ?> --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/019.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/019.phpt diff -u php-src/ext/phar/tests/019.phpt:1.10 php-src/ext/phar/tests/019.phpt:1.11 --- php-src/ext/phar/tests/019.phpt:1.10 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/019.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/019b.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/019b.phpt diff -u php-src/ext/phar/tests/019b.phpt:1.7 php-src/ext/phar/tests/019b.phpt:1.8 --- php-src/ext/phar/tests/019b.phpt:1.7 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/019b.phpt Mon May 19 19:05:42 2008 @@ -2,13 +2,14 @@ Phar: opendir test, recurse into --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (!version_compare(phpversion(), 6, '<')) die("skip: permanent loop FIXME"); ?> --INI-- phar.require_hash=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/019c.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/phar/tests/019c.phpt diff -u php-src/ext/phar/tests/019c.phpt:1.9 php-src/ext/phar/tests/019c.phpt:1.10 --- php-src/ext/phar/tests/019c.phpt:1.9 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/019c.phpt Mon May 19 19:05:42 2008 @@ -2,13 +2,14 @@ Phar: opendir test, recurse into --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (!version_compare(phpversion(), 6, '<')) die("skip: permanent loop FIXME"); ?> --INI-- phar.require_hash=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/020.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/phar/tests/020.phpt diff -u php-src/ext/phar/tests/020.phpt:1.13 php-src/ext/phar/tests/020.phpt:1.14 --- php-src/ext/phar/tests/020.phpt:1.13 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/020.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; @@ -53,31 +53,31 @@ int(-1) [12]=> int(-1) - ["dev"]=> + [u"dev"]=> int(12) - ["ino"]=> + [u"ino"]=> int(%d) - ["mode"]=> + [u"mode"]=> int(33060) - ["nlink"]=> + [u"nlink"]=> int(1) - ["uid"]=> + [u"uid"]=> int(0) - ["gid"]=> + [u"gid"]=> int(0) - ["rdev"]=> + [u"rdev"]=> int(-1) - ["size"]=> + [u"size"]=> int(1) - ["atime"]=> + [u"atime"]=> int(%d) - ["mtime"]=> + [u"mtime"]=> int(%d) - ["ctime"]=> + [u"ctime"]=> int(%d) - ["blksize"]=> + [u"blksize"]=> int(-1) - ["blocks"]=> + [u"blocks"]=> int(-1) } array(26) { @@ -107,30 +107,30 @@ int(-1) [12]=> int(-1) - ["dev"]=> + [u"dev"]=> int(12) - ["ino"]=> + [u"ino"]=> int(%d) - ["mode"]=> + [u"mode"]=> int(16749) - ["nlink"]=> + [u"nlink"]=> int(1) - ["uid"]=> + [u"uid"]=> int(0) - ["gid"]=> + [u"gid"]=> int(0) - ["rdev"]=> + [u"rdev"]=> int(-1) - ["size"]=> + [u"size"]=> int(0) - ["atime"]=> + [u"atime"]=> int(%d) - ["mtime"]=> + [u"mtime"]=> int(%d) - ["ctime"]=> + [u"ctime"]=> int(%d) - ["blksize"]=> + [u"blksize"]=> int(-1) - ["blocks"]=> + [u"blocks"]=> int(-1) } \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/021.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/021.phpt diff -u php-src/ext/phar/tests/021.phpt:1.11 php-src/ext/phar/tests/021.phpt:1.12 --- php-src/ext/phar/tests/021.phpt:1.11 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/021.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; @@ -56,30 +56,30 @@ int(-1) [12]=> int(-1) - ["dev"]=> + [u"dev"]=> int(12) - ["ino"]=> + [u"ino"]=> int(%d) - ["mode"]=> + [u"mode"]=> int(33060) - ["nlink"]=> + [u"nlink"]=> int(1) - ["uid"]=> + [u"uid"]=> int(0) - ["gid"]=> + [u"gid"]=> int(0) - ["rdev"]=> + [u"rdev"]=> int(-1) - ["size"]=> + [u"size"]=> int(1) - ["atime"]=> + [u"atime"]=> int(%d) - ["mtime"]=> + [u"mtime"]=> int(%d) - ["ctime"]=> + [u"ctime"]=> int(%d) - ["blksize"]=> + [u"blksize"]=> int(-1) - ["blocks"]=> + [u"blocks"]=> int(-1) -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/022.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/022.phpt diff -u php-src/ext/phar/tests/022.phpt:1.11 php-src/ext/phar/tests/022.phpt:1.12 --- php-src/ext/phar/tests/022.phpt:1.11 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/022.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/023.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/023.phpt diff -u php-src/ext/phar/tests/023.phpt:1.7 php-src/ext/phar/tests/023.phpt:1.8 --- php-src/ext/phar/tests/023.phpt:1.7 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/023.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/024.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/024.phpt diff -u php-src/ext/phar/tests/024.phpt:1.7 php-src/ext/phar/tests/024.phpt:1.8 --- php-src/ext/phar/tests/024.phpt:1.7 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/024.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/025.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/025.phpt diff -u php-src/ext/phar/tests/025.phpt:1.7 php-src/ext/phar/tests/025.phpt:1.8 --- php-src/ext/phar/tests/025.phpt:1.7 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/025.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a'] = '<?php echo "This is a\n"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/026.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/phar/tests/026.phpt diff -u php-src/ext/phar/tests/026.phpt:1.8 php-src/ext/phar/tests/026.phpt:1.9 --- php-src/ext/phar/tests/026.phpt:1.8 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/026.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; require \''.$pname.'/b.php\'; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/027.phpt?r1=1.19&r2=1.20&diff_format=u Index: php-src/ext/phar/tests/027.phpt diff -u php-src/ext/phar/tests/027.phpt:1.19 php-src/ext/phar/tests/027.phpt:1.20 --- php-src/ext/phar/tests/027.phpt:1.19 Wed May 7 05:38:29 2008 +++ php-src/ext/phar/tests/027.phpt Mon May 19 19:05:42 2008 @@ -2,13 +2,14 @@ Phar: phar:// opendir --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (!version_compare(phpversion(), 6, '<')) die("skip: permanent loop FIXME"); ?> --INI-- phar.require_hash=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; require \''.$pname.'/b.php\'; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/028.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/phar/tests/028.phpt diff -u php-src/ext/phar/tests/028.phpt:1.9 php-src/ext/phar/tests/028.phpt:1.10 --- php-src/ext/phar/tests/028.phpt:1.9 Tue May 6 21:14:52 2008 +++ php-src/ext/phar/tests/028.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://hio'; -$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $alias = ''; $files = array(); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/029.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/029.phpt diff -u php-src/ext/phar/tests/029.phpt:1.10 php-src/ext/phar/tests/029.phpt:1.11 --- php-src/ext/phar/tests/029.phpt:1.10 Tue May 6 21:14:52 2008 +++ php-src/ext/phar/tests/029.phpt Mon May 19 19:05:42 2008 @@ -11,7 +11,7 @@ $fname = $fname1; $alias = ''; $pname = 'phar://hio'; -$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/030.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/030.phpt diff -u php-src/ext/phar/tests/030.phpt:1.7 php-src/ext/phar/tests/030.phpt:1.8 --- php-src/ext/phar/tests/030.phpt:1.7 Thu May 15 16:09:21 2008 +++ php-src/ext/phar/tests/030.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; include \''.$pname.'/b.php\'; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/033.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/033.phpt diff -u php-src/ext/phar/tests/033.phpt:1.6 php-src/ext/phar/tests/033.phpt:1.7 --- php-src/ext/phar/tests/033.phpt:1.6 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/033.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; $pname = 'phar://hio'; -$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/033a.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/033a.phpt diff -u php-src/ext/phar/tests/033a.phpt:1.5 php-src/ext/phar/tests/033a.phpt:1.6 --- php-src/ext/phar/tests/033a.phpt:1.5 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/033a.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; $pname = 'phar://hio'; -$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/badparameters.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/badparameters.phpt diff -u php-src/ext/phar/tests/badparameters.phpt:1.4 php-src/ext/phar/tests/badparameters.phpt:1.5 --- php-src/ext/phar/tests/badparameters.phpt:1.4 Thu May 15 23:46:32 2008 +++ php-src/ext/phar/tests/badparameters.phpt Mon May 19 19:05:42 2008 @@ -134,35 +134,35 @@ ?> ===DONE=== --EXPECTF-- -Warning: Phar::mungServer() expects parameter 1 to be array, string given in %sbadparameters.php on line %d +Warning: Phar::mungServer() expects parameter 1 to be array, Unicode string given in %sbadparameters.php on line %d -Warning: Phar::createDefaultStub() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::createDefaultStub() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d -Warning: Phar::loadPhar() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::loadPhar() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d -Warning: Phar::canCompress() expects parameter 1 to be long, string given in %sbadparameters.php on line %d +Warning: Phar::canCompress() expects parameter 1 to be long, Unicode string given in %sbadparameters.php on line %d -Warning: Phar::__construct() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::__construct() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d Warning: Phar::convertToExecutable() expects parameter 1 to be long, array given in %sbadparameters.php on line %d Warning: Phar::convertToData() expects parameter 1 to be long, array given in %sbadparameters.php on line %d -Warning: PharData::delete() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: PharData::delete() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d Cannot write out phar archive, phar is read-only Entry oops does not exist and cannot be deleted %sfiles/frontcontroller10.phar Cannot write out phar archive, phar is read-only A Phar alias cannot be set in a plain tar archive -Warning: Phar::setAlias() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::setAlias() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d Cannot change stub, phar is read-only A Phar stub cannot be set in a plain tar archive -Warning: Phar::setStub() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::setStub() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d A Phar stub cannot be set in a plain tar archive -Warning: Phar::setDefaultStub() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::setDefaultStub() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d Cannot change stub: phar.readonly=1 Cannot set signature algorithm, phar is read-only Cannot set signature algorithm, not possible with tar-based phar archives @@ -177,18 +177,18 @@ Warning: Phar::copy() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d Cannot copy "a" to "b", phar is read-only -Warning: Phar::offsetExists() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::offsetExists() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d -Warning: Phar::offsetGet() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::offsetGet() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d Warning: Phar::offsetSet() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d -Warning: PharData::offsetUnset() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: PharData::offsetUnset() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d Write operations disabled by INI setting -Warning: Phar::addEmptyDir() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::addEmptyDir() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d -Warning: Phar::addFile() expects parameter 1 to be string, array given in %sbadparameters.php on line %d +Warning: Phar::addFile() expects parameter 1 to be binary string, array given in %sbadparameters.php on line %d Warning: Phar::addFromString() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d Write operations disabled by INI setting http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/delete.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/delete.phpt diff -u php-src/ext/phar/tests/delete.phpt:1.3 php-src/ext/phar/tests/delete.phpt:1.4 --- php-src/ext/phar/tests/delete.phpt:1.3 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/delete.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/delete_in_phar.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/delete_in_phar.phpt diff -u php-src/ext/phar/tests/delete_in_phar.phpt:1.7 php-src/ext/phar/tests/delete_in_phar.phpt:1.8 --- php-src/ext/phar/tests/delete_in_phar.phpt:1.7 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/delete_in_phar.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/delete_in_phar_b.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/delete_in_phar_b.phpt diff -u php-src/ext/phar/tests/delete_in_phar_b.phpt:1.5 php-src/ext/phar/tests/delete_in_phar_b.phpt:1.6 --- php-src/ext/phar/tests/delete_in_phar_b.phpt:1.5 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/delete_in_phar_b.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/delete_in_phar_confirm.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/phar/tests/delete_in_phar_confirm.phpt diff -u php-src/ext/phar/tests/delete_in_phar_confirm.phpt:1.8 php-src/ext/phar/tests/delete_in_phar_confirm.phpt:1.9 --- php-src/ext/phar/tests/delete_in_phar_confirm.phpt:1.8 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/delete_in_phar_confirm.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/dir.phpt?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/phar/tests/dir.phpt diff -u php-src/ext/phar/tests/dir.phpt:1.16 php-src/ext/phar/tests/dir.phpt:1.17 --- php-src/ext/phar/tests/dir.phpt:1.16 Wed May 7 05:38:29 2008 +++ php-src/ext/phar/tests/dir.phpt Mon May 19 19:05:42 2008 @@ -37,7 +37,7 @@ file_put_contents('phar://' . dirname(__FILE__) . '/ok.phar/sub/directory.txt', 'hi'); mkdir('phar://' . dirname(__FILE__) . '/ok.phar/sub'); mkdir('phar://' . dirname(__FILE__) . '/ok.phar/sub/directory.txt'); -file_put_contents(dirname(__FILE__) . '/oops.phar', '<?php this should screw em up __HALT_COMPILER();'); +file_put_contents(dirname(__FILE__) . '/oops.phar', (binary)'<?php this should screw em up __HALT_COMPILER();'); mkdir('phar://' . dirname(__FILE__) . '/oops.phar/fails'); mkdir('phar://'); @@ -72,7 +72,7 @@ Warning: mkdir(): phar error: cannot create directory "sub" in phar "%sok.phar", directory already exists in %sdir.php on line %d -Warning: mkdir(): phar error: cannot create directory "sub/directory.txt" in phar "%sok.phar", phar error: path "sub/directory.txt" exists and is a not a directory in %sdir.php on line %d +Warning: mkdir(): phar error: cannot create directory "sub/directory.txt" in phar "%sok.phar", phar error: path "sub/directory.txt" exists and is not a directory in %sdir.php on line %d Warning: mkdir(): internal corruption of phar "%soops.phar" (truncated manifest at stub end) in %sdir.php on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/fgc_edgecases.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/fgc_edgecases.phpt diff -u php-src/ext/phar/tests/fgc_edgecases.phpt:1.3 php-src/ext/phar/tests/fgc_edgecases.phpt:1.4 --- php-src/ext/phar/tests/fgc_edgecases.phpt:1.3 Mon May 12 12:46:40 2008 +++ php-src/ext/phar/tests/fgc_edgecases.phpt Mon May 19 19:05:42 2008 @@ -27,7 +27,6 @@ echo file_get_contents("./hi", 0, $context); echo file_get_contents("../oops"); echo file_get_contents("./hi", 0, $context, 50000); -ini_set("magic_quotes_runtime", 1); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> @@ -40,7 +39,9 @@ <?php rmdir(dirname(__FILE__) . '/poo'); ?> <?php unlink(dirname(__FILE__) . '/foob'); ?> --EXPECTF-- -Warning: file_get_contents() expects parameter 1 to be string, array given in %sfgc_edgecases.php on line %d +Notice: Array to string conversion in %sfgc_edgecases.php on line %d + +Warning: file_get_contents(Array): failed to open stream: No such file or directory in %sfgc_edgecases.php on line %d blah <?php echo file_get_contents("foo/" . basename(__FILE__)); @@ -52,7 +53,6 @@ echo file_get_contents("./hi", 0, $context); echo file_get_contents("../oops"); echo file_get_contents("./hi", 0, $context, 50000); -ini_set("magic_quotes_runtime", 1); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> @@ -70,7 +70,6 @@ echo file_get_contents("./hi", 0, $context); echo file_get_contents("../oops"); echo file_get_contents("./hi", 0, $context, 50000); -ini_set("magic_quotes_runtime", 1); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> @@ -79,17 +78,16 @@ Warning: file_get_contents(): Failed to seek to position 50000 in the stream in phar://%sfgc_edgecases.phar.php/foo/hi on line %d <?php -echo file_get_contents(\"foo/\" . basename(__FILE__)); +echo file_get_contents("foo/" . basename(__FILE__)); $context = stream_context_create(); -file_get_contents(\"./hi\", 0, $context, 0, -1); -echo file_get_contents(\"foob\"); -set_include_path(\"%stests\"); -echo file_get_contents(\"foob\", true); -echo file_get_contents(\"./hi\", 0, $context); -echo file_get_contents(\"../oops\"); -echo file_get_contents(\"./hi\", 0, $context, 50000); -ini_set(\"magic_quotes_runtime\", 1); -echo file_get_contents(\"./hi\"); -echo file_get_contents(\"./hi\", 0, $context, 0, 0); +file_get_contents("./hi", 0, $context, 0, -1); +echo file_get_contents("foob"); +set_include_path("%stests"); +echo file_get_contents("foob", true); +echo file_get_contents("./hi", 0, $context); +echo file_get_contents("../oops"); +echo file_get_contents("./hi", 0, $context, 50000); +echo file_get_contents("./hi"); +echo file_get_contents("./hi", 0, $context, 0, 0); ?> ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/fopen_edgecases2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/fopen_edgecases2.phpt diff -u php-src/ext/phar/tests/fopen_edgecases2.phpt:1.1 php-src/ext/phar/tests/fopen_edgecases2.phpt:1.2 --- php-src/ext/phar/tests/fopen_edgecases2.phpt:1.1 Sun May 11 19:17:50 2008 +++ php-src/ext/phar/tests/fopen_edgecases2.phpt Mon May 19 19:05:42 2008 @@ -35,7 +35,9 @@ <?php rmdir(dirname(__FILE__) . '/poo'); ?> <?php unlink(dirname(__FILE__) . '/foob'); ?> --EXPECTF-- -Warning: fopen() expects parameter 1 to be string, array given in %sfopen_edgecases2.php on line %d +Notice: Array to string conversion in %sfopen_edgecases2.php on line %d + +Warning: fopen(Array): failed to open stream: No such file or directory in %sfopen_edgecases2.php on line %d blah test http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller10.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/frontcontroller10.phpt diff -u php-src/ext/phar/tests/frontcontroller10.phpt:1.6 php-src/ext/phar/tests/frontcontroller10.phpt:1.7 --- php-src/ext/phar/tests/frontcontroller10.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller10.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller rewrite access denied --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller4.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 Status: 403 Access Denied --EXPECT-- <html> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller11.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/frontcontroller11.phpt diff -u php-src/ext/phar/tests/frontcontroller11.phpt:1.6 php-src/ext/phar/tests/frontcontroller11.phpt:1.7 --- php-src/ext/phar/tests/frontcontroller11.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller11.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type extension is not a string --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller5.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller12.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/frontcontroller12.phpt diff -u php-src/ext/phar/tests/frontcontroller12.phpt:1.5 php-src/ext/phar/tests/frontcontroller12.phpt:1.6 --- php-src/ext/phar/tests/frontcontroller12.phpt:1.5 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller12.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type unknown int --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller6.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller13.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/frontcontroller13.phpt diff -u php-src/ext/phar/tests/frontcontroller13.phpt:1.5 php-src/ext/phar/tests/frontcontroller13.phpt:1.6 --- php-src/ext/phar/tests/frontcontroller13.phpt:1.5 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller13.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type not string/int --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller7.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller15.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/frontcontroller15.phpt diff -u php-src/ext/phar/tests/frontcontroller15.phpt:1.4 php-src/ext/phar/tests/frontcontroller15.phpt:1.5 --- php-src/ext/phar/tests/frontcontroller15.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller15.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type override, Phar::PHPS --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller16.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/frontcontroller16.phpt diff -u php-src/ext/phar/tests/frontcontroller16.phpt:1.4 php-src/ext/phar/tests/frontcontroller16.phpt:1.5 --- php-src/ext/phar/tests/frontcontroller16.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller16.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type override, Phar::PHP --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- hio1 http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller2.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/frontcontroller2.phpt diff -u php-src/ext/phar/tests/frontcontroller2.phpt:1.6 php-src/ext/phar/tests/frontcontroller2.phpt:1.7 --- php-src/ext/phar/tests/frontcontroller2.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller2.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller PHP test --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,6 +11,6 @@ --FILE_EXTERNAL-- files/frontcontroller.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- hio http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller21.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/frontcontroller21.phpt diff -u php-src/ext/phar/tests/frontcontroller21.phpt:1.7 php-src/ext/phar/tests/frontcontroller21.phpt:1.8 --- php-src/ext/phar/tests/frontcontroller21.phpt:1.7 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller21.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller $_SERVER munging success --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller12.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- string(10) "/index.php" string(10) "/index.php" @@ -21,4 +21,4 @@ string(32) "/frontcontroller21.php/index.php" string(22) "/frontcontroller21.php" string(%d) "%sfrontcontroller21.php" -string(40) "/frontcontroller21.php/index.php?test=hi" \ No newline at end of file +string(40) "/frontcontroller21.php/index.php?test=hi" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller22.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/frontcontroller22.phpt diff -u php-src/ext/phar/tests/frontcontroller22.phpt:1.5 php-src/ext/phar/tests/frontcontroller22.phpt:1.6 --- php-src/ext/phar/tests/frontcontroller22.phpt:1.5 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller22.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller include from cwd test 1 --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,10 +11,10 @@ --FILE_EXTERNAL-- files/frontcontroller13.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- -string(4) "test" -string(12) "oof/test.php" +unicode(4) "test" +unicode(12) "oof/test.php" Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller23.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/frontcontroller23.phpt diff -u php-src/ext/phar/tests/frontcontroller23.phpt:1.3 php-src/ext/phar/tests/frontcontroller23.phpt:1.4 --- php-src/ext/phar/tests/frontcontroller23.phpt:1.3 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller23.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller with generic action router test --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller14.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- string(9) "/hi/there" -string(%d) "phar://%sfrontcontroller23.php/html/index.php" \ No newline at end of file +string(%d) "phar://%sfrontcontroller23.php/html/index.php" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller24.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/frontcontroller24.phpt diff -u php-src/ext/phar/tests/frontcontroller24.phpt:1.2 php-src/ext/phar/tests/frontcontroller24.phpt:1.3 --- php-src/ext/phar/tests/frontcontroller24.phpt:1.2 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller24.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller with custom 404 php script --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,6 +11,6 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- -My 404 is rawesome \ No newline at end of file +My 404 is rawesome http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller25.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/frontcontroller25.phpt diff -u php-src/ext/phar/tests/frontcontroller25.phpt:1.3 php-src/ext/phar/tests/frontcontroller25.phpt:1.4 --- php-src/ext/phar/tests/frontcontroller25.phpt:1.3 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller25.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller with extra path_info --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- string(42) "/frontcontroller25.php/a1.phps/extra/stuff" -string(12) "/extra/stuff" \ No newline at end of file +string(12) "/extra/stuff" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller26.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/frontcontroller26.phpt diff -u php-src/ext/phar/tests/frontcontroller26.phpt:1.1 php-src/ext/phar/tests/frontcontroller26.phpt:1.2 --- php-src/ext/phar/tests/frontcontroller26.phpt:1.1 Tue Apr 22 17:03:09 2008 +++ php-src/ext/phar/tests/frontcontroller26.phpt Mon May 19 19:05:42 2008 @@ -11,4 +11,4 @@ --EXPECTHEADERS-- Content-type: application/octet-stream --EXPECTF-- -<?php var_dump("hi"); \ No newline at end of file +<?php var_dump("hi"); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller27.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/frontcontroller27.phpt diff -u php-src/ext/phar/tests/frontcontroller27.phpt:1.2 php-src/ext/phar/tests/frontcontroller27.phpt:1.3 --- php-src/ext/phar/tests/frontcontroller27.phpt:1.2 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller27.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller with no extension --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,6 +11,6 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar --EXPECTHEADERS-- -Content-type: text/plain +Content-type: text/plain;charset=UTF-8 --EXPECTF-- -hi \ No newline at end of file +hi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller28.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/frontcontroller28.phpt diff -u php-src/ext/phar/tests/frontcontroller28.phpt:1.2 php-src/ext/phar/tests/frontcontroller28.phpt:1.3 --- php-src/ext/phar/tests/frontcontroller28.phpt:1.2 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller28.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller with huge file --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,6 +11,6 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar --EXPECTHEADERS-- -Content-type: text/plain +Content-type: text/plain;charset=UTF-8 --EXPECT-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaa http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller29.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/frontcontroller29.phpt diff -u php-src/ext/phar/tests/frontcontroller29.phpt:1.3 php-src/ext/phar/tests/frontcontroller29.phpt:1.4 --- php-src/ext/phar/tests/frontcontroller29.phpt:1.3 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller29.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller with fatal error in php file --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,6 +11,6 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1 \ No newline at end of file +Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1 http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller3.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/frontcontroller3.phpt diff -u php-src/ext/phar/tests/frontcontroller3.phpt:1.6 php-src/ext/phar/tests/frontcontroller3.phpt:1.7 --- php-src/ext/phar/tests/frontcontroller3.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller3.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller phps --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller30.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/frontcontroller30.phpt diff -u php-src/ext/phar/tests/frontcontroller30.phpt:1.1 php-src/ext/phar/tests/frontcontroller30.phpt:1.2 --- php-src/ext/phar/tests/frontcontroller30.phpt:1.1 Wed Apr 23 16:06:58 2008 +++ php-src/ext/phar/tests/frontcontroller30.phpt Mon May 19 19:05:42 2008 @@ -9,4 +9,4 @@ files/frontcontroller8.phar --EXPECTF-- oops did not run -%a \ No newline at end of file +%a http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller31.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/frontcontroller31.phpt diff -u php-src/ext/phar/tests/frontcontroller31.phpt:1.2 php-src/ext/phar/tests/frontcontroller31.phpt:1.3 --- php-src/ext/phar/tests/frontcontroller31.phpt:1.2 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller31.phpt Mon May 19 19:05:42 2008 @@ -1,15 +1,15 @@ --TEST-- Phar front controller with invalid callback for rewrites --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- SCRIPT_NAME=/frontcontroller31.php REQUEST_URI=/frontcontroller31.php --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller16.phar --EXPECT-- -phar error: invalid rewrite callback \ No newline at end of file +phar error: invalid rewrite callback http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller32.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/frontcontroller32.phpt diff -u php-src/ext/phar/tests/frontcontroller32.phpt:1.3 php-src/ext/phar/tests/frontcontroller32.phpt:1.4 --- php-src/ext/phar/tests/frontcontroller32.phpt:1.3 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller32.phpt Mon May 19 19:05:42 2008 @@ -1,15 +1,15 @@ --TEST-- Phar front controller with valid callback that is not good --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- SCRIPT_NAME=/frontcontroller32.php REQUEST_URI=/frontcontroller32.php --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller17.phar --EXPECTF-- -%ahar error: failed to call rewrite callback \ No newline at end of file +%ahar error: failed to call rewrite callback http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller33.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/frontcontroller33.phpt diff -u php-src/ext/phar/tests/frontcontroller33.phpt:1.2 php-src/ext/phar/tests/frontcontroller33.phpt:1.3 --- php-src/ext/phar/tests/frontcontroller33.phpt:1.2 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller33.phpt Mon May 19 19:05:42 2008 @@ -1,15 +1,15 @@ --TEST-- Phar front controller with valid callback that does not return any value --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- SCRIPT_NAME=/frontcontroller33.php REQUEST_URI=/frontcontroller33.php --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller18.phar --EXPECTF-- -phar error: rewrite callback must return a string or false \ No newline at end of file +phar error: rewrite callback must return a string or false http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller34.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/frontcontroller34.phpt diff -u php-src/ext/phar/tests/frontcontroller34.phpt:1.2 php-src/ext/phar/tests/frontcontroller34.phpt:1.3 --- php-src/ext/phar/tests/frontcontroller34.phpt:1.2 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller34.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller with cwd --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -9,7 +9,7 @@ REQUEST_URI=/frontcontroller34.php/start/index.php PATH_INFO=/start/index.php --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller19.phar --EXPECT-- http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller6.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/frontcontroller6.phpt diff -u php-src/ext/phar/tests/frontcontroller6.phpt:1.4 php-src/ext/phar/tests/frontcontroller6.phpt:1.5 --- php-src/ext/phar/tests/frontcontroller6.phpt:1.4 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/frontcontroller6.phpt Mon May 19 19:05:42 2008 @@ -18,4 +18,4 @@ <body> <h1>404 - File /notfound.php Not Found</h1> </body> -</html> \ No newline at end of file +</html> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller8.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/frontcontroller8.phpt diff -u php-src/ext/phar/tests/frontcontroller8.phpt:1.5 php-src/ext/phar/tests/frontcontroller8.phpt:1.6 --- php-src/ext/phar/tests/frontcontroller8.phpt:1.5 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/frontcontroller8.phpt Mon May 19 19:05:42 2008 @@ -18,4 +18,4 @@ <body> <h1>404 - File /index.php Not Found</h1> </body> -</html> \ No newline at end of file +</html> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/frontcontroller9.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/frontcontroller9.phpt diff -u php-src/ext/phar/tests/frontcontroller9.phpt:1.4 php-src/ext/phar/tests/frontcontroller9.phpt:1.5 --- php-src/ext/phar/tests/frontcontroller9.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/frontcontroller9.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller rewrite array --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,9 +11,9 @@ --FILE_EXTERNAL-- files/frontcontroller3.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> </span> -</code> \ No newline at end of file +</code> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/include_path.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/include_path.phpt diff -u php-src/ext/phar/tests/include_path.phpt:1.2 php-src/ext/phar/tests/include_path.phpt:1.3 --- php-src/ext/phar/tests/include_path.phpt:1.2 Sat Mar 22 21:53:10 2008 +++ php-src/ext/phar/tests/include_path.phpt Mon May 19 19:05:42 2008 @@ -31,4 +31,4 @@ Warning: include(file2.php): failed to open stream: No such file or directory in %sinclude_path.php on line %d Warning: include(): Failed opening 'file2.php' for inclusion (include_path='%sphar://%stempmanifest1.phar.php/test') in %sinclude_path.php on line %d -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/ini_set.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/ini_set.phpt diff -u php-src/ext/phar/tests/ini_set.phpt:1.4 php-src/ext/phar/tests/ini_set.phpt:1.5 --- php-src/ext/phar/tests/ini_set.phpt:1.4 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/ini_set.phpt Mon May 19 19:05:42 2008 @@ -18,11 +18,11 @@ __HALT_COMPILER(); ?> --EXPECT-- -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" +unicode(1) "1" +unicode(1) "1" +unicode(1) "1" +unicode(1) "1" +unicode(1) "1" +unicode(1) "1" +unicode(1) "1" +unicode(1) "1" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/ini_set_off.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/ini_set_off.phpt diff -u php-src/ext/phar/tests/ini_set_off.phpt:1.6 php-src/ext/phar/tests/ini_set_off.phpt:1.7 --- php-src/ext/phar/tests/ini_set_off.phpt:1.6 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/ini_set_off.phpt Mon May 19 19:05:42 2008 @@ -53,33 +53,33 @@ ?> ===DONE=== --EXPECT-- -string(1) "0" -string(1) "0" -string(1) "1" -string(1) "1" +unicode(1) "0" +unicode(1) "0" +unicode(1) "1" +unicode(1) "1" bool(true) yes -string(1) "0" -string(1) "0" -string(3) "yes" -string(3) "yes" +unicode(1) "0" +unicode(1) "0" +unicode(3) "yes" +unicode(3) "yes" bool(false) on -string(1) "0" -string(1) "0" -string(2) "on" -string(2) "on" +unicode(1) "0" +unicode(1) "0" +unicode(2) "on" +unicode(2) "on" bool(false) true -string(1) "0" -string(1) "0" +unicode(1) "0" +unicode(1) "0" bool(false) -string(4) "true" -string(4) "true" +unicode(4) "true" +unicode(4) "true" 0 -string(4) "true" -string(4) "true" +unicode(4) "true" +unicode(4) "true" bool(true) -string(1) "0" -string(1) "0" +unicode(1) "0" +unicode(1) "0" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/invalid_alias.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/invalid_alias.phpt diff -u php-src/ext/phar/tests/invalid_alias.phpt:1.1 php-src/ext/phar/tests/invalid_alias.phpt:1.2 --- php-src/ext/phar/tests/invalid_alias.phpt:1.1 Mon Mar 24 01:33:29 2008 +++ php-src/ext/phar/tests/invalid_alias.phpt Mon May 19 19:05:42 2008 @@ -42,4 +42,4 @@ Invalid alias "hi\l" specified for phar "%sinvalid_alias.phar" Invalid alias "hil;" specified for phar "%sinvalid_alias.phar" Invalid alias ":hil" specified for phar "%sinvalid_alias.phar" -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/invalid_setstubalias.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/invalid_setstubalias.phpt diff -u php-src/ext/phar/tests/invalid_setstubalias.phpt:1.1 php-src/ext/phar/tests/invalid_setstubalias.phpt:1.2 --- php-src/ext/phar/tests/invalid_setstubalias.phpt:1.1 Mon Mar 24 01:33:29 2008 +++ php-src/ext/phar/tests/invalid_setstubalias.phpt Mon May 19 19:05:42 2008 @@ -44,4 +44,4 @@ Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.tar", use setAlias Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.zip", use setStub Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.zip", use setAlias -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/metadata_read.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/metadata_read.phpt diff -u php-src/ext/phar/tests/metadata_read.phpt:1.6 php-src/ext/phar/tests/metadata_read.phpt:1.7 --- php-src/ext/phar/tests/metadata_read.phpt:1.6 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/metadata_read.phpt Mon May 19 19:05:42 2008 @@ -8,7 +8,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a'] = array('cont' => 'a'); @@ -41,18 +41,18 @@ string(1) "c" string(1) "d" NULL -string(8) "hi there" +unicode(8) "hi there" array(2) { [0]=> - string(2) "hi" + unicode(2) "hi" [1]=> - string(5) "there" + unicode(5) "there" } array(2) { - ["hi"]=> - string(5) "there" - ["foo"]=> - string(3) "bar" + [u"hi"]=> + unicode(5) "there" + [u"foo"]=> + unicode(3) "bar" } string(1) "a" string(1) "b" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/metadata_write.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/metadata_write.phpt diff -u php-src/ext/phar/tests/metadata_write.phpt:1.4 php-src/ext/phar/tests/metadata_write.phpt:1.5 --- php-src/ext/phar/tests/metadata_write.phpt:1.4 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/metadata_write.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a'] = array('cont' => 'a'); @@ -51,8 +51,8 @@ array(2) { [0]=> int(25) - ["foo"]=> - string(3) "bar" + [u"foo"]=> + unicode(3) "bar" } bool(true) string(1) "a" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/metadata_write_commit.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/metadata_write_commit.phpt diff -u php-src/ext/phar/tests/metadata_write_commit.phpt:1.4 php-src/ext/phar/tests/metadata_write_commit.phpt:1.5 --- php-src/ext/phar/tests/metadata_write_commit.phpt:1.4 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/metadata_write_commit.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a'] = array('cont' => 'a'); @@ -59,8 +59,8 @@ array(2) { [0]=> int(25) - ["foo"]=> - string(3) "bar" + [u"foo"]=> + unicode(3) "bar" } bool(true) string(1) "a" @@ -72,8 +72,8 @@ array(2) { [0]=> int(25) - ["foo"]=> - string(3) "bar" + [u"foo"]=> + unicode(3) "bar" } bool(true) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/mkdir.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/mkdir.phpt diff -u php-src/ext/phar/tests/mkdir.phpt:1.5 php-src/ext/phar/tests/mkdir.phpt:1.6 --- php-src/ext/phar/tests/mkdir.phpt:1.5 Thu May 15 16:09:21 2008 +++ php-src/ext/phar/tests/mkdir.phpt Mon May 19 19:05:42 2008 @@ -44,4 +44,4 @@ Warning: rmdir(): phar error: cannot remove directory "a" in phar "%smkdir.phar.php", phar error: path "a" exists and is a not a directory in %smkdir.php on line %d Cannot create a directory in magic ".phar" directory -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/mounteddir.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/mounteddir.phpt diff -u php-src/ext/phar/tests/mounteddir.phpt:1.6 php-src/ext/phar/tests/mounteddir.phpt:1.7 --- php-src/ext/phar/tests/mounteddir.phpt:1.6 Thu May 15 16:09:21 2008 +++ php-src/ext/phar/tests/mounteddir.phpt Mon May 19 19:05:42 2008 @@ -112,4 +112,4 @@ Mounting of /notfound to %stests/this/does/not/exist within phar %stempmanifest1.phar.php failed Mounting of /testit to %stests within phar %stests/tempmanifest1.phar.php failed Mounting of /testit/extfile.php to %stests within phar %stests/tempmanifest1.phar.php failed -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/open_for_write_existing.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/open_for_write_existing.phpt diff -u php-src/ext/phar/tests/open_for_write_existing.phpt:1.11 php-src/ext/phar/tests/open_for_write_existing.phpt:1.12 --- php-src/ext/phar/tests/open_for_write_existing.phpt:1.11 Mon Apr 14 17:18:57 2008 +++ php-src/ext/phar/tests/open_for_write_existing.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; @@ -18,7 +18,7 @@ include 'files/phar_test.inc'; $fp = fopen($pname . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $pname . '/b/c.php'; ?> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/open_for_write_existing_b.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/open_for_write_existing_b.phpt diff -u php-src/ext/phar/tests/open_for_write_existing_b.phpt:1.10 php-src/ext/phar/tests/open_for_write_existing_b.phpt:1.11 --- php-src/ext/phar/tests/open_for_write_existing_b.phpt:1.10 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/open_for_write_existing_b.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; @@ -24,7 +24,7 @@ set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($pname . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $pname . '/b/c.php'; ?> @@ -32,11 +32,10 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %spen_for_write_existing_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d -Warning: fclose(): supplied argument is not a valid stream resource in %spen_for_write_existing_b.php on line %d +Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_existing_b.php on line %d This is b/c -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/open_for_write_existing_c.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/open_for_write_existing_c.phpt diff -u php-src/ext/phar/tests/open_for_write_existing_c.phpt:1.5 php-src/ext/phar/tests/open_for_write_existing_c.phpt:1.6 --- php-src/ext/phar/tests/open_for_write_existing_c.phpt:1.5 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/open_for_write_existing_c.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; @@ -18,7 +18,7 @@ include 'files/phar_test.inc'; $fp = fopen($pname . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $pname . '/b/c.php'; ?> @@ -26,11 +26,10 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_c.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c.php on line %d This is b/c -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/open_for_write_newfile.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/open_for_write_newfile.phpt diff -u php-src/ext/phar/tests/open_for_write_newfile.phpt:1.6 php-src/ext/phar/tests/open_for_write_newfile.phpt:1.7 --- php-src/ext/phar/tests/open_for_write_newfile.phpt:1.6 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/open_for_write_newfile.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; @@ -18,7 +18,7 @@ include 'files/phar_test.inc'; $fp = fopen($pname . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $pname . '/b/c.php'; include $pname . '/b/new.php'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/open_for_write_newfile_b.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/open_for_write_newfile_b.phpt diff -u php-src/ext/phar/tests/open_for_write_newfile_b.phpt:1.10 php-src/ext/phar/tests/open_for_write_newfile_b.phpt:1.11 --- php-src/ext/phar/tests/open_for_write_newfile_b.phpt:1.10 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/open_for_write_newfile_b.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; @@ -24,7 +24,7 @@ set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($pname . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $pname . '/b/c.php'; include $pname . '/b/new.php'; @@ -34,15 +34,14 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d -Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b.php on line 20 +Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b.php on line %d This is b/c -Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line 22 +Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/open_for_write_newfile_c.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/open_for_write_newfile_c.phpt diff -u php-src/ext/phar/tests/open_for_write_newfile_c.phpt:1.5 php-src/ext/phar/tests/open_for_write_newfile_c.phpt:1.6 --- php-src/ext/phar/tests/open_for_write_newfile_c.phpt:1.5 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/open_for_write_newfile_c.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; @@ -18,7 +18,7 @@ include 'files/phar_test.inc'; $fp = fopen($pname . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $pname . '/b/c.php'; include $pname . '/b/new.php'; @@ -28,16 +28,15 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c.php on line %d This is b/c Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d -Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d +Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line 16 -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/opendir.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/opendir.phpt diff -u php-src/ext/phar/tests/opendir.phpt:1.5 php-src/ext/phar/tests/opendir.phpt:1.6 --- php-src/ext/phar/tests/opendir.phpt:1.5 Wed May 7 05:38:29 2008 +++ php-src/ext/phar/tests/opendir.phpt Mon May 19 19:05:42 2008 @@ -39,4 +39,4 @@ Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar" phar url "phar://hi.phar" is unknown in %sopendir.php on line %d -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/opendir_edgecases.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/opendir_edgecases.phpt diff -u php-src/ext/phar/tests/opendir_edgecases.phpt:1.2 php-src/ext/phar/tests/opendir_edgecases.phpt:1.3 --- php-src/ext/phar/tests/opendir_edgecases.phpt:1.2 Sun May 11 19:37:42 2008 +++ php-src/ext/phar/tests/opendir_edgecases.phpt Mon May 19 19:05:42 2008 @@ -37,10 +37,12 @@ <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php rmdir(dirname(__FILE__) . '/poo'); --EXPECTF-- -Warning: opendir() expects parameter 1 to be string, array given in %sopendir_edgecases.php on line %d +Notice: Array to string conversion in %sopendir_edgecases.php on line %d + +Warning: opendir(Array): failed to open dir: No such file or directory in %sopendir_edgecases.php on line %d . .. foo Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): failed to open dir: %s in phar://%sopendir_edgecases.phar.php/foo on line %d -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_begin_setstub_commit.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_begin_setstub_commit.phpt diff -u php-src/ext/phar/tests/phar_begin_setstub_commit.phpt:1.7 php-src/ext/phar/tests/phar_begin_setstub_commit.phpt:1.8 --- php-src/ext/phar/tests/phar_begin_setstub_commit.phpt:1.7 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/phar_begin_setstub_commit.phpt Mon May 19 19:05:42 2008 @@ -35,16 +35,16 @@ --EXPECT-- bool(true) bool(false) -string(5) "Hello" +unicode(5) "Hello" string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " -string(5) "World" +unicode(5) "World" string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " ===COMMIT=== bool(true) -string(5) "Hello" -string(5) "World" +unicode(5) "Hello" +unicode(5) "World" string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromdirectory1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromdirectory1.phpt diff -u php-src/ext/phar/tests/phar_buildfromdirectory1.phpt:1.1 php-src/ext/phar/tests/phar_buildfromdirectory1.phpt:1.2 --- php-src/ext/phar/tests/phar_buildfromdirectory1.phpt:1.1 Sun May 4 20:58:42 2008 +++ php-src/ext/phar/tests/phar_buildfromdirectory1.phpt Mon May 19 19:05:42 2008 @@ -23,6 +23,6 @@ __HALT_COMPILER(); ?> --EXPECT-- -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Cannot write to archive - write operations restricted by INI setting ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromdirectory2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromdirectory2.phpt diff -u php-src/ext/phar/tests/phar_buildfromdirectory2.phpt:1.1 php-src/ext/phar/tests/phar_buildfromdirectory2.phpt:1.2 --- php-src/ext/phar/tests/phar_buildfromdirectory2.phpt:1.1 Sun May 4 20:58:42 2008 +++ php-src/ext/phar/tests/phar_buildfromdirectory2.phpt Mon May 19 19:05:42 2008 @@ -22,6 +22,6 @@ __HALT_COMPILER(); ?> --EXPECT-- -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" RecursiveDirectoryIterator::__construct(1): failed to open dir: No such file or directory ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromdirectory3.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromdirectory3.phpt diff -u php-src/ext/phar/tests/phar_buildfromdirectory3.phpt:1.1 php-src/ext/phar/tests/phar_buildfromdirectory3.phpt:1.2 --- php-src/ext/phar/tests/phar_buildfromdirectory3.phpt:1.1 Sun May 4 20:58:42 2008 +++ php-src/ext/phar/tests/phar_buildfromdirectory3.phpt Mon May 19 19:05:42 2008 @@ -23,5 +23,5 @@ __HALT_COMPILER(); ?> --EXPECTF-- -Warning: Phar::buildFromDirectory() expects parameter 2 to be string, object given in %sphar_buildfromdirectory3.php on line %d +Warning: Phar::buildFromDirectory() expects parameter 2 to be binary string, object given in %sphar_buildfromdirectory3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromiterator1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromiterator1.phpt diff -u php-src/ext/phar/tests/phar_buildfromiterator1.phpt:1.2 php-src/ext/phar/tests/phar_buildfromiterator1.phpt:1.3 --- php-src/ext/phar/tests/phar_buildfromiterator1.phpt:1.2 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/phar_buildfromiterator1.phpt Mon May 19 19:05:42 2008 @@ -23,6 +23,6 @@ __HALT_COMPILER(); ?> --EXPECT-- -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Cannot write out phar archive, phar is read-only ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromiterator3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromiterator3.phpt diff -u php-src/ext/phar/tests/phar_buildfromiterator3.phpt:1.2 php-src/ext/phar/tests/phar_buildfromiterator3.phpt:1.3 --- php-src/ext/phar/tests/phar_buildfromiterator3.phpt:1.2 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/phar_buildfromiterator3.phpt Mon May 19 19:05:42 2008 @@ -50,5 +50,5 @@ __HALT_COMPILER(); ?> --EXPECTF-- -Warning: Phar::buildFromIterator() expects parameter 2 to be string, object given in %sphar_buildfromiterator3.php on line %d +Warning: Phar::buildFromIterator() expects parameter 2 to be binary string, object given in %sphar_buildfromiterator3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromiterator5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromiterator5.phpt diff -u php-src/ext/phar/tests/phar_buildfromiterator5.phpt:1.2 php-src/ext/phar/tests/phar_buildfromiterator5.phpt:1.3 --- php-src/ext/phar/tests/phar_buildfromiterator5.phpt:1.2 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/phar_buildfromiterator5.phpt Mon May 19 19:05:42 2008 @@ -54,6 +54,6 @@ rewind valid current -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned an invalid value (must return a string) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromiterator6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromiterator6.phpt diff -u php-src/ext/phar/tests/phar_buildfromiterator6.phpt:1.2 php-src/ext/phar/tests/phar_buildfromiterator6.phpt:1.3 --- php-src/ext/phar/tests/phar_buildfromiterator6.phpt:1.2 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/phar_buildfromiterator6.phpt Mon May 19 19:05:42 2008 @@ -55,6 +55,6 @@ valid current key -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned an invalid key (must return a string) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromiterator7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/phar_buildfromiterator7.phpt diff -u php-src/ext/phar/tests/phar_buildfromiterator7.phpt:1.2 php-src/ext/phar/tests/phar_buildfromiterator7.phpt:1.3 --- php-src/ext/phar/tests/phar_buildfromiterator7.phpt:1.2 Fri Jan 4 16:26:43 2008 +++ php-src/ext/phar/tests/phar_buildfromiterator7.phpt Mon May 19 19:05:42 2008 @@ -55,6 +55,6 @@ valid current key -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned a file that could not be opened "phar_buildfromiterator7./oopsie/there.phpt" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_bz2.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/phar_bz2.phpt diff -u php-src/ext/phar/tests/phar_bz2.phpt:1.4 php-src/ext/phar/tests/phar_bz2.phpt:1.5 --- php-src/ext/phar/tests/phar_bz2.phpt:1.4 Tue May 6 21:14:52 2008 +++ php-src/ext/phar/tests/phar_bz2.phpt Mon May 19 19:05:42 2008 @@ -14,7 +14,7 @@ $fname2 = dirname(__FILE__) . '/phar_bz2.2.phar'; $pname2 = 'phar://' . $fname2; -$file = '<?php +$file = (binary)'<?php Phar::mapPhar(); var_dump("it worked"); include "phar://" . __FILE__ . "/tar_004.php"; @@ -53,8 +53,8 @@ @unlink(dirname(__FILE__) . '/phar_bz2.2.phar'); ?> --EXPECTF-- -string(9) "it worked" -string(%d) "phar://%sphar_bz2.phar/tar_004.php" +unicode(9) "it worked" +unicode(%d) "phar://%sphar_bz2.phar/tar_004.php" bool(true) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_commitwrite.phpt?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/phar/tests/phar_commitwrite.phpt diff -u php-src/ext/phar/tests/phar_commitwrite.phpt:1.18 php-src/ext/phar/tests/phar_commitwrite.phpt:1.19 --- php-src/ext/phar/tests/phar_commitwrite.phpt:1.18 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/phar_commitwrite.phpt Mon May 19 19:05:42 2008 @@ -29,7 +29,7 @@ __HALT_COMPILER(); ?> --EXPECT-- -int(6659) +int(6683) string(200) "<?php function __autoload($class) { http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_convert_again.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/phar/tests/phar_convert_again.phpt diff -u php-src/ext/phar/tests/phar_convert_again.phpt:1.13 php-src/ext/phar/tests/phar_convert_again.phpt:1.14 --- php-src/ext/phar/tests/phar_convert_again.phpt:1.13 Wed May 7 17:24:21 2008 +++ php-src/ext/phar/tests/phar_convert_again.phpt Mon May 19 19:05:42 2008 @@ -13,8 +13,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.tbz'; $pname = 'phar://' . $fname; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; -$file = $stub; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_convert_repeated.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_convert_repeated.phpt diff -u php-src/ext/phar/tests/phar_convert_repeated.phpt:1.7 php-src/ext/phar/tests/phar_convert_repeated.phpt:1.8 --- php-src/ext/phar/tests/phar_convert_repeated.phpt:1.7 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/phar_convert_repeated.phpt Mon May 19 19:05:42 2008 @@ -12,8 +12,7 @@ $pname = 'phar://' . $fname; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; -$file = $stub; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; @@ -123,7 +122,7 @@ bool(true) bool(false) bool(false) -int(6659) +int(6683) NULL ================= convertToZip() ===================== bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_convert_tar.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_convert_tar.phpt diff -u php-src/ext/phar/tests/phar_convert_tar.phpt:1.7 php-src/ext/phar/tests/phar_convert_tar.phpt:1.8 --- php-src/ext/phar/tests/phar_convert_tar.phpt:1.7 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/phar_convert_tar.phpt Mon May 19 19:05:42 2008 @@ -12,8 +12,7 @@ $pname = 'phar://' . $fname; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; -$file = $stub; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_convert_tar2.phpt?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/phar/tests/phar_convert_tar2.phpt diff -u php-src/ext/phar/tests/phar_convert_tar2.phpt:1.12 php-src/ext/phar/tests/phar_convert_tar2.phpt:1.13 --- php-src/ext/phar/tests/phar_convert_tar2.phpt:1.12 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/phar_convert_tar2.phpt Mon May 19 19:05:42 2008 @@ -13,8 +13,7 @@ $pname = 'phar://' . $fname; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.gz'; $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; -$file = $stub; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_convert_tar3.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/phar_convert_tar3.phpt diff -u php-src/ext/phar/tests/phar_convert_tar3.phpt:1.11 php-src/ext/phar/tests/phar_convert_tar3.phpt:1.12 --- php-src/ext/phar/tests/phar_convert_tar3.phpt:1.11 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/phar_convert_tar3.phpt Mon May 19 19:05:42 2008 @@ -13,8 +13,7 @@ $pname = 'phar://' . $fname; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; -$file = $stub; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_convert_zip.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/phar_convert_zip.phpt diff -u php-src/ext/phar/tests/phar_convert_zip.phpt:1.10 php-src/ext/phar/tests/phar_convert_zip.phpt:1.11 --- php-src/ext/phar/tests/phar_convert_zip.phpt:1.10 Sat May 3 02:04:23 2008 +++ php-src/ext/phar/tests/phar_convert_zip.phpt Mon May 19 19:05:42 2008 @@ -12,8 +12,7 @@ $pname = 'phar://' . $fname; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; -$file = $stub; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_create_in_cwd.phpt?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/phar/tests/phar_create_in_cwd.phpt diff -u php-src/ext/phar/tests/phar_create_in_cwd.phpt:1.16 php-src/ext/phar/tests/phar_create_in_cwd.phpt:1.17 --- php-src/ext/phar/tests/phar_create_in_cwd.phpt:1.16 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/phar_create_in_cwd.phpt Mon May 19 19:05:42 2008 @@ -32,7 +32,7 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar'); ?> --EXPECT-- -int(6659) +int(6683) string(200) "<?php function __autoload($class) { http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_createdefaultstub.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/phar/tests/phar_createdefaultstub.phpt diff -u php-src/ext/phar/tests/phar_createdefaultstub.phpt:1.9 php-src/ext/phar/tests/phar_createdefaultstub.phpt:1.10 --- php-src/ext/phar/tests/phar_createdefaultstub.phpt:1.9 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/phar_createdefaultstub.phpt Mon May 19 19:05:42 2008 @@ -34,7 +34,7 @@ ?> ===DONE=== --EXPECT-- -string(6659) "<?php +string(6683) "<?php $web = 'index.php'; @@ -144,21 +144,21 @@ const BZ2 = 0x2000; const MASK = 0x3000; const START = 'index.php'; -const LEN = 6661; +const LEN = 6685; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = fread($fp, 4)); -$m = ''; +$L = unpack('V', $a = (binary)fread($fp, 4)); +$m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = fread($fp, $read); +$last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -328,7 +328,7 @@ __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -string(6670) "<?php +string(6694) "<?php $web = 'index.php'; @@ -438,21 +438,21 @@ const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6672; +const LEN = 6696; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = fread($fp, 4)); -$m = ''; +$L = unpack('V', $a = (binary)fread($fp, 4)); +$m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = fread($fp, $read); +$last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -622,7 +622,7 @@ __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -int(7050) +int(7074) ============================================================================ ============================================================================ Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed @@ -630,7 +630,7 @@ ============================================================================ ============================================================================ ============================================================================ -string(6672) "<?php +string(6696) "<?php $web = 'the/web.php'; @@ -740,21 +740,21 @@ const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6674; +const LEN = 6698; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = fread($fp, 4)); -$m = ''; +$L = unpack('V', $a = (binary)fread($fp, 4)); +$m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = fread($fp, $read); +$last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -924,6 +924,6 @@ __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -int(7050) +int(7074) Illegal web filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_ctx_001.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/phar_ctx_001.phpt diff -u php-src/ext/phar/tests/phar_ctx_001.phpt:1.5 php-src/ext/phar/tests/phar_ctx_001.phpt:1.6 --- php-src/ext/phar/tests/phar_ctx_001.phpt:1.5 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/phar_ctx_001.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; @@ -31,9 +31,9 @@ $context = stream_context_create(array('phar'=> array('compress'=>Phar::GZ, 'metadata' => array(2, 'hi' => 3)))); $context2 = stream_context_create(array('phar' => array('metadata' => array(4)))); -file_put_contents($pname . '/a', 'new a', 0); // no compression -file_put_contents($pname . '/b', 'new b', 0, $context); -file_put_contents($pname . '/d', 'new d', 0, $context2); +file_put_contents($pname . '/a', (binary)'new a', 0); // no compression +file_put_contents($pname . '/b', (binary)'new b', 0, $context); +file_put_contents($pname . '/d', (binary)'new d', 0, $context2); $phar = new Phar($fname); var_dump(file_get_contents($pname . '/a')); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_decompress.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/phar_decompress.phpt diff -u php-src/ext/phar/tests/phar_decompress.phpt:1.1 php-src/ext/phar/tests/phar_decompress.phpt:1.2 --- php-src/ext/phar/tests/phar_decompress.phpt:1.1 Thu Apr 24 04:05:19 2008 +++ php-src/ext/phar/tests/phar_decompress.phpt Mon May 19 19:05:42 2008 @@ -11,7 +11,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar.gz'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; @@ -63,7 +63,7 @@ %sphar_decompress.phar %sphar_decompress.hooba.phar -Warning: Phar::decompress() expects parameter 1 to be string, array given in %sphar_decompress.php on line %d +Warning: Phar::decompress() expects parameter 1 to be binary string, array given in %sphar_decompress.php on line %d Cannot decompress phar archive, phar is read-only Cannot decompress zip-based archives with whole-archive compression ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_dotted_path.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/phar_dotted_path.phpt diff -u php-src/ext/phar/tests/phar_dotted_path.phpt:1.3 php-src/ext/phar/tests/phar_dotted_path.phpt:1.4 --- php-src/ext/phar/tests/phar_dotted_path.phpt:1.3 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/phar_dotted_path.phpt Mon May 19 19:05:42 2008 @@ -13,8 +13,7 @@ mkdir($dir, 0777); $fname = $dir . '/dotted_path.phar'; -$stub = Phar::createDefaultStub(); -$file = $stub; +$file = (binary)Phar::createDefaultStub(); $files = array(); $files['a'] = 'this is a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_extract.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_extract.phpt diff -u php-src/ext/phar/tests/phar_extract.phpt:1.7 php-src/ext/phar/tests/phar_extract.phpt:1.8 --- php-src/ext/phar/tests/phar_extract.phpt:1.7 Thu May 8 02:58:44 2008 +++ php-src/ext/phar/tests/phar_extract.phpt Mon May 19 19:05:42 2008 @@ -119,7 +119,7 @@ bool(false) Invalid argument, expected a filename (string) or array of filenames -Warning: Phar::extractTo() expects parameter 1 to be string, array given in %sphar_extract.php on line %d +Warning: Phar::extractTo() expects parameter 1 to be binary string, array given in %sphar_extract.php on line %d Invalid argument, extraction path must be non-zero length Unable to use path "%soops" for extraction, it is a file, must be a directory Invalid argument, array of filenames to extract contains non-string value http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_gzip.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/phar_gzip.phpt diff -u php-src/ext/phar/tests/phar_gzip.phpt:1.4 php-src/ext/phar/tests/phar_gzip.phpt:1.5 --- php-src/ext/phar/tests/phar_gzip.phpt:1.4 Tue May 6 21:14:52 2008 +++ php-src/ext/phar/tests/phar_gzip.phpt Mon May 19 19:05:42 2008 @@ -15,7 +15,7 @@ $fname2 = dirname(__FILE__) . '/phar_gzip.2.phar'; $pname2 = 'phar://' . $fname2; -$file = '<?php +$file = (binary)'<?php Phar::mapPhar(); var_dump("it worked"); include "phar://" . __FILE__ . "/tar_004.php"; @@ -47,8 +47,8 @@ @unlink(dirname(__FILE__) . '/phar_gzip.2.phar'); ?> --EXPECTF-- -string(9) "it worked" -string(%d) "phar://%sphar_gzip.phar/tar_004.php" +unicode(9) "it worked" +unicode(%d) "phar://%sphar_gzip.phar/tar_004.php" bool(true) bool(true) ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_isvalidpharfilename.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/phar_isvalidpharfilename.phpt diff -u php-src/ext/phar/tests/phar_isvalidpharfilename.phpt:1.3 php-src/ext/phar/tests/phar_isvalidpharfilename.phpt:1.4 --- php-src/ext/phar/tests/phar_isvalidpharfilename.phpt:1.3 Wed May 7 05:38:30 2008 +++ php-src/ext/phar/tests/phar_isvalidpharfilename.phpt Mon May 19 19:05:42 2008 @@ -76,7 +76,7 @@ <?php rmdir(dirname(__FILE__) . '/.phar'); --EXPECTF-- -Warning: Phar::isValidPharFilename() expects parameter 1 to be string, array given in %sphar_isvalidpharfilename.php on line %d +Warning: Phar::isValidPharFilename() expects parameter 1 to be binary string, array given in %sphar_isvalidpharfilename.php on line %d * bool(false) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_metadata_read.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/phar_metadata_read.phpt diff -u php-src/ext/phar/tests/phar_metadata_read.phpt:1.6 php-src/ext/phar/tests/phar_metadata_read.phpt:1.7 --- php-src/ext/phar/tests/phar_metadata_read.phpt:1.6 Mon Feb 25 15:41:46 2008 +++ php-src/ext/phar/tests/phar_metadata_read.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $pmeta = 'hi there'; @@ -53,7 +53,7 @@ string(1) "c" string(1) "d" bool(true) -string(8) "hi there" +unicode(8) "hi there" bool(true) NULL bool(true) @@ -72,19 +72,19 @@ bool(true) array(2) { [0]=> - string(2) "hi" + unicode(2) "hi" [1]=> - string(5) "there" + unicode(5) "there" } bool(true) NULL meta d bool(true) array(2) { - ["hi"]=> - string(5) "there" - ["foo"]=> - string(3) "bar" + [u"hi"]=> + unicode(5) "there" + [u"foo"]=> + unicode(3) "bar" } bool(true) NULL http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_metadata_write.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/phar_metadata_write.phpt diff -u php-src/ext/phar/tests/phar_metadata_write.phpt:1.6 php-src/ext/phar/tests/phar_metadata_write.phpt:1.7 --- php-src/ext/phar/tests/phar_metadata_write.phpt:1.6 Thu Apr 24 05:03:11 2008 +++ php-src/ext/phar/tests/phar_metadata_write.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a'] = array('cont' => 'a'); @@ -52,16 +52,16 @@ string(1) "d" NULL array(1) { - ["my"]=> - string(6) "friend" + [u"my"]=> + unicode(6) "friend" } int(42) NULL array(2) { [0]=> int(25) - ["foo"]=> - string(3) "bar" + [u"foo"]=> + unicode(3) "bar" } bool(true) string(1) "a" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_offset_check.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/phar_offset_check.phpt diff -u php-src/ext/phar/tests/phar_offset_check.phpt:1.2 php-src/ext/phar/tests/phar_offset_check.phpt:1.3 --- php-src/ext/phar/tests/phar_offset_check.phpt:1.2 Thu May 15 16:09:21 2008 +++ php-src/ext/phar/tests/phar_offset_check.phpt Mon May 19 19:05:42 2008 @@ -70,8 +70,8 @@ Entry .phar/stub.php does not exist Entry .phar/alias.txt does not exist Cannot set stub ".phar/stub.php" directly in phar "%sphar_offset_check.phar.php", use setStub -int(6661) -int(6661) +int(6685) +int(6685) Cannot set alias ".phar/alias.txt" directly in phar "%sphar_offset_check.phar.php", use setAlias string(5) "susan" string(5) "susan" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_001.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/phar_oo_001.phpt diff -u php-src/ext/phar/tests/phar_oo_001.phpt:1.10 php-src/ext/phar/tests/phar_oo_001.phpt:1.11 --- php-src/ext/phar/tests/phar_oo_001.phpt:1.10 Wed Apr 23 18:22:54 2008 +++ php-src/ext/phar/tests/phar_oo_001.phpt Mon May 19 19:05:42 2008 @@ -49,6 +49,6 @@ --EXPECT-- string(5) "1.0.0" int(5) -string(50) "Cannot call method on an uninitialized Phar object" -string(29) "Cannot call constructor twice" +unicode(50) "Cannot call method on an uninitialized Phar object" +unicode(29) "Cannot call constructor twice" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_compressallbz2.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_oo_compressallbz2.phpt diff -u php-src/ext/phar/tests/phar_oo_compressallbz2.phpt:1.7 php-src/ext/phar/tests/phar_oo_compressallbz2.phpt:1.8 --- php-src/ext/phar/tests/phar_oo_compressallbz2.phpt:1.7 Fri Apr 11 13:07:13 2008 +++ php-src/ext/phar/tests/phar_oo_compressallbz2.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_compressallgz.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/phar/tests/phar_oo_compressallgz.phpt diff -u php-src/ext/phar/tests/phar_oo_compressallgz.phpt:1.8 php-src/ext/phar/tests/phar_oo_compressallgz.phpt:1.9 --- php-src/ext/phar/tests/phar_oo_compressallgz.phpt:1.8 Thu Apr 24 04:14:04 2008 +++ php-src/ext/phar/tests/phar_oo_compressallgz.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_compressed_001.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_oo_compressed_001.phpt diff -u php-src/ext/phar/tests/phar_oo_compressed_001.phpt:1.7 php-src/ext/phar/tests/phar_oo_compressed_001.phpt:1.8 --- php-src/ext/phar/tests/phar_oo_compressed_001.phpt:1.7 Fri Apr 11 13:26:02 2008 +++ php-src/ext/phar/tests/phar_oo_compressed_001.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_compressed_001b.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/phar_oo_compressed_001b.phpt diff -u php-src/ext/phar/tests/phar_oo_compressed_001b.phpt:1.6 php-src/ext/phar/tests/phar_oo_compressed_001b.phpt:1.7 --- php-src/ext/phar/tests/phar_oo_compressed_001b.phpt:1.6 Fri Apr 11 13:26:02 2008 +++ php-src/ext/phar/tests/phar_oo_compressed_001b.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_compressed_002.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/phar_oo_compressed_002.phpt diff -u php-src/ext/phar/tests/phar_oo_compressed_002.phpt:1.4 php-src/ext/phar/tests/phar_oo_compressed_002.phpt:1.5 --- php-src/ext/phar/tests/phar_oo_compressed_002.phpt:1.4 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/phar_oo_compressed_002.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; @@ -30,10 +30,10 @@ $context = stream_context_create(array('phar'=>array('compress'=>Phar::GZ))); -file_put_contents($pname . '/b', 'new b'); -file_put_contents($pname . '/c', 'new c', 0, $context); -file_put_contents($pname . '/d', 'new d'); -file_put_contents($pname . '/e', 'new e', 0, $context); +file_put_contents($pname . '/b', (binary)'new b'); +file_put_contents($pname . '/c', (binary)'new c', 0, $context); +file_put_contents($pname . '/d', (binary)'new d'); +file_put_contents($pname . '/e', (binary)'new e', 0, $context); $phar = new Phar($fname); var_dump(file_get_contents($pname . '/a')); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_compressed_002b.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/phar_oo_compressed_002b.phpt diff -u php-src/ext/phar/tests/phar_oo_compressed_002b.phpt:1.4 php-src/ext/phar/tests/phar_oo_compressed_002b.phpt:1.5 --- php-src/ext/phar/tests/phar_oo_compressed_002b.phpt:1.4 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/phar_oo_compressed_002b.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; @@ -30,10 +30,10 @@ $context = stream_context_create(array('phar'=>array('compress'=>Phar::BZ2))); -file_put_contents($pname . '/b', 'new b'); -file_put_contents($pname . '/c', 'new c', 0, $context); -file_put_contents($pname . '/d', 'new d'); -file_put_contents($pname . '/e', 'new e', 0, $context); +file_put_contents($pname . '/b', (binary)'new b'); +file_put_contents($pname . '/c', (binary)'new c', 0, $context); +file_put_contents($pname . '/d', (binary)'new d'); +file_put_contents($pname . '/e', (binary)'new e', 0, $context); $phar = new Phar($fname); var_dump(file_get_contents($pname . '/a')); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_getmodified.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/phar_oo_getmodified.phpt diff -u php-src/ext/phar/tests/phar_oo_getmodified.phpt:1.6 php-src/ext/phar/tests/phar_oo_getmodified.phpt:1.7 --- php-src/ext/phar/tests/phar_oo_getmodified.phpt:1.6 Thu Apr 10 13:40:25 2008 +++ php-src/ext/phar/tests/phar_oo_getmodified.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_iswriteable.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/phar_oo_iswriteable.phpt diff -u php-src/ext/phar/tests/phar_oo_iswriteable.phpt:1.4 php-src/ext/phar/tests/phar_oo_iswriteable.phpt:1.5 --- php-src/ext/phar/tests/phar_oo_iswriteable.phpt:1.4 Wed Apr 23 18:56:09 2008 +++ php-src/ext/phar/tests/phar_oo_iswriteable.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; $pname = 'phar://hio'; -$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_uncompressall.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_oo_uncompressall.phpt diff -u php-src/ext/phar/tests/phar_oo_uncompressall.phpt:1.7 php-src/ext/phar/tests/phar_oo_uncompressall.phpt:1.8 --- php-src/ext/phar/tests/phar_oo_uncompressall.phpt:1.7 Fri Apr 11 13:07:13 2008 +++ php-src/ext/phar/tests/phar_oo_uncompressall.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php __HALT_COMPILER(); ?>'; +$file = (binary)'<?php __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_setalias.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/phar_setalias.phpt diff -u php-src/ext/phar/tests/phar_setalias.phpt:1.3 php-src/ext/phar/tests/phar_setalias.phpt:1.4 --- php-src/ext/phar/tests/phar_setalias.phpt:1.3 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/phar_setalias.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_setalias2.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/phar_setalias2.phpt diff -u php-src/ext/phar/tests/phar_setalias2.phpt:1.7 php-src/ext/phar/tests/phar_setalias2.phpt:1.8 --- php-src/ext/phar/tests/phar_setalias2.phpt:1.7 Mon May 12 20:42:06 2008 +++ php-src/ext/phar/tests/phar_setalias2.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_setdefaultstub.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/phar_setdefaultstub.phpt diff -u php-src/ext/phar/tests/phar_setdefaultstub.phpt:1.5 php-src/ext/phar/tests/phar_setdefaultstub.phpt:1.6 --- php-src/ext/phar/tests/phar_setdefaultstub.phpt:1.5 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/phar_setdefaultstub.phpt Mon May 19 19:05:42 2008 @@ -54,7 +54,7 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECT-- -string(6661) "<?php +string(6685) "<?php $web = 'index.php'; @@ -164,21 +164,21 @@ const BZ2 = 0x2000; const MASK = 0x3000; const START = 'index.php'; -const LEN = 6661; +const LEN = 6685; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = fread($fp, 4)); -$m = ''; +$L = unpack('V', $a = (binary)fread($fp, 4)); +$m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = fread($fp, $read); +$last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -349,7 +349,7 @@ " ============================================================================ ============================================================================ -string(6672) "<?php +string(6696) "<?php $web = 'index.php'; @@ -459,21 +459,21 @@ const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6672; +const LEN = 6696; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = fread($fp, 4)); -$m = ''; +$L = unpack('V', $a = (binary)fread($fp, 4)); +$m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = fread($fp, $read); +$last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -644,7 +644,7 @@ " ============================================================================ ============================================================================ -string(6674) "<?php +string(6698) "<?php $web = 'the/web.php'; @@ -754,21 +754,21 @@ const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6674; +const LEN = 6698; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = fread($fp, 4)); -$m = ''; +$L = unpack('V', $a = (binary)fread($fp, 4)); +$m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = fread($fp, $read); +$last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -939,6 +939,6 @@ " ============================================================================ ============================================================================ -int(7052) +int(7076) Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_stub.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/phar_stub.phpt diff -u php-src/ext/phar/tests/phar_stub.phpt:1.10 php-src/ext/phar/tests/phar_stub.phpt:1.11 --- php-src/ext/phar/tests/phar_stub.phpt:1.10 Sat Apr 26 17:43:52 2008 +++ php-src/ext/phar/tests/phar_stub.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $files = array(); $files['a'] = 'a'; @@ -18,13 +18,13 @@ include 'files/phar_test.inc'; -$file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $fp = fopen($fname, 'rb'); //// 1 echo fread($fp, strlen($file)) . "\n"; fclose($fp); $phar = new Phar($fname); -$file = '<?php echo "second stub\n"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php echo "second stub\n"; __HALT_COMPILER(); ?>'; //// 2 $phar->setStub($file); @@ -33,9 +33,9 @@ fclose($fp); $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php'; -$file = '<?php echo "third stub\n"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php echo "third stub\n"; __HALT_COMPILER(); ?>'; $fp = fopen($fname2, 'wb'); -fwrite($fp, $file); +fwrite($fp, (binary)$file); fclose($fp); $fp = fopen($fname2, 'rb'); @@ -48,7 +48,7 @@ fclose($fp); $fp = fopen($fname2, 'ab'); -fwrite($fp, 'booya'); +fwrite($fp, (binary)'booya'); fclose($fp); echo file_get_contents($fname2) . "\n"; @@ -69,7 +69,7 @@ // ensure stub is not overwritten $fp = fopen($fname, 'rb'); echo fread($fp, strlen($file)) . "\n"; -if (fread($fp, strlen('booya')) == 'booya') { +if (fread($fp, strlen('booya')) == (binary)'booya') { echo 'failed - copied booya'; } fclose($fp); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_stub_error.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/phar_stub_error.phpt diff -u php-src/ext/phar/tests/phar_stub_error.phpt:1.4 php-src/ext/phar/tests/phar_stub_error.phpt:1.5 --- php-src/ext/phar/tests/phar_stub_error.phpt:1.4 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/phar_stub_error.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; +$stub = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; $files = array(); @@ -22,7 +22,7 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); -$newstub = '<?php echo "second stub\n"; _x_HALT_COMPILER(); ?>'; +$newstub = (binary)'<?php echo "second stub\n"; _x_HALT_COMPILER(); ?>'; try { $phar->setStub($newstub); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_stub_write.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/phar_stub_write.phpt diff -u php-src/ext/phar/tests/phar_stub_write.phpt:1.11 php-src/ext/phar/tests/phar_stub_write.phpt:1.12 --- php-src/ext/phar/tests/phar_stub_write.phpt:1.11 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/phar_stub_write.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; +$stub = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; $files = array(); @@ -24,7 +24,7 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); -$stub = '<?php echo "second stub\n"; __HALT_COMPILER(); ?>'; +$stub = (binary)'<?php echo "second stub\n"; __HALT_COMPILER(); ?>'; $sexp = $stub . "\r\n"; $phar->setStub($stub); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_stub_write_file.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/phar_stub_write_file.phpt diff -u php-src/ext/phar/tests/phar_stub_write_file.phpt:1.4 php-src/ext/phar/tests/phar_stub_write_file.phpt:1.5 --- php-src/ext/phar/tests/phar_stub_write_file.phpt:1.4 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/phar_stub_write_file.phpt Mon May 19 19:05:42 2008 @@ -10,7 +10,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; +$stub = (binary)'<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; $files = array(); @@ -25,7 +25,7 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); -$stub = '<?php echo "second stub\n"; __HALT_COMPILER(); ?>'; +$stub = (binary)'<?php echo "second stub\n"; __HALT_COMPILER(); ?>'; $sexp = $stub . "\r\n"; $stub = fopen('data://,'.$stub, 'r'); $phar->setStub($stub); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_unlinkarchive.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/phar_unlinkarchive.phpt diff -u php-src/ext/phar/tests/phar_unlinkarchive.phpt:1.2 php-src/ext/phar/tests/phar_unlinkarchive.phpt:1.3 --- php-src/ext/phar/tests/phar_unlinkarchive.phpt:1.2 Sun May 11 21:15:46 2008 +++ php-src/ext/phar/tests/phar_unlinkarchive.phpt Mon May 19 19:05:42 2008 @@ -90,7 +90,7 @@ Unknown phar archive "%sphar_unlinkarchive.phar" Unknown phar archive "%sphar_unlinkarchive.phar.tar": internal corruption of phar "%sphar_unlinkarchive.phar.tar" (truncated entry) -Warning: Phar::unlinkArchive() expects parameter 1 to be string, array given in %sphar_unlinkarchive.php on line %d +Warning: Phar::unlinkArchive() expects parameter 1 to be binary string, array given in %sphar_unlinkarchive.php on line %d bool(false) string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>" phar archive "%sphar_unlinkarchive.phar" has open file handles or objects. fclose() all file handles, and unset() all objects prior to calling unlinkArchive() http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/pharfileinfo_construct.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/pharfileinfo_construct.phpt diff -u php-src/ext/phar/tests/pharfileinfo_construct.phpt:1.2 php-src/ext/phar/tests/pharfileinfo_construct.phpt:1.3 --- php-src/ext/phar/tests/pharfileinfo_construct.phpt:1.2 Thu Apr 24 17:02:26 2008 +++ php-src/ext/phar/tests/pharfileinfo_construct.phpt Mon May 19 19:05:42 2008 @@ -47,7 +47,7 @@ --EXPECTF-- Cannot open phar file 'phar://%spharfileinfo_construct.phar/oops': internal corruption of phar "%spharfileinfo_construct.phar" (truncated entry) -Warning: PharFileInfo::__construct() expects parameter 1 to be string, array given in %spharfileinfo_construct.php on line %d +Warning: PharFileInfo::__construct() expects parameter 1 to be binary string, array given in %spharfileinfo_construct.php on line %d Cannot access phar file entry '/oops/I/do/not/exist' in archive '%spharfileinfo_construct.phar' Cannot call constructor twice '%spharfileinfo_construct.php' is not a valid phar archive URL (must have at least phar://filename.phar) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/pharfileinfo_getcrc32.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/pharfileinfo_getcrc32.phpt diff -u php-src/ext/phar/tests/pharfileinfo_getcrc32.phpt:1.2 php-src/ext/phar/tests/pharfileinfo_getcrc32.phpt:1.3 --- php-src/ext/phar/tests/pharfileinfo_getcrc32.phpt:1.2 Fri Apr 25 04:31:43 2008 +++ php-src/ext/phar/tests/pharfileinfo_getcrc32.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/readfile_edgecases.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/readfile_edgecases.phpt diff -u php-src/ext/phar/tests/readfile_edgecases.phpt:1.2 php-src/ext/phar/tests/readfile_edgecases.phpt:1.3 --- php-src/ext/phar/tests/readfile_edgecases.phpt:1.2 Mon May 12 12:46:40 2008 +++ php-src/ext/phar/tests/readfile_edgecases.phpt Mon May 19 19:05:42 2008 @@ -35,7 +35,9 @@ <?php rmdir(dirname(__FILE__) . '/poo'); ?> <?php unlink(dirname(__FILE__) . '/foob'); ?> --EXPECTF-- -Warning: readfile() expects parameter 1 to be string, array given in %sreadfile_edgecases.php on line %d +Notice: Array to string conversion in %sreadfile_edgecases.php on line %d + +Warning: readfile(Array): failed to open stream: No such file or directory in %sreadfile_edgecases.php on line %d blah <?php readfile("foo/" . basename(__FILE__)); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/refcount1.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/refcount1.phpt diff -u php-src/ext/phar/tests/refcount1.phpt:1.10 php-src/ext/phar/tests/refcount1.phpt:1.11 --- php-src/ext/phar/tests/refcount1.phpt:1.10 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/refcount1.phpt Mon May 19 19:05:42 2008 @@ -11,7 +11,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = (binary)"<?php __HALT_COMPILER(); ?>"; $files = array(); $files['a.php'] = '<?php echo "This is a\n"; ?>'; @@ -20,7 +20,7 @@ include 'files/phar_test.inc'; $fp = fopen($pname . '/b/c.php', 'wb'); -fwrite($fp, "extra"); +fwrite($fp, (binary)"extra"); fclose($fp); echo "===CLOSE===\n"; $p = new Phar($fname); @@ -42,9 +42,9 @@ --EXPECTF-- ===CLOSE=== object(PharFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> + [u"pathName":u"SplFileInfo":private]=> string(%d) "phar://%srefcount1.phar.php/b" - ["fileName":"SplFileInfo":private]=> + [u"fileName":u"SplFileInfo":private]=> string(%d) "phar://%srefcount1.phar.php/b/c.php" } string(5) "extra" @@ -52,9 +52,9 @@ Warning: unlink(): phar error: "b/c.php" in phar "%srefcount1.phar.php", has open file pointers, cannot unlink in %srefcount1.php on line %d object(PharFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> + [u"pathName":u"SplFileInfo":private]=> string(%d) "phar://%srefcount1.phar.php/b" - ["fileName":"SplFileInfo":private]=> + [u"fileName":u"SplFileInfo":private]=> string(%s) "phar://%srefcount1.phar.php/b/c.php" } string(5) "extra" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/rename.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/rename.phpt diff -u php-src/ext/phar/tests/rename.phpt:1.3 php-src/ext/phar/tests/rename.phpt:1.4 --- php-src/ext/phar/tests/rename.phpt:1.3 Wed Feb 20 13:11:38 2008 +++ php-src/ext/phar/tests/rename.phpt Mon May 19 19:05:42 2008 @@ -9,7 +9,7 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php +$file = (binary)"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/withphar_web.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/withphar_web.phpt diff -u php-src/ext/phar/tests/withphar_web.phpt:1.4 php-src/ext/phar/tests/withphar_web.phpt:1.5 --- php-src/ext/phar/tests/withphar_web.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/withphar_web.phpt Mon May 19 19:05:42 2008 @@ -11,6 +11,6 @@ --FILE_EXTERNAL-- files/nophar.phar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- web http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/nophar.phar?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/phar/tests/files/nophar.phar diff -u php-src/ext/phar/tests/files/nophar.phar:1.5 php-src/ext/phar/tests/files/nophar.phar:1.6 --- php-src/ext/phar/tests/files/nophar.phar:1.5 Tue Apr 15 19:26:34 2008 +++ php-src/ext/phar/tests/files/nophar.phar Mon May 19 19:05:42 2008 @@ -108,21 +108,21 @@ const BZ2 = 0x2000; const MASK = 0x3000; const START = 'index.php'; -const LEN = 6651; +const LEN = 6683; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = fread($fp, 4)); -$m = ''; +$L = unpack('V', $a = (binary)fread($fp, 4)); +$m = (binary)''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = fread($fp, $read); +$last = (binary)fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -262,7 +262,7 @@ $stat[7] . ")"); } -if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { +if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } @@ -290,6 +290,7 @@ Extract_Phar::go(); __HALT_COMPILER(); ?> -š+š <?php echo "web\n";<?php echo "in b\n";$a = fopen("index.php", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";in d - o¨:'/ÝQº4+߶N5ÓÈN\ No newline at end of file +]uñ®šjƽ¹€ +
ö8¼Ä·kï\ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/phar_oo_test.inc?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/files/phar_oo_test.inc diff -u php-src/ext/phar/tests/files/phar_oo_test.inc:1.1 php-src/ext/phar/tests/files/phar_oo_test.inc:1.2 --- php-src/ext/phar/tests/files/phar_oo_test.inc:1.1 Wed Feb 20 13:11:39 2008 +++ php-src/ext/phar/tests/files/phar_oo_test.inc Mon May 19 19:05:42 2008 @@ -4,7 +4,7 @@ $fname = dirname(__FILE__) . '/phar_oo_test.phar.php'; $pname = 'phar://' . $fname; -$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; +$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $files = array(); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/phar_test.inc?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/files/phar_test.inc diff -u php-src/ext/phar/tests/files/phar_test.inc:1.3 php-src/ext/phar/tests/files/phar_test.inc:1.4 --- php-src/ext/phar/tests/files/phar_test.inc:1.3 Tue May 13 18:35:25 2008 +++ php-src/ext/phar/tests/files/phar_test.inc Mon May 19 19:05:42 2008 @@ -4,7 +4,7 @@ date_default_timezone_set('UTC'); } -$manifest = ''; +$manifest = (binary)''; $glags = 0; foreach($files as $name => $cont) @@ -40,8 +40,8 @@ if (isset($meta)) $meta = serialize($meta); // write manifest entry - $manifest .= pack('V', strlen($name)) . $name; - $manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . $meta; + $manifest .= pack('V', strlen($name)) . (binary)$name; + $manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . (binary)$meta; // globals $gflags |= $flags; @@ -51,12 +51,14 @@ if (!isset($alias)) $alias = 'hio'; if (isset($pmeta)) $pmeta = serialize($pmeta); else $pmeta = ''; -$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . $alias . pack('V', strlen($pmeta)) . $pmeta . $manifest; + +$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . (binary)$alias . pack('V', strlen($pmeta)) . (binary)$pmeta . $manifest; +$file = (binary)$file; $file .= pack('V', strlen($manifest)) . $manifest; foreach($files as $cont) { - $file .= $cont; + $file .= (binary)$cont; } file_put_contents($fname, $file); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/all.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/all.phpt diff -u php-src/ext/phar/tests/tar/all.phpt:1.2 php-src/ext/phar/tests/tar/all.phpt:1.3 --- php-src/ext/phar/tests/tar/all.phpt:1.2 Thu May 15 23:46:54 2008 +++ php-src/ext/phar/tests/tar/all.phpt Mon May 19 19:05:42 2008 @@ -47,10 +47,10 @@ string(2) "hi" string(3) "hi2" string(3) "hi3" -string(6) "100444" +unicode(6) "100444" string(32) "<?php ok __HALT_COMPILER(); ?> " string(4) "hime" -string(8) "hi there" -string(6) "a meta" +unicode(8) "hi there" +unicode(6) "a meta" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller10.phar.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller10.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller10.phar.phpt:1.6 php-src/ext/phar/tests/tar/frontcontroller10.phar.phpt:1.7 --- php-src/ext/phar/tests/tar/frontcontroller10.phar.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller10.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller rewrite array invalid tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller4.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 Status: 403 Access Denied --EXPECT-- <html> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller11.phar.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller11.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller11.phar.phpt:1.6 php-src/ext/phar/tests/tar/frontcontroller11.phar.phpt:1.7 --- php-src/ext/phar/tests/tar/frontcontroller11.phar.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller11.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type extension is not a string tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller5.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.phar.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller12.phar.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller12.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller12.phar.phpt:1.6 php-src/ext/phar/tests/tar/frontcontroller12.phar.phpt:1.7 --- php-src/ext/phar/tests/tar/frontcontroller12.phar.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller12.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type unknown int tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller6.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.phar.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller13.phar.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller13.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller13.phar.phpt:1.6 php-src/ext/phar/tests/tar/frontcontroller13.phar.phpt:1.7 --- php-src/ext/phar/tests/tar/frontcontroller13.phar.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller13.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type not string/int tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller7.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.phar.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller15.phar.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller15.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller15.phar.phpt:1.4 php-src/ext/phar/tests/tar/frontcontroller15.phar.phpt:1.5 --- php-src/ext/phar/tests/tar/frontcontroller15.phar.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller15.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type override, Phar::PHPS tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller16.phar.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller16.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller16.phar.phpt:1.4 php-src/ext/phar/tests/tar/frontcontroller16.phar.phpt:1.5 --- php-src/ext/phar/tests/tar/frontcontroller16.phar.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller16.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type override, Phar::PHP tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- hio1 http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller2.phar.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller2.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller2.phar.phpt:1.4 php-src/ext/phar/tests/tar/frontcontroller2.phar.phpt:1.5 --- php-src/ext/phar/tests/tar/frontcontroller2.phar.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller2.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller PHP test tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,6 +11,6 @@ --FILE_EXTERNAL-- files/frontcontroller.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- hio http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller21.phar.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller21.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller21.phar.phpt:1.6 php-src/ext/phar/tests/tar/frontcontroller21.phar.phpt:1.7 --- php-src/ext/phar/tests/tar/frontcontroller21.phar.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller21.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller $_SERVER munging success tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller12.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- string(10) "/index.php" string(10) "/index.php" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller3.phar.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller3.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller3.phar.phpt:1.4 php-src/ext/phar/tests/tar/frontcontroller3.phar.phpt:1.5 --- php-src/ext/phar/tests/tar/frontcontroller3.phar.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller3.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller phps tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/frontcontroller9.phar.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/tar/frontcontroller9.phar.phpt diff -u php-src/ext/phar/tests/tar/frontcontroller9.phar.phpt:1.4 php-src/ext/phar/tests/tar/frontcontroller9.phar.phpt:1.5 --- php-src/ext/phar/tests/tar/frontcontroller9.phar.phpt:1.4 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/tar/frontcontroller9.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller rewrite array tar-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller3.phar.tar --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/open_for_write_existing.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/open_for_write_existing.phpt diff -u php-src/ext/phar/tests/tar/open_for_write_existing.phpt:1.2 php-src/ext/phar/tests/tar/open_for_write_existing.phpt:1.3 --- php-src/ext/phar/tests/tar/open_for_write_existing.phpt:1.2 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/open_for_write_existing.phpt Mon May 19 19:05:42 2008 @@ -27,7 +27,7 @@ $phar->stopBuffering(); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/open_for_write_existing_b.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/open_for_write_existing_b.phpt diff -u php-src/ext/phar/tests/tar/open_for_write_existing_b.phpt:1.2 php-src/ext/phar/tests/tar/open_for_write_existing_b.phpt:1.3 --- php-src/ext/phar/tests/tar/open_for_write_existing_b.phpt:1.2 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/open_for_write_existing_b.phpt Mon May 19 19:05:42 2008 @@ -34,7 +34,7 @@ set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; @@ -45,12 +45,11 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d -Warning: fclose(): supplied argument is not a valid stream resource in %spen_for_write_existing_b.php on line %d +Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_existing_b.php on line %d This is b/c ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/open_for_write_existing_c.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/open_for_write_existing_c.phpt diff -u php-src/ext/phar/tests/tar/open_for_write_existing_c.phpt:1.2 php-src/ext/phar/tests/tar/open_for_write_existing_c.phpt:1.3 --- php-src/ext/phar/tests/tar/open_for_write_existing_c.phpt:1.2 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/open_for_write_existing_c.phpt Mon May 19 19:05:42 2008 @@ -28,7 +28,7 @@ ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; @@ -39,10 +39,9 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_c.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c.php on line %d This is b/c http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/open_for_write_newfile.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/tar/open_for_write_newfile.phpt diff -u php-src/ext/phar/tests/tar/open_for_write_newfile.phpt:1.3 php-src/ext/phar/tests/tar/open_for_write_newfile.phpt:1.4 --- php-src/ext/phar/tests/tar/open_for_write_newfile.phpt:1.3 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/open_for_write_newfile.phpt Mon May 19 19:05:42 2008 @@ -27,7 +27,7 @@ $phar->stopBuffering(); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/open_for_write_newfile_b.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/tar/open_for_write_newfile_b.phpt diff -u php-src/ext/phar/tests/tar/open_for_write_newfile_b.phpt:1.3 php-src/ext/phar/tests/tar/open_for_write_newfile_b.phpt:1.4 --- php-src/ext/phar/tests/tar/open_for_write_newfile_b.phpt:1.3 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/open_for_write_newfile_b.phpt Mon May 19 19:05:42 2008 @@ -34,7 +34,7 @@ set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; @@ -46,10 +46,9 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b.php on line %d This is b/c http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/open_for_write_newfile_c.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/tar/open_for_write_newfile_c.phpt diff -u php-src/ext/phar/tests/tar/open_for_write_newfile_c.phpt:1.3 php-src/ext/phar/tests/tar/open_for_write_newfile_c.phpt:1.4 --- php-src/ext/phar/tests/tar/open_for_write_newfile_c.phpt:1.3 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/open_for_write_newfile_c.phpt Mon May 19 19:05:42 2008 @@ -28,7 +28,7 @@ ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; include $alias . '/b/new.php'; @@ -39,10 +39,9 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c.php on line %d This is b/c @@ -51,4 +50,4 @@ Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_begin_setstub_commit.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/phar_begin_setstub_commit.phpt diff -u php-src/ext/phar/tests/tar/phar_begin_setstub_commit.phpt:1.2 php-src/ext/phar/tests/tar/phar_begin_setstub_commit.phpt:1.3 --- php-src/ext/phar/tests/tar/phar_begin_setstub_commit.phpt:1.2 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/tar/phar_begin_setstub_commit.phpt Mon May 19 19:05:42 2008 @@ -36,16 +36,16 @@ bool(true) bool(true) bool(false) -string(5) "Hello" +unicode(5) "Hello" string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " -string(5) "World" +unicode(5) "World" string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " ===COMMIT=== bool(true) -string(5) "Hello" -string(5) "World" +unicode(5) "Hello" +unicode(5) "World" string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_buildfromiterator5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/phar_buildfromiterator5.phpt diff -u php-src/ext/phar/tests/tar/phar_buildfromiterator5.phpt:1.2 php-src/ext/phar/tests/tar/phar_buildfromiterator5.phpt:1.3 --- php-src/ext/phar/tests/tar/phar_buildfromiterator5.phpt:1.2 Tue Jan 8 07:08:45 2008 +++ php-src/ext/phar/tests/tar/phar_buildfromiterator5.phpt Mon May 19 19:05:42 2008 @@ -54,6 +54,6 @@ rewind valid current -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned an invalid value (must return a string) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_buildfromiterator6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/phar_buildfromiterator6.phpt diff -u php-src/ext/phar/tests/tar/phar_buildfromiterator6.phpt:1.2 php-src/ext/phar/tests/tar/phar_buildfromiterator6.phpt:1.3 --- php-src/ext/phar/tests/tar/phar_buildfromiterator6.phpt:1.2 Tue Jan 8 07:08:45 2008 +++ php-src/ext/phar/tests/tar/phar_buildfromiterator6.phpt Mon May 19 19:05:42 2008 @@ -55,6 +55,6 @@ valid current key -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned an invalid key (must return a string) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_buildfromiterator7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/phar_buildfromiterator7.phpt diff -u php-src/ext/phar/tests/tar/phar_buildfromiterator7.phpt:1.2 php-src/ext/phar/tests/tar/phar_buildfromiterator7.phpt:1.3 --- php-src/ext/phar/tests/tar/phar_buildfromiterator7.phpt:1.2 Tue Jan 8 07:08:45 2008 +++ php-src/ext/phar/tests/tar/phar_buildfromiterator7.phpt Mon May 19 19:05:42 2008 @@ -55,6 +55,6 @@ valid current key -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned a file that could not be opened "phar_buildfromiterator7./oopsie/there.phpt" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_convert_phar.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/phar/tests/tar/phar_convert_phar.phpt diff -u php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.10 php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.11 --- php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.10 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/tar/phar_convert_phar.phpt Mon May 19 19:05:42 2008 @@ -47,12 +47,12 @@ ?> --EXPECT-- bool(false) -int(6659) +int(6683) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" bool(true) -int(6659) +int(6683) bool(true) -int(6659) +int(6683) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_convert_phar2.phpt?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/phar/tests/tar/phar_convert_phar2.phpt diff -u php-src/ext/phar/tests/tar/phar_convert_phar2.phpt:1.12 php-src/ext/phar/tests/tar/phar_convert_phar2.phpt:1.13 --- php-src/ext/phar/tests/tar/phar_convert_phar2.phpt:1.12 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/tar/phar_convert_phar2.phpt Mon May 19 19:05:42 2008 @@ -49,14 +49,14 @@ ?> --EXPECT-- bool(false) -int(6659) +int(6683) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" bool(true) int(4096) -int(6659) +int(6683) bool(true) bool(true) -int(6659) +int(6683) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_convert_phar3.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/tar/phar_convert_phar3.phpt diff -u php-src/ext/phar/tests/tar/phar_convert_phar3.phpt:1.11 php-src/ext/phar/tests/tar/phar_convert_phar3.phpt:1.12 --- php-src/ext/phar/tests/tar/phar_convert_phar3.phpt:1.11 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/tar/phar_convert_phar3.phpt Mon May 19 19:05:42 2008 @@ -49,14 +49,14 @@ ?> --EXPECT-- bool(false) -int(6651) +int(6683) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" bool(true) int(8192) -int(6651) +int(6683) bool(true) bool(true) -int(6651) +int(6683) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_stub.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/phar_stub.phpt diff -u php-src/ext/phar/tests/tar/phar_stub.phpt:1.2 php-src/ext/phar/tests/tar/phar_stub.phpt:1.3 --- php-src/ext/phar/tests/tar/phar_stub.phpt:1.2 Sat Apr 26 17:47:29 2008 +++ php-src/ext/phar/tests/tar/phar_stub.phpt Mon May 19 19:05:42 2008 @@ -31,7 +31,7 @@ $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php'; $file = '<?php echo "third stub\n"; __HALT_COMPILER(); ?>'; $fp = fopen($fname3, 'wb'); -fwrite($fp, $file); +fwrite($fp, (binary)$file); fclose($fp); $fp = fopen($fname3, 'rb'); @@ -42,7 +42,7 @@ echo $phar->getStub(); $fp = fopen($fname3, 'ab'); -fwrite($fp, 'booya'); +fwrite($fp, (binary)'booya'); fclose($fp); echo file_get_contents($fname3) . "\n"; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_stub_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/tar/phar_stub_error.phpt diff -u php-src/ext/phar/tests/tar/phar_stub_error.phpt:1.3 php-src/ext/phar/tests/tar/phar_stub_error.phpt:1.4 --- php-src/ext/phar/tests/tar/phar_stub_error.phpt:1.3 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/phar_stub_error.phpt Mon May 19 19:05:42 2008 @@ -16,11 +16,11 @@ $phar['a'] = 'a'; $phar->stopBuffering(); -var_dump($stub); +var_dump((binary)$stub); var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); -$newstub = '<?php echo "second stub\n"; _x_HALT_COMPILER(); ?>'; +$newstub = (binary)'<?php echo "second stub\n"; _x_HALT_COMPILER(); ?>'; try { $phar->setStub($newstub); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/refcount1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/tar/refcount1.phpt diff -u php-src/ext/phar/tests/tar/refcount1.phpt:1.2 php-src/ext/phar/tests/tar/refcount1.phpt:1.3 --- php-src/ext/phar/tests/tar/refcount1.phpt:1.2 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/refcount1.phpt Mon May 19 19:05:42 2008 @@ -15,7 +15,7 @@ $tar = new tarmaker($fname, 'none'); $tar->init(); -$tar->addFile('.phar/stub.php', "<?php __HALT_COMPILER(); ?>"); +$tar->addFile('.phar/stub.php', (binary)"<?php __HALT_COMPILER(); ?>"); $files = array(); @@ -31,7 +31,7 @@ $tar->close(); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, "extra"); +fwrite($fp, (binary)"extra"); fclose($fp); echo "===CLOSE===\n"; $phar = new Phar($fname); @@ -54,9 +54,9 @@ --EXPECTF-- ===CLOSE=== object(PharFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> + [u"pathName":u"SplFileInfo":private]=> string(%d) "phar://%srefcount1.phar.tar/b" - ["fileName":"SplFileInfo":private]=> + [u"fileName":u"SplFileInfo":private]=> string(%d) "phar://%srefcount1.phar.tar/b/c.php" } string(5) "extra" @@ -64,9 +64,9 @@ Warning: unlink(): phar error: "b/c.php" in phar "%srefcount1.phar.tar", has open file pointers, cannot unlink in %srefcount1.php on line %d object(PharFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> + [u"pathName":u"SplFileInfo":private]=> string(%d) "phar://%srefcount1.phar.tar/b" - ["fileName":"SplFileInfo":private]=> + [u"fileName":u"SplFileInfo":private]=> string(%s) "phar://%srefcount1.phar.tar/b/c.php" } string(5) "extra" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/tar_003.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/tar/tar_003.phpt diff -u php-src/ext/phar/tests/tar/tar_003.phpt:1.6 php-src/ext/phar/tests/tar/tar_003.phpt:1.7 --- php-src/ext/phar/tests/tar/tar_003.phpt:1.6 Thu May 15 16:09:21 2008 +++ php-src/ext/phar/tests/tar/tar_003.phpt Mon May 19 19:05:42 2008 @@ -14,7 +14,7 @@ $tar = new tarmaker($fname, 'none'); $tar->init(); -$tar->addFile('.phar/stub.php', "<?php // tar-based phar archive stub file\n__HALT_COMPILER();"); +$tar->addFile('.phar/stub.php', (binary)"<?php // tar-based phar archive stub file\n__HALT_COMPILER();"); $tar->addFile('tar_003.phpt', $g = fopen(__FILE__, 'r')); $tar->addFile('internal/file/here', "hi there!\n"); $tar->mkDir('internal/dir'); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/tar_004.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/tar/tar_004.phpt diff -u php-src/ext/phar/tests/tar/tar_004.phpt:1.3 php-src/ext/phar/tests/tar/tar_004.phpt:1.4 --- php-src/ext/phar/tests/tar/tar_004.phpt:1.3 Tue Feb 12 16:39:58 2008 +++ php-src/ext/phar/tests/tar/tar_004.phpt Mon May 19 19:05:42 2008 @@ -33,6 +33,6 @@ @unlink(dirname(__FILE__) . '/tar_004.phar.tar'); ?> --EXPECTF-- -string(9) "it worked" -string(%d) "phar://%star_004.phar.tar/tar_004.php" +unicode(9) "it worked" +unicode(%d) "phar://%star_004.phar.tar/tar_004.php" ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/tar_bz2.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/tar/tar_bz2.phpt diff -u php-src/ext/phar/tests/tar/tar_bz2.phpt:1.3 php-src/ext/phar/tests/tar/tar_bz2.phpt:1.4 --- php-src/ext/phar/tests/tar/tar_bz2.phpt:1.3 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/tar/tar_bz2.phpt Mon May 19 19:05:42 2008 @@ -47,8 +47,8 @@ @unlink(dirname(__FILE__) . '/tar_bz2.phar.tar'); ?> --EXPECTF-- -string(9) "it worked" -string(%d) "phar://%star_bz2.phar/tar_004.php" +unicode(9) "it worked" +unicode(%d) "phar://%star_bz2.phar/tar_004.php" bool(true) bool(true) ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/tar_gzip.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/tar/tar_gzip.phpt diff -u php-src/ext/phar/tests/tar/tar_gzip.phpt:1.4 php-src/ext/phar/tests/tar/tar_gzip.phpt:1.5 --- php-src/ext/phar/tests/tar/tar_gzip.phpt:1.4 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/tar/tar_gzip.phpt Mon May 19 19:05:42 2008 @@ -44,8 +44,8 @@ @unlink(dirname(__FILE__) . '/tar_gzip.phar.tar'); ?> --EXPECTF-- -string(9) "it worked" -string(%d) "phar://%star_gzip.phar/tar_004.php" +unicode(9) "it worked" +unicode(%d) "phar://%star_gzip.phar/tar_004.php" bool(true) bool(true) ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/files/make_invalid_tar.php.inc?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/tar/files/make_invalid_tar.php.inc diff -u php-src/ext/phar/tests/tar/files/make_invalid_tar.php.inc:1.1 php-src/ext/phar/tests/tar/files/make_invalid_tar.php.inc:1.2 --- php-src/ext/phar/tests/tar/files/make_invalid_tar.php.inc:1.1 Tue Feb 12 16:42:34 2008 +++ php-src/ext/phar/tests/tar/files/make_invalid_tar.php.inc Mon May 19 19:05:42 2008 @@ -3,7 +3,7 @@ class corrupter extends tarmaker { function close() { - fwrite($this->tmp, 'oopsie'); + fwrite($this->tmp, (binary)'oopsie'); fclose($this->tmp); } } \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/files/tarmaker.php.inc?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/tar/files/tarmaker.php.inc diff -u php-src/ext/phar/tests/tar/files/tarmaker.php.inc:1.1 php-src/ext/phar/tests/tar/files/tarmaker.php.inc:1.2 --- php-src/ext/phar/tests/tar/files/tarmaker.php.inc:1.1 Tue Feb 12 16:42:34 2008 +++ php-src/ext/phar/tests/tar/files/tarmaker.php.inc Mon May 19 19:05:42 2008 @@ -107,16 +107,16 @@ $checksum = pack('a8', sprintf('%6s ', decoct($checksum))); - fwrite($this->tmp, $block . $checksum . $blockend, 512); + fwrite($this->tmp, (binary)$block . $checksum . $blockend, 512); if (is_resource($fileOrStream)) { stream_copy_to_stream($fileOrStream, $this->tmp); if ($stat['size'] % 512) { - fwrite($this->tmp, str_repeat("\0", 512 - $stat['size'] % 512)); + fwrite($this->tmp, (binary)str_repeat("\0", 512 - $stat['size'] % 512)); } } else { - fwrite($this->tmp, $fileOrStream); + fwrite($this->tmp, (binary)$fileOrStream); if (strlen($fileOrStream) % 512) { - fwrite($this->tmp, str_repeat("\0", 512 - strlen($fileOrStream) % 512)); + fwrite($this->tmp, (binary)str_repeat("\0", 512 - strlen($fileOrStream) % 512)); } } } @@ -163,7 +163,7 @@ */ function close() { - fwrite($this->tmp, pack('a1024', '')); + fwrite($this->tmp, (binary)pack('a1024', '')); fclose($this->tmp); } } \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/all.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/phar/tests/zip/all.phpt diff -u php-src/ext/phar/tests/zip/all.phpt:1.2 php-src/ext/phar/tests/zip/all.phpt:1.3 --- php-src/ext/phar/tests/zip/all.phpt:1.2 Tue May 6 21:46:25 2008 +++ php-src/ext/phar/tests/zip/all.phpt Mon May 19 19:05:42 2008 @@ -53,10 +53,10 @@ bool(false) bool(true) bool(true) -string(6) "100444" +unicode(6) "100444" string(32) "<?php ok __HALT_COMPILER(); ?> " string(4) "hime" -string(8) "hi there" -string(6) "a meta" +unicode(8) "hi there" +unicode(6) "a meta" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller10.phar.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller10.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller10.phar.phpt:1.7 php-src/ext/phar/tests/zip/frontcontroller10.phar.phpt:1.8 --- php-src/ext/phar/tests/zip/frontcontroller10.phar.phpt:1.7 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller10.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller rewrite array invalid zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller4.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 Status: 403 Access Denied --EXPECT-- <html> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller11.phar.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller11.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller11.phar.phpt:1.8 php-src/ext/phar/tests/zip/frontcontroller11.phar.phpt:1.9 --- php-src/ext/phar/tests/zip/frontcontroller11.phar.phpt:1.8 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller11.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type extension is not a string zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller5.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.phar.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller12.phar.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller12.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller12.phar.phpt:1.8 php-src/ext/phar/tests/zip/frontcontroller12.phar.phpt:1.9 --- php-src/ext/phar/tests/zip/frontcontroller12.phar.phpt:1.8 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller12.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type unknown int zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller6.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.phar.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller13.phar.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller13.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller13.phar.phpt:1.8 php-src/ext/phar/tests/zip/frontcontroller13.phar.phpt:1.9 --- php-src/ext/phar/tests/zip/frontcontroller13.phar.phpt:1.8 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller13.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type not string/int zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller7.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.phar.php:2 Stack trace: http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller15.phar.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller15.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller15.phar.phpt:1.7 php-src/ext/phar/tests/zip/frontcontroller15.phar.phpt:1.8 --- php-src/ext/phar/tests/zip/frontcontroller15.phar.phpt:1.7 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller15.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type override, Phar::PHPS zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller16.phar.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller16.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller16.phar.phpt:1.7 php-src/ext/phar/tests/zip/frontcontroller16.phar.phpt:1.8 --- php-src/ext/phar/tests/zip/frontcontroller16.phar.phpt:1.7 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller16.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller mime type override, Phar::PHP zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller8.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- hio1 http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller2.phar.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller2.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller2.phar.phpt:1.7 php-src/ext/phar/tests/zip/frontcontroller2.phar.phpt:1.8 --- php-src/ext/phar/tests/zip/frontcontroller2.phar.phpt:1.7 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller2.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller PHP test zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -12,6 +12,6 @@ --FILE_EXTERNAL-- files/frontcontroller.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- hio http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller21.phar.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller21.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller21.phar.phpt:1.9 php-src/ext/phar/tests/zip/frontcontroller21.phar.phpt:1.10 --- php-src/ext/phar/tests/zip/frontcontroller21.phar.phpt:1.9 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller21.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller $_SERVER munging success zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -13,7 +13,7 @@ --FILE_EXTERNAL-- files/frontcontroller12.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECTF-- string(10) "/index.php" string(10) "/index.php" http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller3.phar.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller3.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller3.phar.phpt:1.7 php-src/ext/phar/tests/zip/frontcontroller3.phar.phpt:1.8 --- php-src/ext/phar/tests/zip/frontcontroller3.phar.phpt:1.7 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller3.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller phps zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -12,7 +12,7 @@ --FILE_EXTERNAL-- files/frontcontroller.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/frontcontroller9.phar.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/zip/frontcontroller9.phar.phpt diff -u php-src/ext/phar/tests/zip/frontcontroller9.phar.phpt:1.6 php-src/ext/phar/tests/zip/frontcontroller9.phar.phpt:1.7 --- php-src/ext/phar/tests/zip/frontcontroller9.phar.phpt:1.6 Tue May 13 19:18:11 2008 +++ php-src/ext/phar/tests/zip/frontcontroller9.phar.phpt Mon May 19 19:05:42 2008 @@ -1,7 +1,7 @@ --TEST-- Phar front controller rewrite array zip-based --INI-- -default_charset= +default_charset=UTF-8 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,7 +11,7 @@ --FILE_EXTERNAL-- files/frontcontroller3.phar.zip --EXPECTHEADERS-- -Content-type: text/html +Content-type: text/html; charset=UTF-8 --EXPECT-- <code><span style="color: #000000"> <span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/metadata_write_commit.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/zip/metadata_write_commit.phpt diff -u php-src/ext/phar/tests/zip/metadata_write_commit.phpt:1.3 php-src/ext/phar/tests/zip/metadata_write_commit.phpt:1.4 --- php-src/ext/phar/tests/zip/metadata_write_commit.phpt:1.3 Sat Apr 26 17:27:46 2008 +++ php-src/ext/phar/tests/zip/metadata_write_commit.phpt Mon May 19 19:05:42 2008 @@ -64,8 +64,8 @@ array(2) { [0]=> int(25) - ["foo"]=> - string(3) "bar" + [u"foo"]=> + unicode(3) "bar" } bool(true) string(1) "a" @@ -77,9 +77,9 @@ array(2) { [0]=> int(25) - ["foo"]=> - string(3) "bar" + [u"foo"]=> + unicode(3) "bar" } bool(true) -string(2) "hi" +unicode(2) "hi" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/open_for_write_existing.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/zip/open_for_write_existing.phpt diff -u php-src/ext/phar/tests/zip/open_for_write_existing.phpt:1.3 php-src/ext/phar/tests/zip/open_for_write_existing.phpt:1.4 --- php-src/ext/phar/tests/zip/open_for_write_existing.phpt:1.3 Mon Feb 11 20:55:42 2008 +++ php-src/ext/phar/tests/zip/open_for_write_existing.phpt Mon May 19 19:05:42 2008 @@ -26,7 +26,7 @@ $phar->stopBuffering(); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; ?> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/open_for_write_existing_b.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/zip/open_for_write_existing_b.phpt diff -u php-src/ext/phar/tests/zip/open_for_write_existing_b.phpt:1.4 php-src/ext/phar/tests/zip/open_for_write_existing_b.phpt:1.5 --- php-src/ext/phar/tests/zip/open_for_write_existing_b.phpt:1.4 Mon Feb 11 20:55:42 2008 +++ php-src/ext/phar/tests/zip/open_for_write_existing_b.phpt Mon May 19 19:05:42 2008 @@ -34,7 +34,7 @@ set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; ?> @@ -42,11 +42,10 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %spen_for_write_existing_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d -Warning: fclose(): supplied argument is not a valid stream resource in %spen_for_write_existing_b.php on line %d +Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_existing_b.php on line %d This is b/c -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/open_for_write_existing_c.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/zip/open_for_write_existing_c.phpt diff -u php-src/ext/phar/tests/zip/open_for_write_existing_c.phpt:1.4 php-src/ext/phar/tests/zip/open_for_write_existing_c.phpt:1.5 --- php-src/ext/phar/tests/zip/open_for_write_existing_c.phpt:1.4 Mon Feb 11 20:55:42 2008 +++ php-src/ext/phar/tests/zip/open_for_write_existing_c.phpt Mon May 19 19:05:42 2008 @@ -28,7 +28,7 @@ ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; ?> @@ -36,11 +36,10 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_c.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c.php on line %d This is b/c -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/open_for_write_newfile.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/zip/open_for_write_newfile.phpt diff -u php-src/ext/phar/tests/zip/open_for_write_newfile.phpt:1.3 php-src/ext/phar/tests/zip/open_for_write_newfile.phpt:1.4 --- php-src/ext/phar/tests/zip/open_for_write_newfile.phpt:1.3 Mon Feb 11 20:55:42 2008 +++ php-src/ext/phar/tests/zip/open_for_write_newfile.phpt Mon May 19 19:05:42 2008 @@ -26,7 +26,7 @@ $phar->stopBuffering(); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/open_for_write_newfile_b.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/zip/open_for_write_newfile_b.phpt diff -u php-src/ext/phar/tests/zip/open_for_write_newfile_b.phpt:1.4 php-src/ext/phar/tests/zip/open_for_write_newfile_b.phpt:1.5 --- php-src/ext/phar/tests/zip/open_for_write_newfile_b.phpt:1.4 Mon Feb 11 20:55:42 2008 +++ php-src/ext/phar/tests/zip/open_for_write_newfile_b.phpt Mon May 19 19:05:42 2008 @@ -34,7 +34,7 @@ set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; @@ -45,10 +45,9 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b.php on line %d This is b/c http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/open_for_write_newfile_c.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/phar/tests/zip/open_for_write_newfile_c.phpt diff -u php-src/ext/phar/tests/zip/open_for_write_newfile_c.phpt:1.4 php-src/ext/phar/tests/zip/open_for_write_newfile_c.phpt:1.5 --- php-src/ext/phar/tests/zip/open_for_write_newfile_c.phpt:1.4 Mon Feb 11 20:55:42 2008 +++ php-src/ext/phar/tests/zip/open_for_write_newfile_c.phpt Mon May 19 19:05:42 2008 @@ -28,7 +28,7 @@ ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, 'extra'); +fwrite($fp, (binary)'extra'); fclose($fp); include $alias . '/b/c.php'; @@ -39,10 +39,9 @@ --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- - Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c.php on line %d -Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d Warning: fclose(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c.php on line %d This is b/c @@ -51,4 +50,4 @@ Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/phar_begin_setstub_commit.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/zip/phar_begin_setstub_commit.phpt diff -u php-src/ext/phar/tests/zip/phar_begin_setstub_commit.phpt:1.6 php-src/ext/phar/tests/zip/phar_begin_setstub_commit.phpt:1.7 --- php-src/ext/phar/tests/zip/phar_begin_setstub_commit.phpt:1.6 Fri May 2 05:05:54 2008 +++ php-src/ext/phar/tests/zip/phar_begin_setstub_commit.phpt Mon May 19 19:05:42 2008 @@ -49,16 +49,16 @@ bool(true) bool(true) bool(false) -string(5) "Hello" +unicode(5) "Hello" string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " -string(5) "World" +unicode(5) "World" string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " ===COMMIT=== bool(true) -string(5) "Hello" -string(5) "World" +unicode(5) "Hello" +unicode(5) "World" string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> " string(93) "<?php var_dump("First resource"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?> http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/phar_buildfromiterator5.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/zip/phar_buildfromiterator5.phpt diff -u php-src/ext/phar/tests/zip/phar_buildfromiterator5.phpt:1.3 php-src/ext/phar/tests/zip/phar_buildfromiterator5.phpt:1.4 --- php-src/ext/phar/tests/zip/phar_buildfromiterator5.phpt:1.3 Mon Jan 28 16:31:55 2008 +++ php-src/ext/phar/tests/zip/phar_buildfromiterator5.phpt Mon May 19 19:05:42 2008 @@ -54,6 +54,6 @@ rewind valid current -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned an invalid value (must return a string) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/phar_buildfromiterator6.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/zip/phar_buildfromiterator6.phpt diff -u php-src/ext/phar/tests/zip/phar_buildfromiterator6.phpt:1.3 php-src/ext/phar/tests/zip/phar_buildfromiterator6.phpt:1.4 --- php-src/ext/phar/tests/zip/phar_buildfromiterator6.phpt:1.3 Mon Jan 28 16:31:55 2008 +++ php-src/ext/phar/tests/zip/phar_buildfromiterator6.phpt Mon May 19 19:05:42 2008 @@ -55,6 +55,6 @@ valid current key -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned an invalid key (must return a string) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/phar_buildfromiterator7.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/phar/tests/zip/phar_buildfromiterator7.phpt diff -u php-src/ext/phar/tests/zip/phar_buildfromiterator7.phpt:1.3 php-src/ext/phar/tests/zip/phar_buildfromiterator7.phpt:1.4 --- php-src/ext/phar/tests/zip/phar_buildfromiterator7.phpt:1.3 Mon Jan 28 16:31:55 2008 +++ php-src/ext/phar/tests/zip/phar_buildfromiterator7.phpt Mon May 19 19:05:42 2008 @@ -55,6 +55,6 @@ valid current key -string(24) "UnexpectedValueException" +unicode(24) "UnexpectedValueException" Iterator myIterator returned a file that could not be opened "phar_buildfromiterator7./oopsie/there.phpt" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/phar_convert_phar.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/phar/tests/zip/phar_convert_phar.phpt diff -u php-src/ext/phar/tests/zip/phar_convert_phar.phpt:1.13 php-src/ext/phar/tests/zip/phar_convert_phar.phpt:1.14 --- php-src/ext/phar/tests/zip/phar_convert_phar.phpt:1.13 Wed May 14 21:27:31 2008 +++ php-src/ext/phar/tests/zip/phar_convert_phar.phpt Mon May 19 19:05:42 2008 @@ -46,12 +46,12 @@ ?> --EXPECT-- bool(false) -int(6659) +int(6683) bool(true) string(60) "<?php // zip-based phar archive stub file __HALT_COMPILER();" bool(true) -int(6659) +int(6683) bool(true) -int(6659) +int(6683) ===DONE===