From 74cb7eb573288e15a13068baeaf63535266e114b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= Date: Sun, 6 Nov 2016 22:28:42 +0100 Subject: [PATCH 1/8] Remove b prefix from tests unrelated to it --- ext/dom/tests/domxpath.phpt | 2 +- ext/hash/tests/hash_copy_001.phpt | 6 +- ext/iconv/tests/iconv_basic.phpt | 6 +- .../tests/iconv_mime_decode_variation1.phpt | 2 +- .../tests/iconv_mime_decode_variation2.phpt | 2 +- .../tests/iconv_mime_decode_variation3.phpt | 2 +- ext/iconv/tests/iconv_strlen_basic.phpt | 4 +- ext/iconv/tests/iconv_strpos_basic.phpt | 10 ++-- ext/iconv/tests/iconv_strpos_variation3.phpt | 4 +- .../tests/iconv_strpos_variation3_64bit.phpt | 4 +- ext/iconv/tests/iconv_strpos_variation4.phpt | 4 +- ext/iconv/tests/iconv_strpos_variation5.phpt | 8 +-- ext/iconv/tests/iconv_strrpos_basic.phpt | 12 ++-- ext/iconv/tests/iconv_strrpos_variation3.phpt | 4 +- ext/iconv/tests/iconv_substr_basic.phpt | 4 +- ext/imap/tests/imap_base64_basic.phpt | 6 +- ext/imap/tests/imap_binary_basic.phpt | 8 +-- ext/mbstring/tests/bug43840.phpt | 2 +- ext/mbstring/tests/bug43841.phpt | 4 +- .../tests/mb_convert_encoding_variation1.phpt | 2 +- ext/mbstring/tests/mb_ereg.phpt | 10 ++-- ext/mbstring/tests/mb_ereg_basic.phpt | 6 +- ext/mbstring/tests/mb_ereg_error.phpt | 6 +- ext/mbstring/tests/mb_ereg_match_basic.phpt | 8 +-- ext/mbstring/tests/mb_ereg_match_error1.phpt | 6 +- ext/mbstring/tests/mb_ereg_replace_basic.phpt | 10 ++-- ext/mbstring/tests/mb_ereg_replace_error.phpt | 10 ++-- ext/mbstring/tests/mb_ereg_variation3.phpt | 24 ++++---- ext/mbstring/tests/mb_ereg_variation4.phpt | 26 ++++----- ext/mbstring/tests/mb_ereg_variation5.phpt | 4 +- ext/mbstring/tests/mb_ereg_variation6.phpt | 20 +++---- ext/mbstring/tests/mb_ereg_variation7.phpt | 4 +- ext/mbstring/tests/mb_split.phpt | 8 +-- ext/mbstring/tests/mb_stripos.phpt | 52 +++++++++--------- ext/mbstring/tests/mb_stripos_basic.phpt | 22 ++++---- ext/mbstring/tests/mb_stripos_basic2.phpt | 14 ++--- ext/mbstring/tests/mb_stripos_error1.phpt | 6 +- ext/mbstring/tests/mb_stripos_error2.phpt | 4 +- ext/mbstring/tests/mb_stripos_variation1.phpt | 2 +- ext/mbstring/tests/mb_stripos_variation2.phpt | 6 +- ext/mbstring/tests/mb_stripos_variation3.phpt | 4 +- ext/mbstring/tests/mb_stripos_variation4.phpt | 4 +- .../tests/mb_stripos_variation5_Bug45923.phpt | 4 +- ext/mbstring/tests/mb_stristr_basic.phpt | 8 +-- ext/mbstring/tests/mb_stristr_error1.phpt | 6 +- ext/mbstring/tests/mb_stristr_error2.phpt | 4 +- ext/mbstring/tests/mb_stristr_variation1.phpt | 6 +- ext/mbstring/tests/mb_stristr_variation2.phpt | 6 +- ext/mbstring/tests/mb_stristr_variation3.phpt | 8 +-- ext/mbstring/tests/mb_stristr_variation4.phpt | 4 +- ext/mbstring/tests/mb_stristr_variation5.phpt | 8 +-- ext/mbstring/tests/mb_strlen_basic.phpt | 2 +- ext/mbstring/tests/mb_strlen_variation1.phpt | 8 +-- ext/mbstring/tests/mb_strpos.phpt | 52 +++++++++--------- ext/mbstring/tests/mb_strpos_basic.phpt | 4 +- ext/mbstring/tests/mb_strpos_variation2.phpt | 10 ++-- ext/mbstring/tests/mb_strpos_variation3.phpt | 4 +- ext/mbstring/tests/mb_strpos_variation4.phpt | 4 +- ext/mbstring/tests/mb_strpos_variation5.phpt | 4 +- ext/mbstring/tests/mb_strrchr_basic.phpt | 10 ++-- ext/mbstring/tests/mb_strrchr_error1.phpt | 6 +- ext/mbstring/tests/mb_strrchr_error2.phpt | 4 +- ext/mbstring/tests/mb_strrchr_variation1.phpt | 6 +- ext/mbstring/tests/mb_strrchr_variation2.phpt | 6 +- ext/mbstring/tests/mb_strrchr_variation3.phpt | 8 +-- ext/mbstring/tests/mb_strrchr_variation4.phpt | 4 +- ext/mbstring/tests/mb_strrchr_variation5.phpt | 4 +- ext/mbstring/tests/mb_strrchr_variation6.phpt | 8 +-- ext/mbstring/tests/mb_strrichr_basic.phpt | 10 ++-- ext/mbstring/tests/mb_strrichr_error1.phpt | 6 +- ext/mbstring/tests/mb_strrichr_error2.phpt | 4 +- .../tests/mb_strrichr_variation1.phpt | 6 +- .../tests/mb_strrichr_variation2.phpt | 6 +- .../tests/mb_strrichr_variation3.phpt | 4 +- .../tests/mb_strrichr_variation4.phpt | 4 +- .../tests/mb_strrichr_variation5.phpt | 8 +-- ext/mbstring/tests/mb_strripos_basic.phpt | 22 ++++---- ext/mbstring/tests/mb_strripos_basic2.phpt | 14 ++--- ext/mbstring/tests/mb_strripos_error1.phpt | 6 +- ext/mbstring/tests/mb_strripos_error2.phpt | 4 +- .../tests/mb_strripos_variation1.phpt | 6 +- .../tests/mb_strripos_variation2.phpt | 10 ++-- .../mb_strripos_variation3_Bug45923.phpt | 12 ++-- .../tests/mb_strripos_variation4.phpt | 4 +- .../mb_strripos_variation5_Bug45923.phpt | 4 +- ext/mbstring/tests/mb_strrpos_basic.phpt | 6 +- ext/mbstring/tests/mb_strrpos_variation1.phpt | 10 ++-- ext/mbstring/tests/mb_strrpos_variation3.phpt | 8 +-- ext/mbstring/tests/mb_strrpos_variation4.phpt | 4 +- ext/mbstring/tests/mb_strstr_basic.phpt | 10 ++-- ext/mbstring/tests/mb_strstr_error1.phpt | 6 +- ext/mbstring/tests/mb_strstr_error2.phpt | 4 +- ext/mbstring/tests/mb_strstr_variation1.phpt | 6 +- ext/mbstring/tests/mb_strstr_variation2.phpt | 6 +- ext/mbstring/tests/mb_strstr_variation3.phpt | 8 +-- ext/mbstring/tests/mb_strstr_variation4.phpt | 4 +- ext/mbstring/tests/mb_strstr_variation5.phpt | 4 +- ext/mbstring/tests/mb_strstr_variation6.phpt | 8 +-- .../tests/mb_strtolower_variation2.phpt | 2 +- .../tests/mb_strtolower_variation4.phpt | 4 +- ext/mbstring/tests/mb_strtoupper_basic.phpt | 4 +- .../tests/mb_strtoupper_variation2.phpt | 2 +- .../tests/mb_strtoupper_variation4.phpt | 4 +- ext/mbstring/tests/mb_substr.phpt | 2 +- .../tests/mb_substr_count_variation3.phpt | 4 +- .../tests/mb_substr_count_variation4.phpt | 4 +- ext/mbstring/tests/mb_substr_variation2.phpt | 2 +- ext/mbstring/tests/mb_substr_variation4.phpt | 2 +- ext/mbstring/tests/mb_substr_variation5.phpt | 2 +- ext/mbstring/tests/mb_substr_variation6.phpt | 2 +- ext/mbstring/tests/mb_substr_variation7.phpt | 2 +- ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt | 20 +++---- ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt | 20 +++---- ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt | 18 +++--- ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt | 16 +++--- .../tests/mcrypt_decrypt_variation1.phpt | 6 +- .../tests/mcrypt_decrypt_variation2.phpt | 8 +-- .../tests/mcrypt_decrypt_variation3.phpt | 8 +-- .../tests/mcrypt_decrypt_variation4.phpt | 6 +- .../tests/mcrypt_decrypt_variation5.phpt | 8 +-- ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt | 20 +++---- ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt | 20 +++---- ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt | 20 +++---- ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt | 18 +++--- .../tests/mcrypt_encrypt_variation1.phpt | 6 +- .../tests/mcrypt_encrypt_variation2.phpt | 8 +-- .../tests/mcrypt_encrypt_variation3.phpt | 8 +-- .../tests/mcrypt_encrypt_variation4.phpt | 6 +- .../tests/mcrypt_encrypt_variation5.phpt | 8 +-- .../tests/mcrypt_rijndael128_128BitKey.phpt | 16 +++--- .../tests/mcrypt_rijndael128_256BitKey.phpt | 14 ++--- ext/mysqli/tests/061.phpt | 2 +- ext/mysqli/tests/mysqli_info.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_bind_result.phpt | 4 +- .../tests/mysqli_stmt_get_result_types.phpt | 4 +- ext/pcntl/tests/pcntl_exec_2.phpt | 6 +- ext/pcre/tests/invalid_utf8_offset.phpt | 6 +- .../tests/pdo_mysql_exec_load_data.phpt | 4 +- .../tests/pdo_mysql_prepare_load_data.phpt | 4 +- ext/phar/tests/009.phpt | 2 +- ext/phar/tests/010.phpt | 4 +- ext/phar/tests/014.phpt | 2 +- ext/phar/tests/016.phpt | 6 +- ext/phar/tests/017U.phpt | 2 +- ext/phar/tests/018U.phpt | 2 +- ext/phar/tests/019.phpt | 2 +- ext/phar/tests/019bU.phpt | 2 +- ext/phar/tests/019cU.phpt | 2 +- ext/phar/tests/020.phpt | 2 +- ext/phar/tests/021.phpt | 2 +- ext/phar/tests/027U.phpt | 4 +- ext/phar/tests/033a.phpt | 2 +- .../cache_list/files/frontcontroller12.phar | Bin 588 -> 581 bytes .../files/frontcontroller12.phar.inc | 14 ++--- .../cache_list/files/frontcontroller14.phar | Bin 450 -> 448 bytes .../files/frontcontroller14.phar.inc | 4 +- .../cache_list/files/frontcontroller3.phar | Bin 437 -> 436 bytes .../files/frontcontroller3.phar.inc | 2 +- .../cache_list/files/frontcontroller4.phar | Bin 433 -> 432 bytes .../files/frontcontroller4.phar.inc | 2 +- .../cache_list/files/frontcontroller8.phar | Bin 8970 -> 8968 bytes .../files/frontcontroller8.phar.inc | 2 +- ext/phar/tests/cache_list/files/write24.phar | Bin 327 -> 326 bytes .../tests/cache_list/files/write24.phar.inc | 2 +- ext/phar/tests/create_new_and_modify.phpt | 6 +- ext/phar/tests/files/frontcontroller12.phar | Bin 588 -> 581 bytes .../tests/files/frontcontroller12.phar.inc | 14 ++--- ext/phar/tests/files/frontcontroller14.phar | Bin 450 -> 448 bytes .../tests/files/frontcontroller14.phar.inc | 4 +- ext/phar/tests/files/frontcontroller3.phar | Bin 438 -> 436 bytes .../tests/files/frontcontroller3.phar.inc | 2 +- ext/phar/tests/files/frontcontroller4.phar | Bin 433 -> 432 bytes .../tests/files/frontcontroller4.phar.inc | 2 +- ext/phar/tests/files/frontcontroller8.phar | Bin 8970 -> 8968 bytes .../tests/files/frontcontroller8.phar.inc | 2 +- ext/phar/tests/fopen_edgecases2.phpt | 6 +- ext/phar/tests/fopen_edgecases2U.phpt | 6 +- ext/phar/tests/open_for_write_existing.phpt | 2 +- ext/phar/tests/open_for_write_newfile.phpt | 2 +- ext/phar/tests/phar_ctx_001.phpt | 8 +-- ext/phar/tests/phar_oo_compressed_002.phpt | 8 +-- ext/phar/tests/phar_oo_compressed_002b.phpt | 8 +-- ext/phar/tests/phar_stub.phpt | 4 +- ext/phar/tests/phar_stub_error.phpt | 2 +- ext/phar/tests/phar_stub_write.phpt | 2 +- ext/phar/tests/phar_stub_write_file.phpt | 2 +- ext/phar/tests/refcount1.phpt | 4 +- ext/phar/tests/rmdir.phpt | 2 +- .../tar/files/frontcontroller12.phar.inc | 14 ++--- .../tar/files/frontcontroller12.phar.tar | Bin 4096 -> 4096 bytes .../tests/tar/files/frontcontroller3.phar.inc | 2 +- .../tests/tar/files/frontcontroller3.phar.tar | Bin 6144 -> 6144 bytes .../tests/tar/files/frontcontroller4.phar.inc | 2 +- .../tests/tar/files/frontcontroller4.phar.tar | Bin 6144 -> 6144 bytes .../tests/tar/open_for_write_existing.phpt | 2 +- .../tests/tar/open_for_write_existing_b.phpt | 2 +- .../tar/open_for_write_existing_c_5_2.phpt | 2 +- .../tests/tar/open_for_write_newfile.phpt | 2 +- .../tar/open_for_write_newfile_b_5_2.phpt | 2 +- .../tar/open_for_write_newfile_c_5_2.phpt | 2 +- ext/phar/tests/tar/phar_stub.phpt | 6 +- ext/phar/tests/tar/refcount1.phpt | 2 +- .../zip/files/frontcontroller12.phar.inc | 14 ++--- .../zip/files/frontcontroller12.phar.zip | Bin 793 -> 964 bytes .../tests/zip/files/frontcontroller3.phar.inc | 2 +- .../tests/zip/files/frontcontroller3.phar.zip | Bin 818 -> 994 bytes .../tests/zip/files/frontcontroller4.phar.inc | 2 +- .../tests/zip/files/frontcontroller4.phar.zip | Bin 813 -> 990 bytes .../tests/zip/open_for_write_existing.phpt | 2 +- .../tests/zip/open_for_write_existing_b.phpt | 2 +- .../tests/zip/open_for_write_existing_c.phpt | 2 +- .../tests/zip/open_for_write_newfile.phpt | 2 +- .../tests/zip/open_for_write_newfile_b.phpt | 2 +- .../tests/zip/open_for_write_newfile_c.phpt | 2 +- ext/phar/tests/zip/phar_stub.phpt | 6 +- ext/phar/tests/zip/refcount1.phpt | 2 +- ext/simplexml/tests/bug38406.phpt | 4 +- ext/spl/tests/iterator_006.phpt | 2 +- ext/spl/tests/multiple_iterator_001.phpt | 2 +- ext/standard/tests/array/bug14580.phpt | 2 +- ext/standard/tests/array/bug44929.phpt | 2 +- ext/standard/tests/bug49244.phpt | 2 +- .../tests/file/005_variation-win32.phpt | 2 +- ext/standard/tests/file/007_variation15.phpt | 2 +- ext/standard/tests/file/007_variation23.phpt | 2 +- ext/standard/tests/file/007_variation7.phpt | 2 +- ext/standard/tests/file/bug27508.phpt | 6 +- ext/standard/tests/file/bug38450.phpt | 6 +- ext/standard/tests/file/bug38450_1.phpt | 6 +- ext/standard/tests/file/bug43008.phpt | 14 ++--- ext/standard/tests/file/copy_variation1.phpt | 2 +- ext/standard/tests/file/copy_variation10.phpt | 2 +- ext/standard/tests/file/copy_variation11.phpt | 2 +- ext/standard/tests/file/copy_variation14.phpt | 2 +- ext/standard/tests/file/copy_variation15.phpt | 2 +- .../tests/file/copy_variation16-win32.phpt | 2 +- ext/standard/tests/file/copy_variation17.phpt | 2 +- .../tests/file/copy_variation2-win32-mb.phpt | 2 +- .../tests/file/copy_variation2-win32.phpt | 2 +- ext/standard/tests/file/copy_variation2.phpt | 2 +- .../tests/file/copy_variation3-win32.phpt | 2 +- ext/standard/tests/file/copy_variation3.phpt | 2 +- ext/standard/tests/file/copy_variation4.phpt | Bin 4966 -> 4965 bytes .../tests/file/copy_variation5-win32.phpt | 2 +- ext/standard/tests/file/copy_variation5.phpt | 2 +- ext/standard/tests/file/copy_variation7.phpt | 2 +- ext/standard/tests/file/copy_variation9.phpt | 2 +- .../file_get_contents_variation5_32bit.phpt | 2 +- .../file_get_contents_variation5_64bit.phpt | 2 +- .../file/file_get_contents_variation9.phpt | 2 +- ext/standard/tests/file/fseek_variation3.phpt | 2 +- ext/standard/tests/file/include_streams.phpt | 2 +- .../tests/file/move_uploaded_file_basic.phpt | 2 +- ext/standard/tests/file/pathinfo_basic.phpt | 2 +- ext/standard/tests/file/proc_open01.phpt | 2 +- .../tests/file/realpath_basic-win32-mb.phpt | 2 +- .../tests/file/realpath_basic-win32.phpt | 2 +- ext/standard/tests/file/stream_get_line.phpt | 2 +- ext/standard/tests/file/userfilters.phpt | 2 +- ext/standard/tests/filters/filter_errors.inc | 4 +- .../tests/filters/filter_errors_user.phpt | 6 +- .../filters/filter_errors_zlib_inflate.phpt | 2 +- ext/standard/tests/http/server.inc | 8 +-- ext/standard/tests/mail/ezmlm_hash_basic.phpt | 4 +- .../tests/mail/ezmlm_hash_basic_64bit.phpt | 4 +- ext/standard/tests/network/bug20134.phpt | 2 +- ext/standard/tests/network/inet.phpt | 16 +++--- ext/standard/tests/serialize/bug43614.phpt | 2 +- ext/standard/tests/streams/bug44818.phpt | 2 +- ext/standard/tests/streams/bug46426.phpt | 2 +- ext/standard/tests/streams/bug48309.phpt | 2 +- .../streams/stream_copy_to_stream_socket.phpt | 2 +- .../streams/stream_get_contents_001.phpt | 2 +- .../streams/stream_get_contents_002.phpt | 2 +- .../tests/streams/stream_get_line_nb.phpt | 18 +++--- .../tests/streams/stream_socket_pair.phpt | 4 +- ext/standard/tests/strings/bug44703.phpt | 22 ++++---- ext/standard/tests/strings/bug51059.phpt | 4 +- .../tests/strings/convert_uuencode_basic.phpt | 20 +++---- .../strings/crypt_blowfish_variation1.phpt | 18 +++--- .../strings/crypt_blowfish_variation2.phpt | 2 +- ext/standard/tests/strings/crypt_sha256.phpt | 48 ++++++++-------- ext/standard/tests/strings/crypt_sha512.phpt | 48 ++++++++-------- .../tests/strings/htmlentities-utf-2.phpt | 8 +-- .../tests/strings/htmlentities-utf.phpt | 8 +-- .../tests/strings/htmlentities01.phpt | 4 +- .../tests/strings/htmlentities24.phpt | 2 +- .../tests/strings/htmlspecialchars.phpt | 2 +- .../htmlspecialchars_decode_variation6.phpt | Bin 1523 -> 1522 bytes .../tests/strings/join_variation6.phpt | Bin 729 -> 728 bytes ext/standard/tests/strings/md5_basic1.phpt | 2 +- ext/standard/tests/strings/md5_basic2.phpt | 2 +- .../quoted_printable_decode_error.phpt | 2 +- ext/standard/tests/strings/sha1_file.phpt | 2 +- .../tests/strings/strip_tags_variation6.phpt | 2 +- ext/standard/tests/strings/stristr_basic.phpt | 2 +- ext/standard/tests/url/bug47174.phpt | 4 +- ext/xmlrpc/tests/bug50285.phpt | 4 +- ext/zlib/tests/gzfile_basic.phpt | 2 +- ext/zlib/tests/gzfile_basic2.phpt | 2 +- ext/zlib/tests/gzreadgzwrite.phpt | 2 +- ext/zlib/tests/gzreadgzwriteplain.phpt | 2 +- ext/zlib/tests/gzrewind_variation1.phpt | 4 +- ext/zlib/tests/gztell_basic2.phpt | 2 +- ext/zlib/tests/gzwrite_variation1.phpt | 2 +- ext/zlib/tests/readgzfile_basic.phpt | 2 +- ext/zlib/tests/readgzfile_basic2.phpt | 2 +- ext/zlib/tests/zlib_filter_inflate2.phpt | 2 +- 308 files changed, 866 insertions(+), 866 deletions(-) diff --git a/ext/dom/tests/domxpath.phpt b/ext/dom/tests/domxpath.phpt index 82396b5218162..e63c96ba93551 100644 --- a/ext/dom/tests/domxpath.phpt +++ b/ext/dom/tests/domxpath.phpt @@ -21,7 +21,7 @@ function MyAverage($nodelist) { } $dom = new DOMDocument; -$dom->loadXML(b'myval'); +$dom->loadXML('myval'); $xpath = new DOMXPath($dom); diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt index b33d4497628dd..cd1af4de0994b 100644 --- a/ext/hash/tests/hash_copy_001.phpt +++ b/ext/hash/tests/hash_copy_001.phpt @@ -10,7 +10,7 @@ $algos = hash_algos(); foreach ($algos as $algo) { var_dump($algo); $orig = hash_init($algo); - hash_update($orig, b"I can't remember anything"); + hash_update($orig, "I can't remember anything"); $copy = hash_copy($orig); var_dump(hash_final($orig)); @@ -20,11 +20,11 @@ foreach ($algos as $algo) { foreach ($algos as $algo) { var_dump($algo); $orig = hash_init($algo); - hash_update($orig, b"I can't remember anything"); + hash_update($orig, "I can't remember anything"); $copy = hash_copy($orig); var_dump(hash_final($orig)); - hash_update($copy, b"Can’t tell if this is true or dream"); + hash_update($copy, "Can’t tell if this is true or dream"); var_dump(hash_final($copy)); } diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt index e0e2cb206167b..8669af040c24d 100644 --- a/ext/iconv/tests/iconv_basic.phpt +++ b/ext/iconv/tests/iconv_basic.phpt @@ -19,9 +19,9 @@ function_exists('iconv') or die("skip iconv() is not available in this build"); echo "*** Testing iconv() : basic functionality ***\n"; //All strings are the same when displayed in their respective encodings -$sjis_string = base64_decode(b'k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg=='); -$euc_jp_string = base64_decode(b'xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow=='); -$utf8_string = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); +$sjis_string = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg=='); +$euc_jp_string = base64_decode('xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow=='); +$utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- Convert to EUC-JP --\n"; echo "Expected EUC-JP encoded string in base64:\n"; diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt index a42b0de234051..4d91d68add687 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt @@ -19,7 +19,7 @@ function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not ava echo "*** Testing iconv_mime_decode() : usage variations ***\n"; // Initialise function arguments not being substituted -$header = b'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?='; +$header = 'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?='; $mode = ICONV_MIME_DECODE_CONTINUE_ON_ERROR; $charset = 'ISO-8859-1'; diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt index 8a3134edacd2e..f4508e986039e 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt @@ -20,7 +20,7 @@ function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not ava echo "*** Testing iconv_mime_decode() : usage variations ***\n"; // Initialise function arguments not being substituted -$header = b'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?='; +$header = 'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?='; $mode = ICONV_MIME_DECODE_CONTINUE_ON_ERROR; $charset = 'UTF-8'; diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt index cd5c719cbbbb1..c077aa10fa121 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt @@ -22,7 +22,7 @@ echo "*** Testing iconv_mime_decode() : usage variations ***\n"; // Some of the parameters actually passed to charset will request to use // a default charset determined by the platform. In order for this test to // run on both linux and windows, the subject will have to be ascii only. -$header = b'Subject: =?UTF-8?B?QSBTYW1wbGUgVGVzdA==?='; +$header = 'Subject: =?UTF-8?B?QSBTYW1wbGUgVGVzdA==?='; $mode = ICONV_MIME_DECODE_CONTINUE_ON_ERROR; $charset = 'UTF-8'; diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt index 5777435d615ba..e5d6271f69aac 100644 --- a/ext/iconv/tests/iconv_strlen_basic.phpt +++ b/ext/iconv/tests/iconv_strlen_basic.phpt @@ -18,9 +18,9 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in echo "*** Testing iconv_strlen() : basic functionality***\n"; -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; //Japanese string in UTF-8 -$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); +$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII String --\n"; var_dump(iconv_strlen($string_ascii)); diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt index 25f8f1b1fd0ef..1017f8e3b6f54 100644 --- a/ext/iconv/tests/iconv_strpos_basic.phpt +++ b/ext/iconv/tests/iconv_strpos_basic.phpt @@ -22,22 +22,22 @@ echo "*** Testing iconv_strpos() : basic functionality***\n"; iconv_set_encoding("internal_encoding", "UTF-8"); -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; //Japanese string in UTF-8 -$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); +$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string 1 --\n"; -var_dump(iconv_strpos($string_ascii, b'd', 2, 'ISO-8859-1')); +var_dump(iconv_strpos($string_ascii, 'd', 2, 'ISO-8859-1')); echo "\n-- ASCII string 2 --\n"; -var_dump(iconv_strpos($string_ascii, b'123')); +var_dump(iconv_strpos($string_ascii, '123')); echo "\n-- Multibyte string 1 --\n"; $needle1 = base64_decode('5pel5pys6Kqe'); var_dump(iconv_strpos($string_mb, $needle1)); echo "\n-- Multibyte string 2 --\n"; -$needle2 = base64_decode(b"44GT44KT44Gr44Gh44Gv44CB5LiW55WM"); +$needle2 = base64_decode("44GT44KT44Gr44Gh44Gv44CB5LiW55WM"); var_dump(iconv_strpos($string_mb, $needle2)); echo "Done"; diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt index 6f27b74a52e31..ea889a07bd0c8 100644 --- a/ext/iconv/tests/iconv_strpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strpos_variation3.phpt @@ -20,8 +20,8 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing iconv_strpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'a'; -$haystack = b'string_val'; +$needle = 'a'; +$haystack = 'string_val'; $encoding = 'utf-8'; //get an unset variable diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt index 2704493235253..c4e3e141a11e1 100644 --- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt +++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt @@ -20,8 +20,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing iconv_strpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'a'; -$haystack = b'string_val'; +$needle = 'a'; +$haystack = 'string_val'; $encoding = 'utf-8'; //get an unset variable diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt index 43ab3e5781042..539305541ada9 100644 --- a/ext/iconv/tests/iconv_strpos_variation4.phpt +++ b/ext/iconv/tests/iconv_strpos_variation4.phpt @@ -21,8 +21,8 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in echo "*** Testing iconv_strpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; -$needle = b'val'; +$haystack = 'string_val'; +$needle = 'val'; $offset = 0; //get an unset variable diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt index fcd5aaecae15f..759294f73a9fb 100644 --- a/ext/iconv/tests/iconv_strpos_variation5.phpt +++ b/ext/iconv/tests/iconv_strpos_variation5.phpt @@ -24,11 +24,11 @@ iconv_set_encoding("internal_encoding", "UTF-8"); echo "*** Testing iconv_strpos() : usage variations ***\n"; -$string_ascii = b'+Is an English string'; //21 chars -$needle_ascii = b'g'; +$string_ascii = '+Is an English string'; //21 chars +$needle_ascii = 'g'; -$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars -$needle_mb = base64_decode(b'44CC'); +$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars +$needle_mb = base64_decode('44CC'); /* * Loop through integers as multiples of ten for $offset argument diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt index 3d34a23f11645..78dfaa0db1e8f 100644 --- a/ext/iconv/tests/iconv_strrpos_basic.phpt +++ b/ext/iconv/tests/iconv_strrpos_basic.phpt @@ -22,22 +22,22 @@ echo "*** Testing iconv_strrpos() : basic ***\n"; iconv_set_encoding("internal_encoding", "UTF-8"); -$string_ascii = b'This is an English string. 0123456789.'; +$string_ascii = 'This is an English string. 0123456789.'; //Japanese string in UTF-8 -$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); +$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string 1 --\n"; -var_dump(iconv_strrpos($string_ascii, b'is', 'ISO-8859-1')); +var_dump(iconv_strrpos($string_ascii, 'is', 'ISO-8859-1')); echo "\n-- ASCII string 2 --\n"; -var_dump(iconv_strrpos($string_ascii, b'hello, world')); +var_dump(iconv_strrpos($string_ascii, 'hello, world')); echo "\n-- Multibyte string 1 --\n"; -$needle1 = base64_decode(b'44CC'); +$needle1 = base64_decode('44CC'); var_dump(iconv_strrpos($string_mb, $needle1)); echo "\n-- Multibyte string 2 --\n"; -$needle2 = base64_decode(b'44GT44KT44Gr44Gh44Gv44CB5LiW55WM'); +$needle2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM'); var_dump(iconv_strrpos($string_mb, $needle2)); echo "Done"; diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt index 87a21bd7a4837..373e905173ce2 100644 --- a/ext/iconv/tests/iconv_strrpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt @@ -20,8 +20,8 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i echo "*** Testing iconv_strrpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'hello, world'; -$needle = b'world'; +$haystack = 'hello, world'; +$needle = 'world'; //get an unset variable $unset_var = 10; diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt index 0754fc8779dab..2e33c5aa9b35c 100644 --- a/ext/iconv/tests/iconv_substr_basic.phpt +++ b/ext/iconv/tests/iconv_substr_basic.phpt @@ -22,9 +22,9 @@ iconv.output_encoding=ISO-8859-1 echo "*** Testing iconv_substr() : basic functionality ***\n"; -$string_ascii = b'ABCDEF'; +$string_ascii = 'ABCDEF'; //Japanese string in UTF-8 -$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); +$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string 1 --\n"; var_dump(bin2hex(iconv_substr($string_ascii, 3))); diff --git a/ext/imap/tests/imap_base64_basic.phpt b/ext/imap/tests/imap_base64_basic.phpt index a64be276d901e..f5cc6039f3443 100644 --- a/ext/imap/tests/imap_base64_basic.phpt +++ b/ext/imap/tests/imap_base64_basic.phpt @@ -13,7 +13,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build echo "*** Testing imap_base64() : basic functionality ***\n"; -$str = b'This is an example string to be base 64 encoded'; +$str = 'This is an example string to be base 64 encoded'; $base64 = base64_encode($str); if (imap_base64($base64) == $str) { echo "TEST PASSED\n"; @@ -21,7 +21,7 @@ if (imap_base64($base64) == $str) { echo "TEST FAILED"; } -$str = b'!£$%^&*()_+-={][];;@~#?/>.<,'; +$str = '!£$%^&*()_+-={][];;@~#?/>.<,'; $base64 = base64_encode($str); if (imap_base64($base64) == $str) { echo "TEST PASSED\n"; @@ -29,7 +29,7 @@ if (imap_base64($base64) == $str) { echo "TEST FAILED"; } -$hex = b'x00\x01\x02\x03\x04\x05\x06\xFA\xFB\xFC\xFD\xFE\xFF'; +$hex = 'x00\x01\x02\x03\x04\x05\x06\xFA\xFB\xFC\xFD\xFE\xFF'; $base64 = base64_encode($hex); if (imap_base64($base64) == $hex) { echo "TEST PASSED\n"; diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt index bd4eabba513f1..3deb51a6a6cdb 100644 --- a/ext/imap/tests/imap_binary_basic.phpt +++ b/ext/imap/tests/imap_binary_basic.phpt @@ -14,22 +14,22 @@ extension_loaded('imap') or die('skip imap extension not available in this build echo "*** Testing imap_binary() : basic functionality ***\n"; echo "Encode as short string\n"; -$str = b'This is an example string to be base 64 encoded'; +$str = 'This is an example string to be base 64 encoded'; $base64 = imap_binary($str); var_dump(bin2hex($base64)); echo "Encode a string which results in more than 60 charters of output\n"; -$str = b'This is a long string with results in more than 60 characters of output'; +$str = 'This is a long string with results in more than 60 characters of output'; $base64 = imap_binary($str); var_dump(bin2hex($base64)); echo "Encode a string with special characters\n"; -$str = b'_+-={][];;@~#?/>.<,'; +$str = '_+-={][];;@~#?/>.<,'; $base64 = imap_binary($str); var_dump(bin2hex($base64)); echo "Encode some hexadecimal data\n"; -$hex = b'x00\x01\x02\x03\x04\x05\x06\xFA\xFB\xFC\xFD\xFE\xFF'; +$hex = 'x00\x01\x02\x03\x04\x05\x06\xFA\xFB\xFC\xFD\xFE\xFF'; $base64 = imap_binary($hex); var_dump(bin2hex($base64)); diff --git a/ext/mbstring/tests/bug43840.phpt b/ext/mbstring/tests/bug43840.phpt index 626cd70f8f2c0..b2dd0481860b6 100644 --- a/ext/mbstring/tests/bug43840.phpt +++ b/ext/mbstring/tests/bug43840.phpt @@ -28,7 +28,7 @@ foreach($offsets as $i) { echo "--Multibyte String:--\n"; var_dump( mb_strpos($string_mb, $needle, $i, 'UTF-8') ); echo"--ASCII String:--\n"; - var_dump(mb_strpos(b'This is na English ta', b'a', $i)); + var_dump(mb_strpos('This is na English ta', 'a', $i)); } ?> --EXPECTF-- diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt index 9f2583286c523..c4be058ffa763 100644 --- a/ext/mbstring/tests/bug43841.phpt +++ b/ext/mbstring/tests/bug43841.phpt @@ -28,9 +28,9 @@ foreach ($offsets as $i) { var_dump( mb_strrpos($string_mb, $needle, $i, 'UTF-8') ); echo "ASCII String:\n"; echo "mb_strrpos:\n"; - var_dump(mb_strrpos(b'This is na English ta', b'a', $i)); + var_dump(mb_strrpos('This is na English ta', 'a', $i)); echo "strrpos:\n"; - var_dump(strrpos(b'This is na English ta', b'a', $i)); + var_dump(strrpos('This is na English ta', 'a', $i)); } ?> diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt index e3f1c83a12590..c8d211438065e 100644 --- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt @@ -21,7 +21,7 @@ echo "*** Testing mb_convert_encoding() : usage variations ***\n"; // Initialise function arguments not being substituted mb_internal_encoding('utf-8'); -$sourcestring = b'hello, world'; +$sourcestring = 'hello, world'; //get an unset variable $unset_var = 10; diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt index 8fc5b94da7398..3b2d13de5137f 100644 --- a/ext/mbstring/tests/mb_ereg.phpt +++ b/ext/mbstring/tests/mb_ereg.phpt @@ -17,13 +17,13 @@ output_handler= mb_regex_encoding( $test_enc ); $pat = mb_convert_encoding( $pat, $test_enc, $in_enc ); $str = mb_convert_encoding( $str, $test_enc, $in_enc ); - printf( "(%d)%s\n", mb_ereg( $pat, $str, $reg ), ( is_array( $reg )? bin2hex(mb_convert_encoding( implode( b' ', $reg ), $in_enc, $test_enc )) : '' ) ); + printf( "(%d)%s\n", mb_ereg( $pat, $str, $reg ), ( is_array( $reg )? bin2hex(mb_convert_encoding( implode( ' ', $reg ), $in_enc, $test_enc )) : '' ) ); } function do_tests( $enc ) { - test_ereg( $enc, b'abc ([a-z]+) ([a-z]+) ([a-z]+)$', b"abc def ghi jkl" ); - $pat = b'([-]+) ([ -]+)([-]+) ([-]+)$'; - test_ereg( $enc, $pat, b' ' ); - test_ereg( $enc, $pat, b' ' ); + test_ereg( $enc, 'abc ([a-z]+) ([a-z]+) ([a-z]+)$', "abc def ghi jkl" ); + $pat = '([-]+) ([ -]+)([-]+) ([-]+)$'; + test_ereg( $enc, $pat, ' ' ); + test_ereg( $enc, $pat, ' ' ); } foreach( $encs as $enc ) { diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt index 6ab15f4a5bff0..ff64666f08371 100644 --- a/ext/mbstring/tests/mb_ereg_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_basic.phpt @@ -23,9 +23,9 @@ if(mb_regex_encoding('utf-8') == true) { } else { echo "Could not set regex encoding to utf-8\n"; } -$string_ascii = b'This is an English string. 0123456789.'; -$regex_ascii1 = b'(.*is)+.*\.[[:blank:]][0-9]{9}'; -$regex_ascii2 = b'.*is+'; +$string_ascii = 'This is an English string. 0123456789.'; +$regex_ascii1 = '(.*is)+.*\.[[:blank:]][0-9]{9}'; +$regex_ascii2 = '.*is+'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); $regex_mb1 = base64_decode('KOaXpeacrOiqnikuKj8oWzEtOV0rKQ=='); diff --git a/ext/mbstring/tests/mb_ereg_error.phpt b/ext/mbstring/tests/mb_ereg_error.phpt index 3610aea4eb007..21216257cd725 100644 --- a/ext/mbstring/tests/mb_ereg_error.phpt +++ b/ext/mbstring/tests/mb_ereg_error.phpt @@ -21,15 +21,15 @@ echo "*** Testing mb_ereg() : error conditions ***\n"; //Test mb_ereg with one more than the expected number of arguments echo "\n-- Testing mb_ereg() function with more than expected no. of arguments --\n"; -$pattern = b'string_val'; -$string = b'string_val'; +$pattern = 'string_val'; +$string = 'string_val'; $registers = array(1, 2); $extra_arg = 10; var_dump( mb_ereg($pattern, $string, $registers, $extra_arg) ); // Testing mb_ereg with one less than the expected number of arguments echo "\n-- Testing mb_ereg() function with less than expected no. of arguments --\n"; -$pattern = b'string_val'; +$pattern = 'string_val'; var_dump( mb_ereg($pattern) ); echo "Done"; diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt index 56710a93e2474..c035acc01834a 100644 --- a/ext/mbstring/tests/mb_ereg_match_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt @@ -20,20 +20,20 @@ mb_internal_encoding('UTF-8'); mb_regex_encoding('UTF-8'); echo "*** Testing mb_ereg_match() : basic functionality ***\n"; -$string_ascii = b'abc def, 0123456789'; +$string_ascii = 'abc def, 0123456789'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //will return true as pattern matches from start of string echo "\n-- ASCII string 1 --\n"; -var_dump(mb_ereg_match(b'.*def', $string_ascii)); +var_dump(mb_ereg_match('.*def', $string_ascii)); //will return false as pattern would match half way through string echo "\n-- ASCII string 2 --\n"; -var_dump(mb_ereg_match(b'def', $string_ascii)); +var_dump(mb_ereg_match('def', $string_ascii)); echo "\n-- Multibyte string 1 --\n"; $regex1 = base64_decode('5pel5pys6KqeKC4qKT9bMS05XSs='); -var_dump(mb_ereg_match($regex1, $string_mb, b'i')); +var_dump(mb_ereg_match($regex1, $string_mb, 'i')); echo "\n-- Multibyte string 2 --\n"; $regex2 = base64_decode('5LiW55WM'); diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt index b36c68621ba50..aab95fe6cd3a9 100644 --- a/ext/mbstring/tests/mb_ereg_match_error1.phpt +++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt @@ -21,15 +21,15 @@ echo "*** Testing mb_ereg_match() : error conditions ***\n"; //Test mb_ereg_match with one more than the expected number of arguments echo "\n-- Testing mb_ereg_match() function with more than expected no. of arguments --\n"; -$pattern = b'string_val'; -$string = b'string_val'; +$pattern = 'string_val'; +$string = 'string_val'; $option = 'string_val'; $extra_arg = 10; var_dump( mb_ereg_match($pattern, $string, $option, $extra_arg) ); // Testing mb_ereg_match with one less than the expected number of arguments echo "\n-- Testing mb_ereg_match() function with less than expected no. of arguments --\n"; -$pattern = b'string_val'; +$pattern = 'string_val'; var_dump( mb_ereg_match($pattern) ); // Testing mb_ereg_match with zero arguments diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt index 5a07004d58c9e..746dd4e1a4753 100644 --- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt @@ -22,25 +22,25 @@ echo "*** Testing mb_ereg_replace() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); mb_regex_encoding('UTF-8'); -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string 1 --\n"; -$result_1 = mb_ereg_replace(b'(.*)def', b'\\1 123', $string_ascii); +$result_1 = mb_ereg_replace('(.*)def', '\\1 123', $string_ascii); var_dump(bin2hex($result_1)); echo "\n-- ASCII string 2 --\n"; -$result_2 = mb_ereg_replace(b'123', b'abc', $string_ascii); +$result_2 = mb_ereg_replace('123', 'abc', $string_ascii); var_dump(bin2hex($result_2)); echo "\n-- Multibyte string 1 --\n"; $regex1 = base64_decode('KOaXpeacrOiqnikuKj8oWzEtOV0rKQ=='); //Japanese regex in UTF-8 -$result_3 = mb_ereg_replace($regex1, b'\\1_____\\2', $string_mb); +$result_3 = mb_ereg_replace($regex1, '\\1_____\\2', $string_mb); var_dump(bin2hex($result_3)); echo "\n-- Multibyte string 2 --\n"; $regex2 = base64_decode('5LiW55WM'); -$result_4 = mb_ereg_replace($regex2, b'_____', $string_mb); +$result_4 = mb_ereg_replace($regex2, '_____', $string_mb); var_dump(bin2hex($result_4)); echo "Done"; diff --git a/ext/mbstring/tests/mb_ereg_replace_error.phpt b/ext/mbstring/tests/mb_ereg_replace_error.phpt index 9413936b2d073..4e8a3388dd0e5 100644 --- a/ext/mbstring/tests/mb_ereg_replace_error.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_error.phpt @@ -17,17 +17,17 @@ echo "*** Testing mb_ereg_replace() : error conditions ***\n"; //Test mb_ereg_replace with one more than the expected number of arguments echo "\n-- Testing mb_ereg_replace() function with more than expected no. of arguments --\n"; -$pattern = b'[a-k]'; -$replacement = b'1'; -$string = b'string_val'; +$pattern = '[a-k]'; +$replacement = '1'; +$string = 'string_val'; $option = ''; $extra_arg = 10; var_dump( mb_ereg_replace($pattern, $replacement, $string, $option, $extra_arg) ); // Testing mb_ereg_replace with one less than the expected number of arguments echo "\n-- Testing mb_ereg_replace() function with less than expected no. of arguments --\n"; -$pattern = b'string_val'; -$replacement = b'string_val'; +$pattern = 'string_val'; +$replacement = 'string_val'; var_dump( mb_ereg_replace($pattern, $replacement) ); echo "Done"; diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt index d30ddc786bbef..9ccb1a212461f 100644 --- a/ext/mbstring/tests/mb_ereg_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_variation3.phpt @@ -21,18 +21,18 @@ echo "*** Testing mb_ereg() : variation ***\n"; mb_regex_encoding('utf-8'); // have to set otherwise won't match $mb properly $mb = base64_decode('5pel5pys6Kqe'); -$character_classes = array (b'aB1' => b'[[:alnum:]]+', /*1*/ - b'aBcD' => b'[[:alpha:]]+', - b'ab/=' => b'[[:ascii:]]+', - b" \t" => b'[[:blank:]]+', - b'234' => b'[[:digit:]]+', /*5*/ - "$mb" => b'[[:graph:]]+', - b'fjds' => b'[[:lower:]]+', - b"$mb\t" => b'[[:print:]]+', - b'.!"*@' => b'[[:punct:]]+', - b"\t" => b'[[:space:]]+', /*10*/ - b'IDSJV' => b'[[:upper:]]+', - b'3b5D' => b'[[:xdigit:]]+'); /*12*/ +$character_classes = array ('aB1' => '[[:alnum:]]+', /*1*/ + 'aBcD' => '[[:alpha:]]+', + 'ab/=' => '[[:ascii:]]+', + " \t" => '[[:blank:]]+', + '234' => '[[:digit:]]+', /*5*/ + "$mb" => '[[:graph:]]+', + 'fjds' => '[[:lower:]]+', + "$mb\t" => '[[:print:]]+', + '.!"*@' => '[[:punct:]]+', + "\t" => '[[:space:]]+', /*10*/ + 'IDSJV' => '[[:upper:]]+', + '3b5D' => '[[:xdigit:]]+'); /*12*/ $iterator = 1; foreach($character_classes as $string => $pattern) { diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index 788d4feffe433..7f7d6dfc93f68 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -23,19 +23,19 @@ mb_regex_encoding('utf-8'); //contains japanese characters, ASCII digits and different, UTF-8 encoded digits $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); -$character_classes = array (b'[[:alnum:]]+', /*1*/ - b'[[:alpha:]]+', - b'[[:ascii:]]+', - b'[[:blank:]]+', - b'[[:cntrl:]]+',/*5*/ - b'[[:digit:]]+', - b'[[:graph:]]+', - b'[[:lower:]]+', - b'[[:print:]]+', - b'[[:punct:]]+', /*10*/ - b'[[:space:]]+', - b'[[:upper:]]+', - b'[[:xdigit:]]+'); /*13*/ +$character_classes = array ('[[:alnum:]]+', /*1*/ + '[[:alpha:]]+', + '[[:ascii:]]+', + '[[:blank:]]+', + '[[:cntrl:]]+',/*5*/ + '[[:digit:]]+', + '[[:graph:]]+', + '[[:lower:]]+', + '[[:print:]]+', + '[[:punct:]]+', /*10*/ + '[[:space:]]+', + '[[:upper:]]+', + '[[:xdigit:]]+'); /*13*/ $iterator = 1; foreach ($character_classes as $pattern) { diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt index 1cecb09429418..c26d82ead5152 100644 --- a/ext/mbstring/tests/mb_ereg_variation5.phpt +++ b/ext/mbstring/tests/mb_ereg_variation5.phpt @@ -20,10 +20,10 @@ echo "*** Testing mb_ereg() : usage variations ***\n"; mb_regex_encoding('utf-8'); -$string_ascii = b'This is an English string. 0123456789.'; +$string_ascii = 'This is an English string. 0123456789.'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); -$regex = b'^.*?[[:blank:]]?[[:punct:][:digit:]]+\.?$'; +$regex = '^.*?[[:blank:]]?[[:punct:][:digit:]]+\.?$'; echo "\nASCII String without \$regs arg:\t\t"; var_dump(mb_ereg($regex, $string_ascii)); diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt index 0d8687b95ff6b..0de5064fedfcd 100644 --- a/ext/mbstring/tests/mb_ereg_variation6.phpt +++ b/ext/mbstring/tests/mb_ereg_variation6.phpt @@ -24,16 +24,16 @@ if(mb_regex_encoding('utf-8') == true) { echo "Could not set regex encoding to utf-8\n"; } -$regex_char = array ('\w+' => b'\w+', - '\W+' => b'\W+', - '\s+' => b'\s+', - '\S+' => b'\S+', - '\d+' => b'\d+', - '\D+' => b'\D+', - '\b' => b'\b', - '\B' => b'\B'); - -$string_ascii = b'This is an English string. 0123456789.'; +$regex_char = array ('\w+' => '\w+', + '\W+' => '\W+', + '\s+' => '\s+', + '\S+' => '\S+', + '\d+' => '\d+', + '\D+' => '\D+', + '\b' => '\b', + '\B' => '\B'); + +$string_ascii = 'This is an English string. 0123456789.'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); foreach ($regex_char as $displayChar => $char) { diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt index 170497d80039a..41c427162e509 100644 --- a/ext/mbstring/tests/mb_ereg_variation7.phpt +++ b/ext/mbstring/tests/mb_ereg_variation7.phpt @@ -27,8 +27,8 @@ if(mb_regex_encoding('utf-8') == true) { echo "Could not set regex encoding to utf-8\n"; } -$string_ascii = b'This is an English string. 0123456789.'; -$regex_ascii = b'([A-Z]\w{1,4}is( [aeiou]|h)) ?.*\.\s[0-9]+(5([6-9][79]){2})[[:punct:]]$'; +$string_ascii = 'This is an English string. 0123456789.'; +$regex_ascii = '([A-Z]\w{1,4}is( [aeiou]|h)) ?.*\.\s[0-9]+(5([6-9][79]){2})[[:punct:]]$'; var_dump(mb_ereg($regex_ascii, $string_ascii, $regs_ascii)); base64_encode_var_dump($regs_ascii); diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt index 1031cd26d7686..45d361c598de3 100644 --- a/ext/mbstring/tests/mb_split.phpt +++ b/ext/mbstring/tests/mb_split.phpt @@ -24,15 +24,15 @@ mbstring.func_overload=0 } } - var_dump( mb_split( b" ", b"a b c d e f g" ) - == mb_split( b"[[:space:]]", b"a\nb\tc\nd e f g" ) ); + var_dump( mb_split( " ", "a b c d e f g" ) + == mb_split( "[[:space:]]", "a\nb\tc\nd e f g" ) ); for ( $i = 1; $i < 5; ++$i ) { - verify_split( b" ", b"a\tb\tc\td e\tf g", $i ); + verify_split( " ", "a\tb\tc\td e\tf g", $i ); } for ( $i = 1; $i < 5; ++$i ) { - verify_split( b"\xa1\xa1+", b"\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i ); + verify_split( "\xa1\xa1+", "\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i ); } ?> diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt index 8268872223414..ac84b582428bc 100644 --- a/ext/mbstring/tests/mb_stripos.phpt +++ b/ext/mbstring/tests/mb_stripos.phpt @@ -12,7 +12,7 @@ include_once('common.inc'); // Test string -$euc_jp = b'0123ʸܸǤEUC-JPȤäƤޤ0123ܸݽ'; +$euc_jp = '0123ʸܸǤEUC-JPȤäƤޤ0123ܸݽ'; $slen = mb_strlen($euc_jp, 'EUC-JP'); echo "String len: $slen\n"; @@ -22,12 +22,12 @@ mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n"); echo "== POSITIVE OFFSET ==\n"; -print mb_stripos($euc_jp, b'ܸ', 0, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'0', 0, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, 'ܸ', 0, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '0', 0, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 3, 0, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, 0, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'ܸ', 15, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'0', 15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, 'ܸ', 15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '0', 15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 3, 15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, 15, 'EUC-JP') . "\n"; @@ -35,8 +35,8 @@ print mb_stripos($euc_jp, 0, 15, 'EUC-JP') . "\n"; // Negative offset echo "== NEGATIVE OFFSET ==\n"; -print mb_stripos($euc_jp, b'ܸ', -15, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'0', -15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, 'ܸ', -15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '0', -15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 3, -15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, -15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, -43, 'EUC-JP') . "\n"; @@ -45,19 +45,19 @@ print mb_stripos($euc_jp, 0, -43, 'EUC-JP') . "\n"; // Invalid offset - should return false with warning print ("== INVALID OFFSET ==\n"); -$r = mb_stripos($euc_jp, b'ܸ', 44, 'EUC-JP'); +$r = mb_stripos($euc_jp, 'ܸ', 44, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'ܸ', 50, 'EUC-JP'); +$r = mb_stripos($euc_jp, 'ܸ', 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'0', 50, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_stripos($euc_jp, 3, 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_stripos($euc_jp, 0, 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'ܸ', -50, 'EUC-JP'); +$r = mb_stripos($euc_jp, 'ܸ', -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'0', -50, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_stripos($euc_jp, 3, -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; @@ -69,17 +69,17 @@ $r = mb_stripos($euc_jp, 0, -44, 'EUC-JP'); // Out of range - should return false print ("== OUT OF RANGE ==\n"); -$r = mb_stripos($euc_jp, b'ܸ', 40, 'EUC-JP'); +$r = mb_stripos($euc_jp, 'ܸ', 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_stripos($euc_jp, b'0', 40, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_stripos($euc_jp, 3, 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_stripos($euc_jp, 0, 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_stripos($euc_jp, b'ܸ', -3, 'EUC-JP'); +$r = mb_stripos($euc_jp, 'ܸ', -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_stripos($euc_jp, b'0', -3, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_stripos($euc_jp, 3, -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; @@ -90,9 +90,9 @@ $r = mb_stripos($euc_jp, 0, -3, 'EUC-JP'); // Non-existent echo "== NON-EXISTENT ==\n"; -$r = mb_stripos($euc_jp, b'ڹ', 0, 'EUC-JP'); +$r = mb_stripos($euc_jp, 'ڹ', 0, 'EUC-JP'); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_stripos($euc_jp, b"\n", 0, 'EUC-JP'); +$r = mb_stripos($euc_jp, "\n", 0, 'EUC-JP'); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; @@ -101,14 +101,14 @@ echo "== NO ENCODING PARAMETER ==\n"; mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); -print mb_stripos($euc_jp, b'ܸ', 0) . "\n"; -print mb_stripos($euc_jp, b'0', 0) . "\n"; +print mb_stripos($euc_jp, 'ܸ', 0) . "\n"; +print mb_stripos($euc_jp, '0', 0) . "\n"; print mb_stripos($euc_jp, 3, 0) . "\n"; print mb_stripos($euc_jp, 0, 0) . "\n"; -$r = mb_stripos($euc_jp, b'ڹ', 0); +$r = mb_stripos($euc_jp, 'ڹ', 0); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_stripos($euc_jp, b"\n", 0); +$r = mb_stripos($euc_jp, "\n", 0); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; // EUC-JP - No offset and encoding parameter @@ -116,14 +116,14 @@ echo "== NO OFFSET AND ENCODING PARAMETER ==\n"; mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); -print mb_stripos($euc_jp, b'ܸ') . "\n"; -print mb_stripos($euc_jp, b'0') . "\n"; +print mb_stripos($euc_jp, 'ܸ') . "\n"; +print mb_stripos($euc_jp, '0') . "\n"; print mb_stripos($euc_jp, 3) . "\n"; print mb_stripos($euc_jp, 0) . "\n"; -$r = mb_stripos($euc_jp, b'ڹ'); +$r = mb_stripos($euc_jp, 'ڹ'); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_stripos($euc_jp, b"\n"); +$r = mb_stripos($euc_jp, "\n"); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt index bb33bb1076339..e061d8f7cc201 100644 --- a/ext/mbstring/tests/mb_stripos_basic.phpt +++ b/ext/mbstring/tests/mb_stripos_basic.phpt @@ -23,26 +23,26 @@ mb_internal_encoding('UTF-8'); //ascii strings $ascii_haystacks = array( - b'abc defabc def', - b'ABC DEFABC DEF', - b'Abc dEFaBC Def', + 'abc defabc def', + 'ABC DEFABC DEF', + 'Abc dEFaBC Def', ); $ascii_needles = array( // 4 good ones - b'DE', - b'de', - b'De', - b'dE', + 'DE', + 'de', + 'De', + 'dE', //flag a swap between good and bad '!', // 4 bad ones - b'df', - b'Df', - b'dF', - b'DF' + 'df', + 'Df', + 'dF', + 'DF' ); //greek strings in UTF-8 diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index f9131d987977c..76a6cc5066f29 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -23,17 +23,17 @@ mb_internal_encoding('UTF-8'); //ascii strings $ascii_haystacks = array( - b'abc defabc def', - b'ABC DEFABC DEF', - b'Abc dEFaBC Def', + 'abc defabc def', + 'ABC DEFABC DEF', + 'Abc dEFaBC Def', ); $ascii_needles = array( // 4 good ones - b'DE', - b'de', - b'De', - b'dE', + 'DE', + 'de', + 'De', + 'dE', ); //greek strings in UTF-8 diff --git a/ext/mbstring/tests/mb_stripos_error1.phpt b/ext/mbstring/tests/mb_stripos_error1.phpt index 832a8661bdc38..4187898f010c8 100644 --- a/ext/mbstring/tests/mb_stripos_error1.phpt +++ b/ext/mbstring/tests/mb_stripos_error1.phpt @@ -22,8 +22,8 @@ echo "*** Testing mb_stripos() : error conditions ***\n"; //Test mb_stripos with one more than the expected number of arguments echo "\n-- Testing mb_stripos() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $offset = 10; $encoding = 'string_val'; $extra_arg = 10; @@ -31,7 +31,7 @@ var_dump( mb_stripos($haystack, $needle, $offset, $encoding, $extra_arg) ); // Testing mb_stripos with one less than the expected number of arguments echo "\n-- Testing mb_stripos() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_stripos($haystack) ); echo "Done"; diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt index c5e5c8d3bdd0a..82b01b92f38ed 100644 --- a/ext/mbstring/tests/mb_stripos_error2.phpt +++ b/ext/mbstring/tests/mb_stripos_error2.phpt @@ -18,8 +18,8 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this */ echo "*** Testing mb_stripos() : error conditions ***\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $offset = 2; $encoding = 'unknown-encoding'; diff --git a/ext/mbstring/tests/mb_stripos_variation1.phpt b/ext/mbstring/tests/mb_stripos_variation1.phpt index 2fe5c022f2d1b..39837aa0802c6 100644 --- a/ext/mbstring/tests/mb_stripos_variation1.phpt +++ b/ext/mbstring/tests/mb_stripos_variation1.phpt @@ -20,7 +20,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'string_val'; +$needle = 'string_val'; $offset = 0; $encoding = 'utf-8'; diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt index 95c2d0895797c..32b75467f782f 100644 --- a/ext/mbstring/tests/mb_stripos_variation2.phpt +++ b/ext/mbstring/tests/mb_stripos_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; +$haystack = 'string_val'; $offset = 0; $encoding = 'utf-8'; @@ -75,8 +75,8 @@ $inputs = array( '', // string data -/*18*/ b"string", - b'string', +/*18*/ "string", + 'string', $heredoc, // object data diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt index 69c4a9e53b0dd..9907356ccdc63 100644 --- a/ext/mbstring/tests/mb_stripos_variation3.phpt +++ b/ext/mbstring/tests/mb_stripos_variation3.phpt @@ -20,8 +20,8 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'A'; -$haystack = b'string_val'; +$needle = 'A'; +$haystack = 'string_val'; $encoding = 'utf-8'; //get an unset variable diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt index a8d36f9e452f0..dc11b48d382b4 100644 --- a/ext/mbstring/tests/mb_stripos_variation4.phpt +++ b/ext/mbstring/tests/mb_stripos_variation4.phpt @@ -21,8 +21,8 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; -$needle = b'VaL'; +$haystack = 'string_val'; +$needle = 'VaL'; $offset = 0; //get an unset variable diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt index 8ffcae5c0f959..f2f9555a2b3b2 100644 --- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt @@ -22,8 +22,8 @@ mb_internal_encoding('UTF-8'); echo "*** Testing mb_stripos() : usage variations ***\n"; -$string_ascii = b'+Is an English string'; //21 chars -$needle_ascii = b'G'; +$string_ascii = '+Is an English string'; //21 chars +$needle_ascii = 'G'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars $needle_mb = base64_decode('44CC'); diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt index 9340d3511765c..58a03dcb2c1d3 100644 --- a/ext/mbstring/tests/mb_stristr_basic.phpt +++ b/ext/mbstring/tests/mb_stristr_basic.phpt @@ -17,10 +17,10 @@ echo "*** Testing mb_stristr() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'abcdef'; -$needle_ascii_upper = b"BCD"; -$needle_ascii_mixed = b"bCd"; -$needle_ascii_lower = b"bcd"; +$string_ascii = 'abcdef'; +$needle_ascii_upper = "BCD"; +$needle_ascii_mixed = "bCd"; +$needle_ascii_lower = "bcd"; //Greek string in lower case UTF-8 $string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J'); diff --git a/ext/mbstring/tests/mb_stristr_error1.phpt b/ext/mbstring/tests/mb_stristr_error1.phpt index 8c81b0766dbee..c20f13470d1d9 100644 --- a/ext/mbstring/tests/mb_stristr_error1.phpt +++ b/ext/mbstring/tests/mb_stristr_error1.phpt @@ -18,8 +18,8 @@ echo "*** Testing mb_stristr() : error conditions ***\n"; //Test mb_stristr with one more than the expected number of arguments echo "\n-- Testing mb_stristr() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'string_val'; $extra_arg = 10; @@ -27,7 +27,7 @@ var_dump( mb_stristr($haystack, $needle, $part, $encoding, $extra_arg) ); // Testing mb_stristr with one less than the expected number of arguments echo "\n-- Testing mb_stristr() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_stristr($haystack) ); ?> diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt index 73f13dc8562a1..74f8bfb4ebe79 100644 --- a/ext/mbstring/tests/mb_stristr_error2.phpt +++ b/ext/mbstring/tests/mb_stristr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_stristr() : error conditions ***\n"; echo "\n-- Testing mb_stristr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_stristr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt index 9483c379e006a..c8c2ae1f68ffc 100644 --- a/ext/mbstring/tests/mb_stristr_variation1.phpt +++ b/ext/mbstring/tests/mb_stristr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<< diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt index cfbcd66a093bb..11abee609b182 100644 --- a/ext/mbstring/tests/mb_strrchr_error2.phpt +++ b/ext/mbstring/tests/mb_strrchr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_strrchr() : error conditions ***\n"; echo "\n-- Testing mb_strrchr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_strrchr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_strrchr_variation1.phpt b/ext/mbstring/tests/mb_strrchr_variation1.phpt index a0952a87ea3ad..7284939a5715d 100644 --- a/ext/mbstring/tests/mb_strrchr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<< diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt index e8f98ef44220d..b1877db9c100e 100644 --- a/ext/mbstring/tests/mb_strrichr_error2.phpt +++ b/ext/mbstring/tests/mb_strrichr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_strrichr() : error conditions ***\n"; echo "\n-- Testing mb_strrichr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_strrichr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_strrichr_variation1.phpt b/ext/mbstring/tests/mb_strrichr_variation1.phpt index e350718e77ce8..06ca5e31c9645 100644 --- a/ext/mbstring/tests/mb_strrichr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<< diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt index 163c80026a50b..8df700080ea1f 100644 --- a/ext/mbstring/tests/mb_strstr_error2.phpt +++ b/ext/mbstring/tests/mb_strstr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_strstr() : error conditions ***\n"; echo "\n-- Testing mb_strstr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_strstr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_strstr_variation1.phpt b/ext/mbstring/tests/mb_strstr_variation1.phpt index 826014feae005..a9406f1cadc48 100644 --- a/ext/mbstring/tests/mb_strstr_variation1.phpt +++ b/ext/mbstring/tests/mb_strstr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<< b'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); -$lowers = array('Basic Latin' => b'abcdefghijklmnopqrstuvwxyz', +$lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', 'Characters With Accents' => base64_decode('w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg=='), 'Russian' => base64_decode('0LDQsdCy0LPQtNC10LbQtw==')); diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt index e77646923c396..e8f48345fee80 100644 --- a/ext/mbstring/tests/mb_strtoupper_basic.phpt +++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt @@ -19,8 +19,8 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : basic functionality ***\n"; mb_internal_encoding('utf-8'); -$ascii_lower = b'abcdefghijklmnopqrstuvwxyz'; -$ascii_upper = b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; +$ascii_lower = 'abcdefghijklmnopqrstuvwxyz'; +$ascii_upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; $greek_lower = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J'); $greek_upper = base64_decode('zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p'); diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt index 035cd63f4995b..52beb3d7410c3 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : usage variations ***\n"; // Initialise function arguments not being substituted -$sourcestring = b'Hello, World'; +$sourcestring = 'Hello, World'; //get an unset variable $unset_var = 10; diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index 7d91c8a2ded2a..8f5abe7269e87 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -19,10 +19,10 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : usage variations ***\n"; -$uppers = array('Basic Latin' => b'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); -$lowers = array('Basic Latin' => b'abcdefghijklmnopqrstuvwxyz', +$lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', 'Characters With Accents' => base64_decode('w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg=='), 'Russian' => base64_decode('0LDQsdCy0LPQtNC10LbQtw==')); diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt index d9269c37773cd..94a0d8e368ed6 100644 --- a/ext/mbstring/tests/mb_substr.phpt +++ b/ext/mbstring/tests/mb_substr.phpt @@ -12,7 +12,7 @@ ini_set('include_path','.'); include_once('common.inc'); // EUC-JP -$euc_jp = b'0123ʸܸǤEUC-JPȤäƤޤܸݽ'; +$euc_jp = '0123ʸܸǤEUC-JPȤäƤޤܸݽ'; print "1: ". bin2hex(mb_substr($euc_jp, 10, 10,'EUC-JP')) . "\n"; print "2: ". bin2hex(mb_substr($euc_jp, 0, 100,'EUC-JP')) . "\n"; diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt index 65c8769b0bf67..d2e7a60566961 100644 --- a/ext/mbstring/tests/mb_substr_count_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt @@ -20,8 +20,8 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab echo "*** Testing mb_substr_count() : usage variations ***\n"; // Initialise function arguments not being substituted (if any) -$haystack = b'hello, world'; -$needle = b'world'; +$haystack = 'hello, world'; +$needle = 'world'; //get an unset variable $unset_var = 10; diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index 624c95a956a71..21c9f956fb1dc 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -22,8 +22,8 @@ echo "*** Testing mb_substr_count() : usage variations ***\n"; echo "\n-- ASCII String --\n"; -$string_ascii = b'abcabcabc'; -var_dump(mb_substr_count($string_ascii, b'abcabc')); //needle overlaps in haystack +$string_ascii = 'abcabcabc'; +var_dump(mb_substr_count($string_ascii, 'abcabc')); //needle overlaps in haystack echo "\n-- Multibyte String --\n"; $string_mb = base64_decode('5pel5pys6Kqe5pel5pys6Kqe5pel5pys6Kqe'); diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt index 7c02601f1726c..7c763f36168dd 100644 --- a/ext/mbstring/tests/mb_substr_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b echo "*** Testing mb_substr() : usage variations ***\n"; // Initialise function arguments not being substituted -$str = b'string_val'; +$str = 'string_val'; $start = 1; $length = 5; diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt index c4a723a0a1236..ce4df5300586a 100644 --- a/ext/mbstring/tests/mb_substr_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_variation4.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt index 11caa9cab35cf..1ec92be993458 100644 --- a/ext/mbstring/tests/mb_substr_variation5.phpt +++ b/ext/mbstring/tests/mb_substr_variation5.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars //Japanese string, 21 characters $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt index 20ee1ec156ab6..aa75c70c00bec 100644 --- a/ext/mbstring/tests/mb_substr_variation6.phpt +++ b/ext/mbstring/tests/mb_substr_variation6.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt index 4d68097df6dbe..22b5fa2fe32a6 100644 --- a/ext/mbstring/tests/mb_substr_variation7.phpt +++ b/ext/mbstring/tests/mb_substr_variation7.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars //Japanese string, 21 characters $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); diff --git a/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt b/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt index b306a8a94ede3..01a150de6c0ec 100644 --- a/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt +++ b/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt @@ -15,14 +15,14 @@ if (!extension_loaded("mcrypt")) { */ $cipher = MCRYPT_TRIPLEDES; -$data = b"This is the secret message which must be encrypted"; +$data = "This is the secret message which must be encrypted"; // tripledes uses keys with exactly 192 bits (24 bytes) $keys = array( - b'12345678', - b'12345678901234567890', - b'123456789012345678901234', - b'12345678901234567890123456' + '12345678', + '12345678901234567890', + '123456789012345678901234', + '12345678901234567890123456' ); $data1 = array( 'IleMhoxiOthmHua4tFBHOw==', @@ -32,9 +32,9 @@ $data1 = array( ); // tripledes is a block cipher of 64 bits (8 bytes) $ivs = array( - b'1234', - b'12345678', - b'123456789' + '1234', + '12345678', + '123456789' ); // data represented in base64 (ascii) $data2 = array( @@ -43,14 +43,14 @@ $data2 = array( '+G7nGcWIxij3TZjpI9lJdQ==' ); -$iv = b'12345678'; +$iv = '12345678'; echo "\n--- testing different key lengths\n"; for ($i = 0; $i < sizeof($keys); $i++) { echo "\nkey length=".strlen($keys[$i])."\n"; special_var_dump(mcrypt_decrypt($cipher, $keys[$i], base64_decode($data1[$i]), MCRYPT_MODE_CBC, $iv)); } -$key = b'123456789012345678901234'; +$key = '123456789012345678901234'; echo "\n--- testing different iv lengths\n"; for ($i = 0; $i < sizeof($ivs); $i++) { echo "\niv length=".strlen($ivs[$i])."\n"; diff --git a/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt b/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt index 0fea9063df0f8..53bd186d26522 100644 --- a/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt +++ b/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt @@ -15,29 +15,29 @@ if (!extension_loaded("mcrypt")) { */ $cipher = MCRYPT_TRIPLEDES; -$data = b"This is the secret message which must be encrypted"; +$data = "This is the secret message which must be encrypted"; // tripledes uses keys with exactly 192 bits (24 bytes) $keys = array( - b'12345678', - b'12345678901234567890', - b'123456789012345678901234', - b'12345678901234567890123456'); + '12345678', + '12345678901234567890', + '123456789012345678901234', + '12345678901234567890123456'); // tripledes is a block cipher of 64 bits (8 bytes) $ivs = array( - b'1234', - b'12345678', - b'123456789'); + '1234', + '12345678', + '123456789'); -$iv = b'12345678'; +$iv = '12345678'; echo "\n--- testing different key lengths\n"; foreach ($keys as $key) { echo "\nkey length=".strlen($key)."\n"; var_dump(bin2hex(mcrypt_encrypt($cipher, $key, $data, MCRYPT_MODE_CBC, $iv))); } -$key = b'123456789012345678901234'; +$key = '123456789012345678901234'; echo "\n--- testing different iv lengths\n"; foreach ($ivs as $iv) { echo "\niv length=".strlen($iv)."\n"; diff --git a/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt b/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt index cc5996d410c10..6379b47ac139e 100644 --- a/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt +++ b/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt @@ -23,10 +23,10 @@ $mode = MCRYPT_MODE_CBC; // tripledes uses keys with exactly 192 bits (24 bytes) $keys = array( - b'12345678', - b'12345678901234567890', - b'123456789012345678901234', - b'12345678901234567890123456' + '12345678', + '12345678901234567890', + '123456789012345678901234', + '12345678901234567890123456' ); $data1 = array( 'IleMhoxiOthmHua4tFBHOw==', @@ -36,9 +36,9 @@ $data1 = array( ); // tripledes is a block cipher of 64 bits (8 bytes) $ivs = array( - b'1234', - b'12345678', - b'123456789' + '1234', + '12345678', + '123456789' ); $data2 = array( '+G7nGcWIxij3TZjpI9lJdQ==', @@ -46,14 +46,14 @@ $data2 = array( '+G7nGcWIxij3TZjpI9lJdQ==' ); -$iv = b'12345678'; +$iv = '12345678'; echo "\n--- testing different key lengths\n"; for ($i = 0; $i < sizeof($keys); $i++) { echo "\nkey length=".strlen($keys[$i])."\n"; special_var_dump(mcrypt_decrypt($cipher, $keys[$i], base64_decode($data1[$i]), $mode, $iv)); } -$key = b'123456789012345678901234'; +$key = '123456789012345678901234'; echo "\n--- testing different iv lengths\n"; for ($i = 0; $i < sizeof($ivs); $i++) { echo "\niv length=".strlen($ivs[$i])."\n"; diff --git a/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt b/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt index e86a5650fe943..4bc78f817db14 100644 --- a/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt +++ b/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt @@ -23,10 +23,10 @@ $mode = MCRYPT_MODE_ECB; // tripledes uses keys with exactly 192 bits (24 bytes) $keys = array( - b'12345678', - b'12345678901234567890', - b'123456789012345678901234', - b'12345678901234567890123456' + '12345678', + '12345678901234567890', + '123456789012345678901234', + '12345678901234567890123456' ); $data1 = array( '0D4ArM3ejyhic9rnCcIW9A==', @@ -36,9 +36,9 @@ $data1 = array( ); // tripledes is a block cipher of 64 bits (8 bytes) $ivs = array( - b'1234', - b'12345678', - b'123456789' + '1234', + '12345678', + '123456789' ); $data2 = array( '+G7nGcWIxigQcJD+2P14HA==', @@ -52,7 +52,7 @@ for ($i = 0; $i < sizeof($keys); $i++) { special_var_dump(mcrypt_decrypt($cipher, $keys[$i], base64_decode($data1[$i]), $mode)); } -$key = b'123456789012345678901234'; +$key = '123456789012345678901234'; echo "\n--- testing different iv lengths\n"; for ($i = 0; $i < sizeof($ivs); $i++) { echo "\niv length=".strlen($ivs[$i])."\n"; diff --git a/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt b/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt index 37fffad4d70c5..4f44d5bdcff77 100644 --- a/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt +++ b/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt @@ -26,10 +26,10 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$key = b'string_val'; -$data = b'string_val'; +$key = 'string_val'; +$data = 'string_val'; $mode = MCRYPT_MODE_ECB; -$iv = b'string_val'; +$iv = 'string_val'; //get an unset variable $unset_var = 10; diff --git a/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt b/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt index 25cc371f75122..df273de15589c 100644 --- a/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt +++ b/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt @@ -27,9 +27,9 @@ set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) $cipher = MCRYPT_TRIPLEDES; -$data = b'string_val'; +$data = 'string_val'; $mode = MCRYPT_MODE_ECB; -$iv = b'01234567'; +$iv = '01234567'; //get an unset variable $unset_var = 10; @@ -39,7 +39,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -48,7 +48,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<< b"1", - b"FOO" => b"BAR", - 1 => b"long") + "PCNTL_EXEC_TEST_IS_CHILD" => "1", + "FOO" => "BAR", + 1 => "long") ); echo "nok\n"; diff --git a/ext/pcre/tests/invalid_utf8_offset.phpt b/ext/pcre/tests/invalid_utf8_offset.phpt index 50716ca9b2578..2b9e7fa239b16 100644 --- a/ext/pcre/tests/invalid_utf8_offset.phpt +++ b/ext/pcre/tests/invalid_utf8_offset.phpt @@ -9,13 +9,13 @@ if (@preg_match('/./u', '') === false) { --FILE-- quote($filename)); diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt index 37d9cbdb7768d..dcf648248f7a7 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt @@ -68,8 +68,8 @@ if (($tmp[1] !== 'localhost') && ($tmp[1] !== '127.0.0.1')) } $fp = fopen($filename, "w"); - fwrite($fp, b"1;foo\n"); - fwrite($fp, b"2;bar"); + fwrite($fp, "1;foo\n"); + fwrite($fp, "2;bar"); fclose($fp); // This should fail, the PS protocol should not support it. diff --git a/ext/phar/tests/009.phpt b/ext/phar/tests/009.phpt index 61933b3814cce..7f55f3987d3f1 100644 --- a/ext/phar/tests/009.phpt +++ b/ext/phar/tests/009.phpt @@ -6,7 +6,7 @@ Phar::mapPhar too many manifest entries phar.require_hash=0 --FILE-- "; $file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . (binary) str_repeat((binary)'A', 500); diff --git a/ext/phar/tests/010.phpt b/ext/phar/tests/010.phpt index d1e2f40c9c9bf..3dce5f8f4c878 100644 --- a/ext/phar/tests/010.phpt +++ b/ext/phar/tests/010.phpt @@ -6,13 +6,13 @@ Phar::mapPhar buffer overrun phar.require_hash=0 --FILE-- "; // 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(b''), 0x00000000, 0); +$manifest = pack('V', 1) . 'a' . pack('VVVVVV', 0, time(), 0, crc32(''), 0x00000000, 0); $file .= pack('VVnVV', strlen($manifest), 1, 0x1000, 0x00000000, 3) . 'hio' . pack('V', 0) . $manifest; file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt index cb83ea55bd36a..d08e6550b688b 100644 --- a/ext/phar/tests/014.phpt +++ b/ext/phar/tests/014.phpt @@ -12,7 +12,7 @@ $file = ""; // wrong crc32 $files = array(); -$files['a'] = array('cont'=>'a', 'crc32'=>crc32(b'aX')); +$files['a'] = array('cont'=>'a', 'crc32'=>crc32('aX')); include 'files/phar_test.inc'; echo file_get_contents($pname.'/a'); diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt index 3288e8eca4d94..302d06d3cb3d1 100644 --- a/ext/phar/tests/016.phpt +++ b/ext/phar/tests/016.phpt @@ -9,14 +9,14 @@ phar.require_hash=0 "; +$file = ""; // file length is too short $files = array(); // "hi" gzdeflated -$files['a'] = array('cont'=>b'a','comp'=> (binary)pack('H*', 'cbc80400'),'flags'=>0x00001000, 'ulen' => 1, 'clen' => 4); +$files['a'] = array('cont'=>'a','comp'=> pack('H*', 'cbc80400'),'flags'=>0x00001000, 'ulen' => 1, 'clen' => 4); $files['b'] = $files['a']; -$files['c'] = array('cont'=>b'*'); +$files['c'] = array('cont'=>'*'); $files['d'] = $files['a']; include 'files/phar_test.inc'; diff --git a/ext/phar/tests/017U.phpt b/ext/phar/tests/017U.phpt index edcfcf4078d4d..82862e45880a1 100644 --- a/ext/phar/tests/017U.phpt +++ b/ext/phar/tests/017U.phpt @@ -11,7 +11,7 @@ phar.require_hash=0 "; diff --git a/ext/phar/tests/019.phpt b/ext/phar/tests/019.phpt index 0a5a7d7b57977..860edad236ebb 100644 --- a/ext/phar/tests/019.phpt +++ b/ext/phar/tests/019.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = b""; diff --git a/ext/phar/tests/019bU.phpt b/ext/phar/tests/019bU.phpt index eb3f07a1f8c5a..915b2f8e3a061 100644 --- a/ext/phar/tests/019bU.phpt +++ b/ext/phar/tests/019bU.phpt @@ -12,7 +12,7 @@ phar.require_hash=0 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = b""; diff --git a/ext/phar/tests/019cU.phpt b/ext/phar/tests/019cU.phpt index 6ea5cf285c20d..e95cc6b0452da 100644 --- a/ext/phar/tests/019cU.phpt +++ b/ext/phar/tests/019cU.phpt @@ -11,7 +11,7 @@ phar.require_hash=0 "; diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt index 7d01681b6f1e4..289fc39c959a4 100644 --- a/ext/phar/tests/020.phpt +++ b/ext/phar/tests/020.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 "; diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt index bfd65769521b4..3e3278b9f8b86 100644 --- a/ext/phar/tests/021.phpt +++ b/ext/phar/tests/021.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 "; diff --git a/ext/phar/tests/027U.phpt b/ext/phar/tests/027U.phpt index 598f969a5907e..6dc576cfe6d90 100644 --- a/ext/phar/tests/027U.phpt +++ b/ext/phar/tests/027U.phpt @@ -11,7 +11,7 @@ phar.require_hash=0 "; +$file = ""; $files = array(); $files['a.php'] = ''; @@ -50,7 +50,7 @@ var_dump(fseek($a, 0, SEEK_END), ftell($a)); var_dump(fseek($a, -1), ftell($a)); var_dump(fseek($a, 1), ftell($a)); echo "fwrite on dir handle\n"; -var_dump(fwrite($a, b'hi')); +var_dump(fwrite($a, 'hi')); var_dump(fstat($a)); closedir($a); echo "opendir edge cases\n"; diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt index 4586f35e3f0da..e8725bdda635c 100644 --- a/ext/phar/tests/033a.phpt +++ b/ext/phar/tests/033a.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 '; +$file = ''; $files = array(); $files['a.php'] = ''; diff --git a/ext/phar/tests/cache_list/files/frontcontroller12.phar b/ext/phar/tests/cache_list/files/frontcontroller12.phar index 1cf362928208fa6660410ad0cf31e4481470bcc3..beebf034cbc8e442d5cffce2274b872a04f6bf6c 100644 GIT binary patch delta 121 zcmX@Za+GDlT>%qD28M58auFcfzW?->iEkYy>oF?xCB517<#vw U$2y8id8IWmF)%Q=JNY^R013S#n*aa+ delta 120 zcmX@ga)xEXT>)!G28Q*=vb{ibxcKRyiEkYklP2pjDg(&?Ms*-r4rb3{R0Xp4GitCW zDFt{q2E|VfWK=VTvV&X$LtTSI;zNTxm0~rmx%iXcJQ2w1bxSY)5ML<7{)>MWqXZKJ K1B1JhuM+^54kNk% diff --git a/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc index f1e4645e2f09a..ba17df37e17f2 100644 --- a/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc +++ b/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc @@ -3,13 +3,13 @@ $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar'); $a['index.php'] = 'setStub('ruDaAP0TsGC`8ojrZ+H}A delta 69 zcmX@We29629iu=10|SHa@oX;;ZPys^cCsI%0%OwTJVr$z+0Q5{Q?>G$PyVLqQ9m*| VH8*WeNI%B$VF?pZvAdJ669D`+7fk>F diff --git a/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc index 23104a642fb74..d0ebd9a45a769 100644 --- a/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc +++ b/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc @@ -2,8 +2,8 @@ @unlink(dirname(__FILE__) . '/frontcontroller14.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller14.phar'); $a['html/index.php'] = 'setStub('`c7- P@nyf67#JAboqU}DUG5n= diff --git a/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc index 6f9126ff445ec..2759d9ee45a7e 100644 --- a/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc +++ b/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc @@ -7,7 +7,7 @@ $a['a.phps'] = 'setStub(' "a.phps"); + static $b = array("/hi" => "a.phps"); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/cache_list/files/frontcontroller4.phar b/ext/phar/tests/cache_list/files/frontcontroller4.phar index 83594618104f93833aba1a8b029afd040ed6bb84..439f74479dfc8c704b20a84b4f65e665110ea606 100644 GIT binary patch delta 89 zcmdnUyn%Uw?nJ#Ws?);dBA6K%7}mbueqkFUkO2g&K%A(TRgeyn04bR4&M3zMW@Iwz i$Sga5@R-MZhD0G&tCP+~EVsetStub(' false); + static $b = array("/hi" => false); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/cache_list/files/frontcontroller8.phar b/ext/phar/tests/cache_list/files/frontcontroller8.phar index c9c0e409ec4b9b8ca6dfd07edd777df9bf3a5d04..fe133dfba1775a226f2960722ff44ef3a3c7b94a 100644 GIT binary patch delta 230 zcmeBj>u{U!-eX(1Tm%aP0|Re+w)QqgAOi^4fjH4nuOOqK*dE9PDFM;fmp7Til(2%7 z=w%h8gY<$FOg3kfWdSoH7?mN6dPaFwkcbdaN$otvm&kha@>45Hm|%Jj!?e7DF$9^^ zA%@s6=}0OCxdw*128YCl26-yQ>L{qh2fGG^xdugVZf43>ka0e%y`8aUa;Nm9XQs=a RYKpFSIDZGoXm=-HCjg47J;MM1 delta 232 zcmeBh>vEg$-s8uyY%dlD1_s{tZ0&7~Kn4)71976EUO`4du_KTPQUao%7?r(%DPaXE z(aS1G2k8YVm~74{%K~OZFe*bB^^EeWAQ2&;lG=HSFOl`;<)>DZFv0X5hG}^PV+b;- zLkzKD(veP53UUn$bqx-Q4-N8Eiq%n2i4S%S3UdvLPTJhal&v81&TV6#;})j!lEaCd Tf7<7D8Ho5uf(&18ZsQKZ#kSUm?HHxiMb;nYEMJFxkx7y0|SG*ldls1 Dr7{p0 delta 49 zcmX@cbew5I17p&}hB_9;BiUY)nHV)>bcI@<6@0((_T6G3h729u&4-Q6B$*f(7~GwF FodD2>5jX$< diff --git a/ext/phar/tests/cache_list/files/write24.phar.inc b/ext/phar/tests/cache_list/files/write24.phar.inc index 216f7c46d0eac..ac96731960808 100644 --- a/ext/phar/tests/cache_list/files/write24.phar.inc +++ b/ext/phar/tests/cache_list/files/write24.phar.inc @@ -8,7 +8,7 @@ $phar->setStub('getSignature(); -var_dump($sig1[b'hash']); -var_dump($sig2[b'hash']); -var_dump($sig1[b'hash'] != $sig2[b'hash']); +var_dump($sig1['hash']); +var_dump($sig2['hash']); +var_dump($sig1['hash'] != $sig2['hash']); include $pname . '/a.php'; include $pname . '/b.php'; diff --git a/ext/phar/tests/files/frontcontroller12.phar b/ext/phar/tests/files/frontcontroller12.phar index 315c2901e0ae67269ab7241fd31af02c8f5aa50e..2a654baf7fe5d27861af53f6cadc2932f0414aa2 100644 GIT binary patch delta 121 zcmX@Za+GDlT>%qD28Ng6auFcfzW?->iEkYy>oF?xC)!G28KgZv%NrcxcKRyiEkYklP2pjDg(&?Ms*-r4rb3{R0Xp4GitCW zDFt{q2E|VfWK=VTvV&X$LtTSI;zNTxm0~rmxfHu9|2%BGv&O>e-@H#<5-bMaUWYL; LFfh0~`8ojry{9I% diff --git a/ext/phar/tests/files/frontcontroller12.phar.inc b/ext/phar/tests/files/frontcontroller12.phar.inc index f1e4645e2f09a..ba17df37e17f2 100644 --- a/ext/phar/tests/files/frontcontroller12.phar.inc +++ b/ext/phar/tests/files/frontcontroller12.phar.inc @@ -3,13 +3,13 @@ $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar'); $a['index.php'] = 'setStub('setStub('-vf9EAw=?EOs(6Ffh0~`8ojrN}(71 delta 76 zcmdnOyp4H+E_afWenzH}f~}oG(nPcOEZmE;y(Vii%0d`kjB*f04x_HLL74sw^VFRy Y7>=eieYxpbxoW2;69WT-yOXaI0EGS+PXGV_ diff --git a/ext/phar/tests/files/frontcontroller3.phar.inc b/ext/phar/tests/files/frontcontroller3.phar.inc index c2095947bd4dc..2759d9ee45a7e 100644 --- a/ext/phar/tests/files/frontcontroller3.phar.inc +++ b/ext/phar/tests/files/frontcontroller3.phar.inc @@ -7,7 +7,7 @@ $a['a.phps'] = 'setStub(' b"a.phps"); + static $b = array("/hi" => "a.phps"); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/files/frontcontroller4.phar b/ext/phar/tests/files/frontcontroller4.phar index 004d1ffd16369799b16b5b80441d8d130e2fecc1..3d4783f64b2c2c04e1de765951c686eac3428d63 100644 GIT binary patch delta 89 zcmdnUyn%Uw?nJ#Ws-Y2b5zGt>3~S$Szp#xF$N&OXAWqcFDo6)OfD}x2XOv?BGcp-< iWV#PDom>BW%LgltA6sXos>yKQ`xMRuRO#;I>jVIu_#3VO delta 91 zcmdnMypef=E@RR}-7l)~;aOhH3=9lw-*3OLjSZ;`>F}?e4qMx2v+tF#%P&JNY^R0Ly?IF#rGn diff --git a/ext/phar/tests/files/frontcontroller4.phar.inc b/ext/phar/tests/files/frontcontroller4.phar.inc index daf807e419c68..5c6a43f9546ce 100644 --- a/ext/phar/tests/files/frontcontroller4.phar.inc +++ b/ext/phar/tests/files/frontcontroller4.phar.inc @@ -7,7 +7,7 @@ $a['a.phps'] = 'setStub(' false); + static $b = array("/hi" => false); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/files/frontcontroller8.phar b/ext/phar/tests/files/frontcontroller8.phar index 27280a32705635b0dc8b3d353ea489bfbd017bec..295143edb9664b9d1bba60ad7ba8a34704005242 100644 GIT binary patch delta 230 zcmeBj>u{U!-Xl9gE`o)Dfq}O@TYDQLkO2hjK%8i(SCCOqY!76Dlz`~#%bUz$N?1Wk z^s)-lL3%+7CYv+LvVa*8jLHy3J)^uTNJI#zq;{U-OJu!y`Kc8pOfbENVOn0n7=ldd z5JPO3bR?C6TmwU0gG1s&gFKaDbre+MgI$BdT!W%FH#21`$aH_Gvk}y@)X-vj6|8aR R(S|+S=KFz+c6ai10ssP8Iu!r_ delta 232 zcmeBh>vEg$-ed8iY%dlD1_s{tZ0&7~Kn4)71976EUO`4du_KTPQUao%7?r(%DPaXE z(aS1G2k8YVm~74{%K~OZFe*bB^^EeWAQ2&;lG=HSFOl`;<)>DZFv0X5hG}^PV+b;- zLkzKD(veP53UUn$bqx-Q4-N8Eiq%n2i4S%S3UdvLPTJhal&v6>|58cWvneda)Z(35 T{IN9G___bZL590K`8ojrfK);D diff --git a/ext/phar/tests/files/frontcontroller8.phar.inc b/ext/phar/tests/files/frontcontroller8.phar.inc index 8629f0890d20a..1dfb654a031ed 100644 --- a/ext/phar/tests/files/frontcontroller8.phar.inc +++ b/ext/phar/tests/files/frontcontroller8.phar.inc @@ -2,7 +2,7 @@ @unlink(dirname(__FILE__) . '/frontcontroller8.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller8.phar'); $a['a.phps'] = 'hio1'; -$a['a1.phps'] = ''; include 'files/phar_test.inc'; $fp = fopen($pname . '/b/c.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $pname . '/b/c.php'; ?> diff --git a/ext/phar/tests/open_for_write_newfile.phpt b/ext/phar/tests/open_for_write_newfile.phpt index 735e3b4dd75ed..13114072da0e6 100644 --- a/ext/phar/tests/open_for_write_newfile.phpt +++ b/ext/phar/tests/open_for_write_newfile.phpt @@ -18,7 +18,7 @@ $files['b/c.php'] = ''; include 'files/phar_test.inc'; $fp = fopen($pname . '/b/new.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $pname . '/b/c.php'; include $pname . '/b/new.php'; diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt index 72edc5a99ebf3..13b4d6a781216 100644 --- a/ext/phar/tests/phar_ctx_001.phpt +++ b/ext/phar/tests/phar_ctx_001.phpt @@ -28,12 +28,12 @@ var_dump($phar['b']->isCompressed()); var_dump(file_get_contents($pname . '/c')); var_dump($phar['c']->isCompressed()); -$context = stream_context_create(array('phar'=> array('compress'=>Phar::GZ, 'metadata' => array(2, b'hi' => 3)))); +$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', b'new a', 0); // no compression -file_put_contents($pname . '/b', b'new b', 0, $context); -file_put_contents($pname . '/d', b'new d', 0, $context2); +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); $phar = new Phar($fname); var_dump(file_get_contents($pname . '/a')); diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt index d4ec5cb720711..d03d6f1a98941 100644 --- a/ext/phar/tests/phar_oo_compressed_002.phpt +++ b/ext/phar/tests/phar_oo_compressed_002.phpt @@ -30,10 +30,10 @@ var_dump($phar['c']->isCompressed()); $context = stream_context_create(array('phar'=>array('compress'=>Phar::GZ))); -file_put_contents($pname . '/b', b'new b'); -file_put_contents($pname . '/c', b'new c', 0, $context); -file_put_contents($pname . '/d', b'new d'); -file_put_contents($pname . '/e', b'new e', 0, $context); +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); $phar = new Phar($fname); var_dump(file_get_contents($pname . '/a')); diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt index d7213fdbaaa6f..0e167012b7681 100644 --- a/ext/phar/tests/phar_oo_compressed_002b.phpt +++ b/ext/phar/tests/phar_oo_compressed_002b.phpt @@ -30,10 +30,10 @@ var_dump($phar['c']->isCompressed()); $context = stream_context_create(array('phar'=>array('compress'=>Phar::BZ2))); -file_put_contents($pname . '/b', b'new b'); -file_put_contents($pname . '/c', b'new c', 0, $context); -file_put_contents($pname . '/d', b'new d'); -file_put_contents($pname . '/e', b'new e', 0, $context); +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); $phar = new Phar($fname); var_dump(file_get_contents($pname . '/a')); diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt index 832dc409bdd3c..ed306816e2dd6 100644 --- a/ext/phar/tests/phar_stub.phpt +++ b/ext/phar/tests/phar_stub.phpt @@ -33,7 +33,7 @@ echo fread($fp, strlen($file)) . "\n"; fclose($fp); $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php'; -$file = b''; +$file = ''; $fp = fopen($fname2, 'wb'); fwrite($fp, $file); fclose($fp); @@ -48,7 +48,7 @@ echo fread($fp, strlen($file)) . "\n"; fclose($fp); $fp = fopen($fname2, 'ab'); -fwrite($fp, b'booya'); +fwrite($fp, 'booya'); fclose($fp); echo file_get_contents($fname2) . "\n"; diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt index bb5d63bcf7288..99f313bc2ff92 100644 --- a/ext/phar/tests/phar_stub_error.phpt +++ b/ext/phar/tests/phar_stub_error.phpt @@ -9,7 +9,7 @@ phar.readonly=0 '; +$stub = ''; $file = $stub; $files = array(); diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt index ecdb3b9b638cc..9e5d6d56352d2 100644 --- a/ext/phar/tests/phar_stub_write.phpt +++ b/ext/phar/tests/phar_stub_write.phpt @@ -9,7 +9,7 @@ phar.readonly=0 '; +$stub = ''; $file = $stub; $files = array(); diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt index e4c86768164cb..c5a0a1eba9014 100644 --- a/ext/phar/tests/phar_stub_write_file.phpt +++ b/ext/phar/tests/phar_stub_write_file.phpt @@ -10,7 +10,7 @@ allow_url_fopen=1 '; +$stub = ''; $file = $stub; $files = array(); diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt index ddbb7f7c2ded7..00dfd22a58027 100644 --- a/ext/phar/tests/refcount1.phpt +++ b/ext/phar/tests/refcount1.phpt @@ -11,7 +11,7 @@ phar.require_hash=0 "; +$file = ""; $files = array(); $files['a.php'] = ''; @@ -20,7 +20,7 @@ $files['b/c.php'] = ''; include 'files/phar_test.inc'; $fp = fopen($pname . '/b/c.php', 'wb'); -fwrite($fp, b"extra"); +fwrite($fp, "extra"); fclose($fp); echo "===CLOSE===\n"; $p = new Phar($fname); diff --git a/ext/phar/tests/rmdir.phpt b/ext/phar/tests/rmdir.phpt index 726e2cfbac972..ef061bf7c2c4e 100644 --- a/ext/phar/tests/rmdir.phpt +++ b/ext/phar/tests/rmdir.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 "; diff --git a/ext/phar/tests/tar/files/frontcontroller12.phar.inc b/ext/phar/tests/tar/files/frontcontroller12.phar.inc index 0a9422a299032..693ef0aa01f9a 100644 --- a/ext/phar/tests/tar/files/frontcontroller12.phar.inc +++ b/ext/phar/tests/tar/files/frontcontroller12.phar.inc @@ -3,13 +3,13 @@ $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.tar'); $a['index.php'] = 'setStub('qr7|v^x>=FyKI=pURsbnU BFh2kQ delta 193 zcmZorXi%8YDq(KSU}$J$Y-Da^Xl`i6U|?WiW^8VzU@%#bF=aC&qd6l}lG5Z0OiGMN zlcSl`d6SfaTmwU0gG1s&gFGiIGKmAlmoljW$x}=k>`6)i9*#lrlVh0FfFg3twsetStub(' b"a.phps"); + static $b = array("/hi" => "a.phps"); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/tar/files/frontcontroller3.phar.tar b/ext/phar/tests/tar/files/frontcontroller3.phar.tar index 16853bd10f1f4f3978651add6d8ec33d992e279e..81a89b23c3aea0b5a9599b16ff2df5dbc74f8d8d 100644 GIT binary patch delta 207 zcmZoLXfT-2DPnA3U~Xb+VrFEfKfpLL=FD*zkTG`j!* delta 208 zcmZoLXfT-2DPm}3Y-Da^WN2i{U|?WiYGP)tU@%#bF=aC&V=J?`34j$|y=g)PU6@~7zPE=q80PM;$TL1t6 diff --git a/ext/phar/tests/tar/files/frontcontroller4.phar.inc b/ext/phar/tests/tar/files/frontcontroller4.phar.inc index bfb9b4104cfac..eb1d56f0d4e32 100644 --- a/ext/phar/tests/tar/files/frontcontroller4.phar.inc +++ b/ext/phar/tests/tar/files/frontcontroller4.phar.inc @@ -7,7 +7,7 @@ $a['a.phps'] = 'setStub(' false); + static $b = array("/hi" => false); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/tar/files/frontcontroller4.phar.tar b/ext/phar/tests/tar/files/frontcontroller4.phar.tar index 5a1d4ee10c8282f304166c017fbb1e7abdd3e561..04787536e887ef3917de98f691f20058888fb574 100644 GIT binary patch delta 197 zcmZoLXfT-2DPnA3U~Xb+YG7i_U|?WiYGQ7zU@%#bF=aC&V=J?`8G|9J0&^o%Q!$6_`s3f*U&sK5#UT8=Tt delta 198 zcmZoLXfT-2DPm}3Y-Da^Xl7u}U|?WiYGQ7zU@%#bF=aC&V=J?`IfEgp0&^o%GnfKa z9Y)5a&AM!t7$ $file) { $phar->stopBuffering(); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt index 3c7c67e941f24..90e6632a27bb5 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -37,7 +37,7 @@ function err_handler($errno, $errstr, $errfile, $errline) { set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt b/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt index 091b7df2fa191..67b1ff5fa9b26 100644 --- a/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt @@ -29,7 +29,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/tar/open_for_write_newfile.phpt b/ext/phar/tests/tar/open_for_write_newfile.phpt index e2efb3486a115..31e9d4a7e91eb 100644 --- a/ext/phar/tests/tar/open_for_write_newfile.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile.phpt @@ -27,7 +27,7 @@ foreach ($files as $n => $file) { $phar->stopBuffering(); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt b/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt index 7906bc9ddf371..ea95f557e0875 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt @@ -35,7 +35,7 @@ function err_handler($errno, $errstr, $errfile, $errline) { set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt b/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt index 8a7d8733f00aa..7624ddb3c50c7 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt @@ -29,7 +29,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; include $alias . '/b/new.php'; diff --git a/ext/phar/tests/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt index 5a61eae4a2689..e0d728f6f8419 100644 --- a/ext/phar/tests/tar/phar_stub.phpt +++ b/ext/phar/tests/tar/phar_stub.phpt @@ -22,14 +22,14 @@ copy($fname2, $fname); $phar = new Phar($fname); echo $phar->getStub(); -$file = b''; +$file = ''; //// 2 $phar->setStub($file); echo $phar->getStub(); $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php'; -$file = b''; +$file = ''; $fp = fopen($fname3, 'wb'); fwrite($fp, $file); fclose($fp); @@ -42,7 +42,7 @@ fclose($fp); echo $phar->getStub(); $fp = fopen($fname3, 'ab'); -fwrite($fp, b'booya'); +fwrite($fp, 'booya'); fclose($fp); echo file_get_contents($fname3) . "\n"; diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt index b26c47d1f7d9d..2bc786e3832c6 100644 --- a/ext/phar/tests/tar/refcount1.phpt +++ b/ext/phar/tests/tar/refcount1.phpt @@ -31,7 +31,7 @@ foreach ($files as $n => $file) { $tar->close(); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b"extra"); +fwrite($fp, "extra"); fclose($fp); echo "===CLOSE===\n"; $phar = new Phar($fname); diff --git a/ext/phar/tests/zip/files/frontcontroller12.phar.inc b/ext/phar/tests/zip/files/frontcontroller12.phar.inc index c5f38ffd19f8d..77c4a1dd0e07d 100644 --- a/ext/phar/tests/zip/files/frontcontroller12.phar.inc +++ b/ext/phar/tests/zip/files/frontcontroller12.phar.inc @@ -3,13 +3,13 @@ $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.zip'); $a['index.php'] = 'setStub('bDM@LvA)^|Q zy;~Vb+*9RCQVQ^J42lnS4)P2LiJ!PYnlWjzHlq%Z3};ke0U0;Bn(>V|BNN1Y1_l%x hCf{YUfhdw?mSQZKY{9H5!pa6x$^?YdfpiX7BLE?YDBJ)5 diff --git a/ext/phar/tests/zip/files/frontcontroller3.phar.inc b/ext/phar/tests/zip/files/frontcontroller3.phar.inc index ccd55b73f9b35..ab28f7b3d0179 100644 --- a/ext/phar/tests/zip/files/frontcontroller3.phar.inc +++ b/ext/phar/tests/zip/files/frontcontroller3.phar.inc @@ -7,7 +7,7 @@ $a['a.phps'] = 'setStub(' b"a.phps"); + static $b = array("/hi" => "a.phps"); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/zip/files/frontcontroller3.phar.zip b/ext/phar/tests/zip/files/frontcontroller3.phar.zip index 6f35a8042c2866d457e28e6a2cda6589bda3d06d..c830fd060e2d9feedcaae7514e7dc0aa720d71f2 100644 GIT binary patch delta 361 zcmdnQ_K2M?z?+$c0SwA_rFu@}GvNi%r(P>JFflSPFirFi;Z)Mk$W&6WwNse5?ive7 zc5(-!350Qg(IFS6pMgX1&5LiB`(%Kofv_-x5QAPpMq-hEab|j6Vo7OHs$NoNUS265 z!+)Whju1;hBoh#e0CA}B3dgGTbC+l;ocMdsetStub(' false); + static $b = array("/hi" => false); if (isset($b[$a])) return $b[$a]; return $a; } diff --git a/ext/phar/tests/zip/files/frontcontroller4.phar.zip b/ext/phar/tests/zip/files/frontcontroller4.phar.zip index fb27ccb0b1a92b6552710c2134953bdc4c7e345f..d87fbd8406889906e842b4b7c279a6e862030514 100644 GIT binary patch delta 342 zcmZ3>c8{Gez?+$c0SuaVrFu@}GvNi%pQRHn{{xEto9G`hamj5Kkl5sAMiU5QH={#6 zOcw)(;+x0Xr&48rszF$oL5M-GAS1Czzc@2JFR`SwC{-^hGcT`{kKw=2O-HazV1fxq ziU4t5N0kxILZGH_u$uv5pjd1G delta 160 zcmcb|zLt$Iz?+$c0Sp$+`Drzg&x995M_oK?{U0d$f1-Z~W75RMw^=} $file) { $phar->stopBuffering(); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; ?> diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt index d1f963e9aff69..01d11d794bfbf 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -37,7 +37,7 @@ function err_handler($errno, $errstr, $errfile, $errline) { set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; ?> diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt index 313ee4ab327a1..528d6f35c1ff3 100644 --- a/ext/phar/tests/zip/open_for_write_existing_c.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt @@ -31,7 +31,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; ?> diff --git a/ext/phar/tests/zip/open_for_write_newfile.phpt b/ext/phar/tests/zip/open_for_write_newfile.phpt index ffcae0f8336a0..c3782d4fd3d11 100644 --- a/ext/phar/tests/zip/open_for_write_newfile.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile.phpt @@ -26,7 +26,7 @@ foreach ($files as $n => $file) { $phar->stopBuffering(); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt index 9f5328ff9174e..0b88ead9086cd 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -37,7 +37,7 @@ function err_handler($errno, $errstr, $errfile, $errline) { set_error_handler("err_handler", E_RECOVERABLE_ERROR); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt index ef580cb229df1..def0161b04c72 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt @@ -31,7 +31,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); $fp = fopen($alias . '/b/new.php', 'wb'); -fwrite($fp, b'extra'); +fwrite($fp, 'extra'); fclose($fp); include $alias . '/b/c.php'; diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt index 72c1f17d786ae..a2a6aa6f2a1b4 100644 --- a/ext/phar/tests/zip/phar_stub.phpt +++ b/ext/phar/tests/zip/phar_stub.phpt @@ -22,14 +22,14 @@ copy($fname2, $fname); $phar = new Phar($fname); echo $phar->getStub(); -$file = b''; +$file = ''; //// 2 $phar->setStub($file); echo $phar->getStub(); $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php'; -$file = b''; +$file = ''; $fp = fopen($fname3, 'wb'); fwrite($fp, $file); fclose($fp); @@ -42,7 +42,7 @@ fclose($fp); echo $phar->getStub(); $fp = fopen($fname3, 'ab'); -fwrite($fp, b'booya'); +fwrite($fp, 'booya'); fclose($fp); echo file_get_contents($fname3) . "\n"; diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt index 618e7fefcae0f..a315f8fc5fce4 100644 --- a/ext/phar/tests/zip/refcount1.phpt +++ b/ext/phar/tests/zip/refcount1.phpt @@ -29,7 +29,7 @@ foreach ($files as $n => $file) { $phar->stopBuffering(); $fp = fopen($alias . '/b/c.php', 'wb'); -fwrite($fp, b"extra"); +fwrite($fp, "extra"); fclose($fp); echo "===CLOSE===\n"; $b = fopen($alias . '/b/c.php', 'rb'); diff --git a/ext/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt index f439e33e5e346..c64b52b8477e7 100644 --- a/ext/simplexml/tests/bug38406.phpt +++ b/ext/simplexml/tests/bug38406.phpt @@ -5,8 +5,8 @@ Bug #38406 (crash when assigning objects to SimpleXML attributes) --FILE-- '); -$item->attribute = b'something'; +$item = new SimpleXMLElement(''); +$item->attribute = 'something'; var_dump($item->attribute); $item->otherAttribute = $item->attribute; diff --git a/ext/spl/tests/iterator_006.phpt b/ext/spl/tests/iterator_006.phpt index 54da89cbd73d3..794eca0da995f 100644 --- a/ext/spl/tests/iterator_006.phpt +++ b/ext/spl/tests/iterator_006.phpt @@ -5,7 +5,7 @@ SPL: IteratorIterator and SimpleXMlElement --FILE-- +$root = simplexml_load_string(' Hello World diff --git a/ext/spl/tests/multiple_iterator_001.phpt b/ext/spl/tests/multiple_iterator_001.phpt index eb77f79371ba8..be7eeeac7e34b 100644 --- a/ext/spl/tests/multiple_iterator_001.phpt +++ b/ext/spl/tests/multiple_iterator_001.phpt @@ -68,7 +68,7 @@ try { echo "-- Flags |= MultipleIterator::MIT_KEYS_ASSOC --\n"; $m->attachIterator($iter1, "iter1"); -$m->attachIterator($iter2, b"iter2"); +$m->attachIterator($iter2, "iter2"); $m->attachIterator($iter3, 3); foreach($m as $key => $value) { diff --git a/ext/standard/tests/array/bug14580.phpt b/ext/standard/tests/array/bug14580.phpt index bf0121ad69c2d..8a80bddcb40ce 100644 --- a/ext/standard/tests/array/bug14580.phpt +++ b/ext/standard/tests/array/bug14580.phpt @@ -2,7 +2,7 @@ Bug #14580 (key() not binary safe) --FILE-- b"foo\0bar"); + $arr = array ("foo\0bar" => "foo\0bar"); $key = key($arr); echo strlen($key), ': '; echo urlencode($key), "\n"; diff --git a/ext/standard/tests/array/bug44929.phpt b/ext/standard/tests/array/bug44929.phpt index 9dc85acd1f109..efcbcda1ccb50 100644 --- a/ext/standard/tests/array/bug44929.phpt +++ b/ext/standard/tests/array/bug44929.phpt @@ -2,7 +2,7 @@ Bug #44929 (natsort doesn't handle leading zeros well) --FILE-- diff --git a/ext/standard/tests/bug49244.phpt b/ext/standard/tests/bug49244.phpt index 1ba24fb9b4240..60942966a7d87 100644 --- a/ext/standard/tests/bug49244.phpt +++ b/ext/standard/tests/bug49244.phpt @@ -5,7 +5,7 @@ Bug #49244 (Floating point NaN cause garbage characters) for ($i = 0; $i < 10; $i++) { printf("{%f} %1\$f\n", pow(-1.0, 0.3)); - printf(b"{%f} %1\$f\n", pow(-1.0, 0.3)); + printf("{%f} %1\$f\n", pow(-1.0, 0.3)); } ?> diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt index 34558758e3cb0..ffcdc33cd68a8 100644 --- a/ext/standard/tests/file/005_variation-win32.phpt +++ b/ext/standard/tests/file/005_variation-win32.phpt @@ -81,7 +81,7 @@ sleep(2); /* filemtime + 2 & filectime + 2 */ echo "\n-- Checking different times, after writing into the file --\n"; $file_write_handle = fopen($file_name, "w"); -fwrite($file_write_handle, b"Hello, world"); +fwrite($file_write_handle, "Hello, world"); fclose($file_write_handle); stat_fn($file_name); sleep(2); diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index 1a2d530b65252..6174933df53ca 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode and fclose function */ $file_path = dirname(__FILE__); -$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; $file = $file_path."/007_variation15.tmp"; echo "*** Test fopen() & fclose() functions: with 'xt' mode ***\n"; diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index 1826296a06b4e..8820dbc7d5e27 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode and fclose function */ $file_path = dirname(__FILE__); -$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; $file = $file_path."/007_variation23.tmp"; echo "*** Test fopen() & fclose() functions: with 'xb' mode ***\n"; diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index 06bf9117f3390..541e5a0d1dd4f 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "x" mode and fclose function */ $file_path = dirname(__FILE__); -$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; $file = $file_path."/007_variation7.tmp"; echo "*** Test fopen() & fclose() functions: with 'x' mode ***\n"; diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index 188080aa25678..361095da5f94c 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -56,9 +56,9 @@ if (!$fp) { die("fopen failed"); } -fwrite($fp, b"line1\n"); -fwrite($fp, b"line2\n"); -fwrite($fp, b"line3\n"); +fwrite($fp, "line1\n"); +fwrite($fp, "line2\n"); +fwrite($fp, "line3\n"); debug_zval_dump(feof($fp)); rewind($fp); diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 4a2953ea7923b..2b59f50750f0f 100644 --- a/ext/standard/tests/file/bug38450.phpt +++ b/ext/standard/tests/file/bug38450.phpt @@ -88,9 +88,9 @@ $myvar = ""; $fp = fopen("var://myvar", "r+"); -fwrite($fp, b"line1\n"); -fwrite($fp, b"line2\n"); -fwrite($fp, b"line3\n"); +fwrite($fp, "line1\n"); +fwrite($fp, "line2\n"); +fwrite($fp, "line3\n"); rewind($fp); while (!feof($fp)) { diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt index d0682186f9f37..07ca7166f3110 100644 --- a/ext/standard/tests/file/bug38450_1.phpt +++ b/ext/standard/tests/file/bug38450_1.phpt @@ -88,9 +88,9 @@ $myvar = ""; $fp = fopen("var://myvar", "r+"); -fwrite($fp, b"line1\n"); -fwrite($fp, b"line2\n"); -fwrite($fp, b"line3\n"); +fwrite($fp, "line1\n"); +fwrite($fp, "line2\n"); +fwrite($fp, "line3\n"); rewind($fp); while (!feof($fp)) { diff --git a/ext/standard/tests/file/bug43008.phpt b/ext/standard/tests/file/bug43008.phpt index 3c9411d3294e8..0d9d6ed986856 100644 --- a/ext/standard/tests/file/bug43008.phpt +++ b/ext/standard/tests/file/bug43008.phpt @@ -8,13 +8,13 @@ if (!extension_loaded("iconv")) die("skip iconv extension not available"); allow_url_fopen=1 --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/file/copy_variation1.phpt b/ext/standard/tests/file/copy_variation1.phpt index 4d0a97302a5c2..7cf20fd74940b 100644 --- a/ext/standard/tests/file/copy_variation1.phpt +++ b/ext/standard/tests/file/copy_variation1.phpt @@ -15,7 +15,7 @@ echo "*** Test copy() function: destination file names containing numerics/strin $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation1.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index 98494af043565..c5cbc84254bfb 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -14,7 +14,7 @@ $file_path = dirname(__FILE__); echo "*** Test copy(): Trying to create a copy of file with the same source name ***\n"; $file = $file_path."/copy_variation10.tmp"; $file_handle = fopen($file, "w"); -fwrite($file_handle, str_repeat(b"Hello2world...\n", 100)); +fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); var_dump( copy($file, $file) ); diff --git a/ext/standard/tests/file/copy_variation11.phpt b/ext/standard/tests/file/copy_variation11.phpt index adee8e1c65056..b01dab0890059 100644 --- a/ext/standard/tests/file/copy_variation11.phpt +++ b/ext/standard/tests/file/copy_variation11.phpt @@ -14,7 +14,7 @@ $file_path = dirname(__FILE__); echo "*** Test copy() function: Trying to create a copy of source file as a dir ***\n"; $file = $file_path."/copy_variation11.tmp"; $file_handle = fopen($file, "w"); -fwrite($file_handle, str_repeat(b"Hello, world...", 20)); +fwrite($file_handle, str_repeat("Hello, world...", 20)); fclose($file_handle); $dir = $file_path."/copy_variation11"; diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt index 1a39c1c6a9d94..6eb8fe3ee4026 100644 --- a/ext/standard/tests/file/copy_variation14.phpt +++ b/ext/standard/tests/file/copy_variation14.phpt @@ -15,7 +15,7 @@ $file_path = dirname(__FILE__); echo "*** Test copy() function: Trying to create a copy of non-existing source in existing destination ***"; $file = $file_path."/copy_variation14.tmp"; $file_handle = fopen($file, "w"); -fwrite($file_handle, str_repeat(b"Hello2world...\n", 100)); +fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); var_dump( copy($file_path."/nosuchfile.tmp", $file_path."/copy_nosuchfile.tmp") ); //With non-existing source diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt index fbf5e7bf9eb36..fdc84e989a96d 100644 --- a/ext/standard/tests/file/copy_variation15.phpt +++ b/ext/standard/tests/file/copy_variation15.phpt @@ -28,7 +28,7 @@ $file_path = dirname(__FILE__); echo "*** Test copy() function: Trying to create a copy of file in a dir which doesn't have write permissions ***"; $file = $file_path."/copy_variation15.tmp"; $file_handle = fopen($file, "w"); -fwrite($file_handle, str_repeat(b"Hello, world...", 20)); +fwrite($file_handle, str_repeat("Hello, world...", 20)); fclose($file_handle); $dir = $file_path."/copy_variation15"; diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index d95d24adacb56..eff56a1ec79c3 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -27,7 +27,7 @@ mkdir($dirname_with_blank); $src_file_name = dirname(__FILE__)."/copy_variation16.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite($file_handle, str_repeat(b"Hello world, this is 2007 year ...\n", 100)); +fwrite($file_handle, str_repeat("Hello world, this is 2007 year ...\n", 100)); fclose($file_handle); echo "- Size of source file => "; diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt index 97f1665f01475..2dfe94c6e9a0e 100644 --- a/ext/standard/tests/file/copy_variation17.phpt +++ b/ext/standard/tests/file/copy_variation17.phpt @@ -14,7 +14,7 @@ $file_path = dirname(__FILE__); echo "*** Test copy() function: With source file names containing wild-card chars ***\n"; $src_file = $file_path."/copy_variation17.tmp"; $file_handle = fopen($src_file, "w"); -fwrite($file_handle, str_repeat(b"Hello2world...\n", 100)); +fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); $dir = $file_path."/copy_variation17"; diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt index e818e294d80a4..95688c97c5197 100644 --- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt @@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing special charac $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation2私はガラスを食べられます.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt index 4819d63e36427..82235ba814470 100644 --- a/ext/standard/tests/file/copy_variation2-win32.phpt +++ b/ext/standard/tests/file/copy_variation2-win32.phpt @@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing special charac $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt index d99f5a8da39d1..a9b36803d9b29 100644 --- a/ext/standard/tests/file/copy_variation2.phpt +++ b/ext/standard/tests/file/copy_variation2.phpt @@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing special charac $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt index 68ce4a1680660..5055c297f6ef9 100644 --- a/ext/standard/tests/file/copy_variation3-win32.phpt +++ b/ext/standard/tests/file/copy_variation3-win32.phpt @@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing whitespaces ** $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation3.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 1c45c8c129376..56f797bc95373 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing whitespaces ** $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation3.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt index 3c8224da0a917e8284f362c79fb1d050ff02e519..47152d4239c7fd95d21676c0b973f7c7b2fba84f 100644 GIT binary patch delta 12 TcmaE+_Ec>{0`ulXW>x_JBo+i$ delta 14 VcmaE=_DpR<0yAUM<^*O|0RSwy1i1hJ diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index baf7be470cd1c..48e85eaf02200 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -20,7 +20,7 @@ echo "*** Test copy() function: checking case sensitivity in creation of destina $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation5.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt index 8abc9c961a22f..c480fcc3bf1dc 100644 --- a/ext/standard/tests/file/copy_variation5.phpt +++ b/ext/standard/tests/file/copy_variation5.phpt @@ -20,7 +20,7 @@ echo "*** Test copy() function: checking case sensitivity in creation of destina $file_path = dirname(__FILE__); $src_file_name = $file_path."/copy_variation5.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); +fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); /* array of destination file names */ diff --git a/ext/standard/tests/file/copy_variation7.phpt b/ext/standard/tests/file/copy_variation7.phpt index d687b073c713f..474d33bc492f9 100644 --- a/ext/standard/tests/file/copy_variation7.phpt +++ b/ext/standard/tests/file/copy_variation7.phpt @@ -20,7 +20,7 @@ $file_path = dirname(__FILE__); echo "*** Testing copy() with symlink and hardlink ***\n"; $file = $file_path."/copy_variation7.tmp"; $file_handle = fopen($file, "w"); -fwrite( $file_handle, str_repeat(b"Hello World, this is 2007 year ....\n", 100) ); +fwrite( $file_handle, str_repeat("Hello World, this is 2007 year ....\n", 100) ); fclose($file_handle); $symlink = $file_path."/copy_variation7_symlink.tmp"; diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt index 824bed0c7665f..34d5b907d974f 100644 --- a/ext/standard/tests/file/copy_variation9.phpt +++ b/ext/standard/tests/file/copy_variation9.phpt @@ -29,7 +29,7 @@ $file_path = dirname(__FILE__); echo "*** Test copy() function: destination with/without write permissions ***\n"; $src_file_name = $file_path."/copy_variation9.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite($file_handle, str_repeat(b"Hello2world...\n", 100)); +fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); $dest_file_name = $file_path."/copy_copy_variation9.tmp"; diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt index 3afc3dc180f1f..9e8bbe6d1f350 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt @@ -27,7 +27,7 @@ set_error_handler('test_error_handler'); $filename = 'FileGetContentsVar5.tmp'; $absFile = dirname(__FILE__).'/'.$filename; $h = fopen($absFile,"w"); -fwrite($h, b"contents read"); +fwrite($h, "contents read"); fclose($h); diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt index df33059f303ea..170ba4343e688 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt @@ -27,7 +27,7 @@ set_error_handler('test_error_handler'); $filename = 'FileGetContentsVar5.tmp'; $absFile = dirname(__FILE__).'/'.$filename; $h = fopen($absFile,"w"); -fwrite($h, b"contents read"); +fwrite($h, "contents read"); fclose($h); diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index 99812b53493bb..7e500e8c56e02 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -25,7 +25,7 @@ $chainlink = dirname(__FILE__).'/fileGetContentsVar9.ChainLink'; $h = fopen($filename,"w"); //Data should be more than the size of a link. for ($i = 1; $i <= 10; $i++) { - fwrite($h, b"Here is a repeated amount of data"); + fwrite($h, "Here is a repeated amount of data"); } fclose($h); diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt index c29ed317592ae..edb0b3a3b0781 100644 --- a/ext/standard/tests/file/fseek_variation3.phpt +++ b/ext/standard/tests/file/fseek_variation3.phpt @@ -29,7 +29,7 @@ echo "after seek back 20: ".bin2hex(fread($h,1))."\n"; echo "--- fseek beyond end of file ---\n"; var_dump(fseek($h, 16, SEEK_SET)); -fwrite($h, b"end"); +fwrite($h, "end"); fseek($h ,0, SEEK_SET); $data = fread($h, 4096); echo bin2hex($data)."\n"; diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt index e459c6a1aac61..05b16238cd513 100644 --- a/ext/standard/tests/file/include_streams.phpt +++ b/ext/standard/tests/file/include_streams.phpt @@ -32,7 +32,7 @@ class mystream $this->options = $options; $split = parse_url($path); - if ($split["host"] !== b"GLOBALS" || + if ($split["host"] !== "GLOBALS" || empty($split["path"]) || empty($GLOBALS[substr($split["path"],1)])) { return false; diff --git a/ext/standard/tests/file/move_uploaded_file_basic.phpt b/ext/standard/tests/file/move_uploaded_file_basic.phpt index 00bbcf6e18930..7349a694de15d 100644 --- a/ext/standard/tests/file/move_uploaded_file_basic.phpt +++ b/ext/standard/tests/file/move_uploaded_file_basic.phpt @@ -28,7 +28,7 @@ $destination1 = __FILE__ . ".tmp"; var_dump(move_uploaded_file($_FILES['file1']['tmp_name'], $destination1)); $file_contents = file_get_contents($destination1); -$contents_matches = ($file_contents == b"abcdef123456789xxxDDDxxxDDDxxxDDD"); +$contents_matches = ($file_contents == "abcdef123456789xxxDDDxxxDDDxxxDDD"); var_dump($contents_matches); unlink($destination1); echo "\n"; diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt index 53eda5a64e1f0..bc4196925d259 100644 --- a/ext/standard/tests/file/pathinfo_basic.phpt +++ b/ext/standard/tests/file/pathinfo_basic.phpt @@ -32,7 +32,7 @@ $paths = array ( "$file_path/foo".chr(47)."symlink.link", "$file_path".chr(47)."foo/symlink.link", "$file_path".chr(47)."foo".chr(47)."symlink.link", - b"$file_path/foo/symlink.link", + "$file_path/foo/symlink.link", /* Testing directories */ ".", // current directory diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt index 3348403e2b559..04882853ecb9f 100644 --- a/ext/standard/tests/file/proc_open01.phpt +++ b/ext/standard/tests/file/proc_open01.phpt @@ -18,7 +18,7 @@ if ($proc === false) { } var_dump($pipes); stream_set_blocking($pipes[1], FALSE); -$test_string = b"yay!\n"; +$test_string = "yay!\n"; fwrite($pipes[0], $test_string); fflush($pipes[0]); fclose($pipes[0]); diff --git a/ext/standard/tests/file/realpath_basic-win32-mb.phpt b/ext/standard/tests/file/realpath_basic-win32-mb.phpt index c0f39b605454b..dbfdfc41d6530 100644 --- a/ext/standard/tests/file/realpath_basic-win32-mb.phpt +++ b/ext/standard/tests/file/realpath_basic-win32-mb.phpt @@ -34,7 +34,7 @@ $filenames = array ( "$file_path/realpath_私はガラスを食べられますbasic/home//../././realpath_私はガラスを食べられますbasic.tmp//", // checking for binary safe - b"$file_path/realpath_私はガラスを食べられますbasic/home/realpath_私はガラスを食べられますbasic.tmp", + "$file_path/realpath_私はガラスを食べられますbasic/home/realpath_私はガラスを食べられますbasic.tmp", /* filenames with invalid path */ "$file_path///realpath_私はガラスを食べられますbasic/home//..//././test//realpath_私はガラスを食べられますbasic.tmp", diff --git a/ext/standard/tests/file/realpath_basic-win32.phpt b/ext/standard/tests/file/realpath_basic-win32.phpt index 5ebfcff683da8..a768ca95401b2 100644 --- a/ext/standard/tests/file/realpath_basic-win32.phpt +++ b/ext/standard/tests/file/realpath_basic-win32.phpt @@ -34,7 +34,7 @@ $filenames = array ( "$file_path/realpath_basic/home//../././realpath_basic.tmp//", // checking for binary safe - b"$file_path/realpath_basic/home/realpath_basic.tmp", + "$file_path/realpath_basic/home/realpath_basic.tmp", /* filenames with invalid path */ "$file_path///realpath_basic/home//..//././test//realpath_basic.tmp", diff --git a/ext/standard/tests/file/stream_get_line.phpt b/ext/standard/tests/file/stream_get_line.phpt index 89798ef95eae3..2c11f00eedc30 100644 --- a/ext/standard/tests/file/stream_get_line.phpt +++ b/ext/standard/tests/file/stream_get_line.phpt @@ -4,7 +4,7 @@ Crash inside stream_get_line(), when length=0 bar
foo"); +file_put_contents($path, "foo
bar
foo"); $fp = fopen($path, "r"); while ($fp && !feof($fp)) { echo stream_get_line($fp, 0, "
")."\n"; diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt index 2246b5d8a4e08..dfa8376fffc68 100644 --- a/ext/standard/tests/file/userfilters.phpt +++ b/ext/standard/tests/file/userfilters.phpt @@ -20,7 +20,7 @@ class testfilter extends php_user_filter { stream_filter_register('testfilter','testfilter'); -$text = b"Hello There!"; +$text = "Hello There!"; $fp = tmpfile(); fwrite($fp, $text); diff --git a/ext/standard/tests/filters/filter_errors.inc b/ext/standard/tests/filters/filter_errors.inc index 7345df383c9c6..6d1a270c82e0c 100644 --- a/ext/standard/tests/filters/filter_errors.inc +++ b/ext/standard/tests/filters/filter_errors.inc @@ -17,7 +17,7 @@ function filter_errors_test($filter, $data) { $stream = fopen('php://memory', 'wb+'); - fwrite($stream, b".\r\n$data"); + fwrite($stream, ".\r\n$data"); fseek($stream, 0, SEEK_SET); stream_get_line($stream, 8192, "\r\n"); @@ -27,7 +27,7 @@ function filter_errors_test($filter, $data) { $stream = fopen('php://memory', 'wb+'); - fwrite($stream, b"$data"); + fwrite($stream, "$data"); fseek($stream, 0, SEEK_SET); stream_filter_append($stream, $filter); diff --git a/ext/standard/tests/filters/filter_errors_user.phpt b/ext/standard/tests/filters/filter_errors_user.phpt index 7bdf8de08a064..9b911cf81f1f2 100644 --- a/ext/standard/tests/filters/filter_errors_user.phpt +++ b/ext/standard/tests/filters/filter_errors_user.phpt @@ -52,7 +52,7 @@ echo "test append / read / remove\n"; for($i = 0; $i < 5; ++$i) { echo "test_filter$i\n"; $stream = fopen('php://memory', 'wb+'); - fwrite($stream, b"42"); + fwrite($stream, "42"); fseek($stream, 0, SEEK_SET); $f = stream_filter_append($stream, "test_filter$i"); stream_get_contents($stream); @@ -61,7 +61,7 @@ for($i = 0; $i < 5; ++$i) { echo "test append all / read / remove all\n"; $stream = fopen('php://memory', 'wb+'); -fwrite($stream, b"42"); +fwrite($stream, "42"); fseek($stream, 0, SEEK_SET); $filters = array(); for($i = 0; $i < 5; ++$i) { @@ -75,7 +75,7 @@ foreach($filters as $filter) { echo "test append all / read / close\n"; $stream = fopen('php://memory', 'wb+'); -fwrite($stream, b"42"); +fwrite($stream, "42"); fseek($stream, 0, SEEK_SET); $filters = array(); for($i = 0; $i < 5; ++$i) { diff --git a/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt b/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt index ebb3b21df2227..be7bdba3fb90e 100644 --- a/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt +++ b/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt @@ -5,7 +5,7 @@ Filter errors: zlib.inflate --FILE-- --EXPECTF-- test filtering of buffered data diff --git a/ext/standard/tests/http/server.inc b/ext/standard/tests/http/server.inc index b9ade0e9f0798..db66c3dd1373f 100644 --- a/ext/standard/tests/http/server.inc +++ b/ext/standard/tests/http/server.inc @@ -54,13 +54,13 @@ function http_server($socket_string, array $files, &$output = null) { if (!stream_select($r, $w, $e, 1)) continue; $line = stream_get_line($sock, 8192, "\r\n"); - if ($line === b'') { - fwrite($output, b"\r\n"); + if ($line === '') { + fwrite($output, "\r\n"); break; } else if ($line !== false) { - fwrite($output, b"$line\r\n"); + fwrite($output, "$line\r\n"); - if (preg_match(b'#^Content-Length\s*:\s*([[:digit:]]+)\s*$#i', $line, $matches)) { + if (preg_match('#^Content-Length\s*:\s*([[:digit:]]+)\s*$#i', $line, $matches)) { $content_length = (int) $matches[1]; } } diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt index ce70eace232f7..2f810e2562abf 100644 --- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt @@ -13,8 +13,8 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing ezmlm_hash() : basic functionality ***\n"; -var_dump(ezmlm_hash(b"webmaster@somewhere.com")); -var_dump(ezmlm_hash(b"foo@somewhere.com")); +var_dump(ezmlm_hash("webmaster@somewhere.com")); +var_dump(ezmlm_hash("foo@somewhere.com")); ?> ===Done=== diff --git a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt index 03ac67b9b4067..46abdba7c8001 100644 --- a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt @@ -13,8 +13,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing ezmlm_hash() : basic functionality ***\n"; -var_dump(ezmlm_hash(b"webmaster@somewhere.com")); -var_dump(ezmlm_hash(b"foo@somewhere.com")); +var_dump(ezmlm_hash("webmaster@somewhere.com")); +var_dump(ezmlm_hash("foo@somewhere.com")); ?> ===Done=== diff --git a/ext/standard/tests/network/bug20134.phpt b/ext/standard/tests/network/bug20134.phpt index 400e3fb15cc4f..e311f892f774d 100644 --- a/ext/standard/tests/network/bug20134.phpt +++ b/ext/standard/tests/network/bug20134.phpt @@ -11,7 +11,7 @@ if (!$fp) { } else { /* Likewise, writes will always appear to succeed */ - $x = fwrite($fp,b"\n"); + $x = fwrite($fp,"\n"); var_dump($x); /* But reads should always fail */ $content = fread($fp, 40); diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt index 851e1ba6c54d2..d2dcbb48c1cb9 100644 --- a/ext/standard/tests/network/inet.phpt +++ b/ext/standard/tests/network/inet.phpt @@ -16,19 +16,19 @@ var_dump(inet_ntop((binary)$packed)); var_dump(inet_ntop()); var_dump(inet_ntop(-1)); -var_dump(inet_ntop(b"")); -var_dump(inet_ntop(b"blah-blah")); +var_dump(inet_ntop("")); +var_dump(inet_ntop("blah-blah")); var_dump(inet_pton()); -var_dump(inet_pton(b"")); +var_dump(inet_pton("")); var_dump(inet_pton(-1)); -var_dump(inet_pton(b"abra")); +var_dump(inet_pton("abra")); $array = array( - b"127.0.0.1", - b"66.163.161.116", - b"255.255.255.255", - b"0.0.0.0", + "127.0.0.1", + "66.163.161.116", + "255.255.255.255", + "0.0.0.0", ); foreach ($array as $val) { var_dump(bin2hex($packed = inet_pton($val))); diff --git a/ext/standard/tests/serialize/bug43614.phpt b/ext/standard/tests/serialize/bug43614.phpt index 68568a1224105..127dfba586227 100644 --- a/ext/standard/tests/serialize/bug43614.phpt +++ b/ext/standard/tests/serialize/bug43614.phpt @@ -7,7 +7,7 @@ error_reporting(E_ALL); var_dump($a = unserialize('a:2:{s:2:"10";i:1;s:2:"01";i:2;}')); var_dump($a['10']); -var_dump($a[b'01']); +var_dump($a['01']); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/bug44818.phpt b/ext/standard/tests/streams/bug44818.phpt index 628f64e341002..7bd9fe51685b5 100644 --- a/ext/standard/tests/streams/bug44818.phpt +++ b/ext/standard/tests/streams/bug44818.phpt @@ -5,7 +5,7 @@ Bug #44818 (php://memory writeable when opened read only) function test($url, $mode) { echo "$url, $mode\n"; $fd = fopen($url, $mode); - var_dump($fd, fwrite($fd, b"foo")); + var_dump($fd, fwrite($fd, "foo")); var_dump(fseek($fd, 0, SEEK_SET), fread($fd, 3)); fclose($fd); } diff --git a/ext/standard/tests/streams/bug46426.phpt b/ext/standard/tests/streams/bug46426.phpt index 80dbcded80002..8c95ea456e527 100644 --- a/ext/standard/tests/streams/bug46426.phpt +++ b/ext/standard/tests/streams/bug46426.phpt @@ -5,7 +5,7 @@ Bug #46426 (3rd parameter offset of stream_get_contents not works for "0") $tmp = tmpfile(); -fwrite($tmp, b"12345"); +fwrite($tmp, "12345"); echo stream_get_contents($tmp, 2, 1); echo "\n"; diff --git a/ext/standard/tests/streams/bug48309.phpt b/ext/standard/tests/streams/bug48309.phpt index d347cc39c83ec..bb2d9d28f71b8 100644 --- a/ext/standard/tests/streams/bug48309.phpt +++ b/ext/standard/tests/streams/bug48309.phpt @@ -4,7 +4,7 @@ Bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream position diff --git a/ext/standard/tests/streams/stream_get_line_nb.phpt b/ext/standard/tests/streams/stream_get_line_nb.phpt index ce981203ffbb2..40a609537442f 100644 --- a/ext/standard/tests/streams/stream_get_line_nb.phpt +++ b/ext/standard/tests/streams/stream_get_line_nb.phpt @@ -20,25 +20,25 @@ var_dump($sockets); stream_set_blocking($sockets[1], 0); -$eol = b''; +$eol = ''; -fwrite($sockets[0], b"line start"); +fwrite($sockets[0], "line start"); var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns incomplete line (EOL not found) var_dump(stream_get_line($sockets[1], 8192, $eol)); -fwrite($sockets[0], b", line end"); -fwrite($sockets[0], b", $eol"); +fwrite($sockets[0], ", line end"); +fwrite($sockets[0], ", $eol"); var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns full line (EOL found) var_dump(stream_get_line($sockets[1], 8192, $eol)); // Nothing to read var_dump(stream_get_line($sockets[1], 8192, $eol)); -fwrite($sockets[0], b"incomplete line"); -var_dump(stream_get_line($sockets[1], strlen(b"incomplete line"), $eol)); // EOL not found but $length has been read, return incomplete line +fwrite($sockets[0], "incomplete line"); +var_dump(stream_get_line($sockets[1], strlen("incomplete line"), $eol)); // EOL not found but $length has been read, return incomplete line -fwrite($sockets[0], b"incomplete line"); +fwrite($sockets[0], "incomplete line"); var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns incomplete line (EOL not found) -var_dump(fread($sockets[1], strlen(b"incomplete line"))); // Returns buffer readden by stream_get_line +var_dump(fread($sockets[1], strlen("incomplete line"))); // Returns buffer readden by stream_get_line -fwrite($sockets[0], b"end of file"); +fwrite($sockets[0], "end of file"); var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns incomplete line (EOL not found) fclose($sockets[0]); diff --git a/ext/standard/tests/streams/stream_socket_pair.phpt b/ext/standard/tests/streams/stream_socket_pair.phpt index 203ae982d1c21..b926c9d9f4387 100644 --- a/ext/standard/tests/streams/stream_socket_pair.phpt +++ b/ext/standard/tests/streams/stream_socket_pair.phpt @@ -5,8 +5,8 @@ stream_socket_pair() $domain = (strtoupper(substr(PHP_OS, 0, 3) == 'WIN') ? STREAM_PF_INET : STREAM_PF_UNIX); $sockets = stream_socket_pair($domain, STREAM_SOCK_STREAM, 0); var_dump($sockets); -fwrite($sockets[0], b"foo"); -var_dump(fread($sockets[1], strlen(b"foo"))); +fwrite($sockets[0], "foo"); +var_dump(fread($sockets[1], strlen("foo"))); fclose($sockets[0]); ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/bug44703.phpt b/ext/standard/tests/strings/bug44703.phpt index e20b1dd83f68a..6171cee923eba 100644 --- a/ext/standard/tests/strings/bug44703.phpt +++ b/ext/standard/tests/strings/bug44703.phpt @@ -3,22 +3,22 @@ Bug #44703 (htmlspecialchars() does not detect bad character set argument) --FILE-- Test", ENT_COMPAT, 1)); -var_dump(htmlspecialchars(b"Test", ENT_COMPAT, 12)); -var_dump(htmlspecialchars(b"Test", ENT_COMPAT, 125)); -var_dump(htmlspecialchars(b"Test", ENT_COMPAT, 1252)); -var_dump(htmlspecialchars(b"Test", ENT_COMPAT, 12526)); +var_dump(htmlspecialchars("Test", ENT_COMPAT, 1)); +var_dump(htmlspecialchars("Test", ENT_COMPAT, 12)); +var_dump(htmlspecialchars("Test", ENT_COMPAT, 125)); +var_dump(htmlspecialchars("Test", ENT_COMPAT, 1252)); +var_dump(htmlspecialchars("Test", ENT_COMPAT, 12526)); -var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 866)); -var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 8666)); +var_dump(htmlspecialchars("<>", ENT_COMPAT, 866)); +var_dump(htmlspecialchars("<>", ENT_COMPAT, 8666)); -var_dump(htmlspecialchars(b"<>", ENT_COMPAT, NULL)); +var_dump(htmlspecialchars("<>", ENT_COMPAT, NULL)); -var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SJIS')); -var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SjiS')); +var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SJIS')); +var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SjiS')); -var_dump(htmlspecialchars(b"<>", ENT_COMPAT, str_repeat('a', 100))); +var_dump(htmlspecialchars("<>", ENT_COMPAT, str_repeat('a', 100))); ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/bug51059.phpt b/ext/standard/tests/strings/bug51059.phpt index bdc56f1762db3..d17305ca50ddf 100644 --- a/ext/standard/tests/strings/bug51059.phpt +++ b/ext/standard/tests/strings/bug51059.phpt @@ -2,8 +2,8 @@ Bug #51059 crypt() segfaults on certain salts --FILE-- diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt index df8ee3666e065..9849997d41d94 100644 --- a/ext/standard/tests/strings/convert_uuencode_basic.phpt +++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt @@ -14,18 +14,18 @@ echo "*** Testing convert_uuencode() : basic functionality ***\n"; $strings = array ( //double quoted strings - b"123", - b"abc", - b"1a2b3c", - b"Here is a simple string to test convert_uuencode/decode", - b"\t This String contains \t\t some control characters\r\n", - b"\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", + "123", + "abc", + "1a2b3c", + "Here is a simple string to test convert_uuencode/decode", + "\t This String contains \t\t some control characters\r\n", + "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", //single quoted strings - b'123', - b'abc', - b'1a2b3c', - b'\t This String contains \t\t some control characters\r\n', + '123', + 'abc', + '1a2b3c', + '\t This String contains \t\t some control characters\r\n', ); diff --git a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt index 1592cfe8763eb..44367001049cc 100644 --- a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt +++ b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt @@ -9,17 +9,17 @@ if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) { --FILE-- b'$2a$32$CCCCCCCCCCCCCCCCCCCCCC$', - b'33' => b'$2a$33$CCCCCCCCCCCCCCCCCCCCCC$', - b'34' => b'$2a$34$CCCCCCCCCCCCCCCCCCCCCC$', - b'35' => b'$2a$35$CCCCCCCCCCCCCCCCCCCCCC$', - b'36' => b'$2a$36$CCCCCCCCCCCCCCCCCCCCCC$', - b'37' => b'$2a$37$CCCCCCCCCCCCCCCCCCCCCC$', - b'38' => b'$2a$38$CCCCCCCCCCCCCCCCCCCCCC$',); +$salts = array('32' => '$2a$32$CCCCCCCCCCCCCCCCCCCCCC$', + '33' => '$2a$33$CCCCCCCCCCCCCCCCCCCCCC$', + '34' => '$2a$34$CCCCCCCCCCCCCCCCCCCCCC$', + '35' => '$2a$35$CCCCCCCCCCCCCCCCCCCCCC$', + '36' => '$2a$36$CCCCCCCCCCCCCCCCCCCCCC$', + '37' => '$2a$37$CCCCCCCCCCCCCCCCCCCCCC$', + '38' => '$2a$38$CCCCCCCCCCCCCCCCCCCCCC$',); foreach($salts as $i=>$salt) { - $crypt = crypt(b'U*U', $salt); - if ($crypt === b'*0' || $crypt === b'*1') { + $crypt = crypt('U*U', $salt); + if ($crypt === '*0' || $crypt === '*1') { echo "$i. OK\n"; } else { echo "$i. Not OK\n"; diff --git a/ext/standard/tests/strings/crypt_blowfish_variation2.phpt b/ext/standard/tests/strings/crypt_blowfish_variation2.phpt index 9db9e2142429e..f354a8ec77915 100644 --- a/ext/standard/tests/strings/crypt_blowfish_variation2.phpt +++ b/ext/standard/tests/strings/crypt_blowfish_variation2.phpt @@ -3,7 +3,7 @@ Test Blowfish crypt() does not fall back to DES when rounds are not specified, or Blowfish is not available. --FILE-- array( - b'$5$saltstring', - b'Hello world!', - b'$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5' + '$5$saltstring', + 'Hello world!', + '$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5' ), 2 => array( - b'$5$rounds=10000$saltstringsaltstring', - b'Hello world!', - b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA' + '$5$rounds=10000$saltstringsaltstring', + 'Hello world!', + '$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA' ), 3 => array( - b'$5$rounds=10000$saltstringsaltstring', - b'Hello world!', - b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA' + '$5$rounds=10000$saltstringsaltstring', + 'Hello world!', + '$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA' ), 4 => array( - b'$5$rounds=5000$toolongsaltstring', - b'This is just a test', - b'$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8mGRcvxa5' + '$5$rounds=5000$toolongsaltstring', + 'This is just a test', + '$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8mGRcvxa5' ), 5 => array( - b'$5$rounds=1400$anotherlongsaltstring', - b'a very much longer text to encrypt. This one even stretches over morethan one line.', - b'$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12oP84Bnq1' + '$5$rounds=1400$anotherlongsaltstring', + 'a very much longer text to encrypt. This one even stretches over morethan one line.', + '$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12oP84Bnq1' ), 6 => array( - b'$5$rounds=77777$short', - b'we have a short salt string but not a short password', - b'$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/' + '$5$rounds=77777$short', + 'we have a short salt string but not a short password', + '$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/' ), 7 => array( - b'$5$rounds=123456$asaltof16chars..', - b'a short string', - b'$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/cZKmF/wJvD' + '$5$rounds=123456$asaltof16chars..', + 'a short string', + '$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/cZKmF/wJvD' ), 8 => array( - b'$5$rounds=10$roundstoolow', - b'the minimum number is still observed', - b'$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL972bIC' + '$5$rounds=10$roundstoolow', + 'the minimum number is still observed', + '$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL972bIC' ) ); diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index d6f9df6013985..3d51f4aafa4b7 100644 --- a/ext/standard/tests/strings/crypt_sha512.phpt +++ b/ext/standard/tests/strings/crypt_sha512.phpt @@ -11,44 +11,44 @@ if (!function_exists('crypt') || !defined("CRYPT_SHA512")) { $tests = array( 1 => array( - b'$6$saltstring', - b'Hello world!', - b'$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJuesI68u4OTLiBFdcbYEdFCoEOfaS35inz1' + '$6$saltstring', + 'Hello world!', + '$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJuesI68u4OTLiBFdcbYEdFCoEOfaS35inz1' ), 2 => array( - b'$6$rounds=10000$saltstringsaltstring', - b'Hello world!', - b'$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sbHbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v.' + '$6$rounds=10000$saltstringsaltstring', + 'Hello world!', + '$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sbHbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v.' ), 3 => array( - b'$6$rounds=5000$toolongsaltstring', - b'This is just a test', - b'$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQzQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0' + '$6$rounds=5000$toolongsaltstring', + 'This is just a test', + '$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQzQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0' ), 4 => array( - b'$6$rounds=1400$anotherlongsaltstring', - b'a very much longer text to encrypt. This one even stretches over morethan one line.', - b'$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wPvMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1' + '$6$rounds=1400$anotherlongsaltstring', + 'a very much longer text to encrypt. This one even stretches over morethan one line.', + '$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wPvMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1' ), 5 => array( - b'$6$rounds=77777$short', - b'we have a short salt string but not a short password', - b'$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0gge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0' + '$6$rounds=77777$short', + 'we have a short salt string but not a short password', + '$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0gge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0' ), 6 => array( - b'$6$rounds=123456$asaltof16chars..', - b'a short string', - b'$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwcelCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1' + '$6$rounds=123456$asaltof16chars..', + 'a short string', + '$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwcelCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1' ), 7 => array( - b'$6$rounds=10$roundstoolow', - b'the minimum number is still observed', - b'$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.' + '$6$rounds=10$roundstoolow', + 'the minimum number is still observed', + '$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.' ), 8 => array( - b'$6$$bar$', - b'foo', - b'$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.' + '$6$$bar$', + 'foo', + '$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.' ), ); diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt index d515dc0ff1f13..c058390ea949e 100644 --- a/ext/standard/tests/strings/htmlentities-utf-2.phpt +++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt @@ -5,10 +5,10 @@ output_handler= --FILE-- --EXPECT-- string(28) "‚†™Ÿ" diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt index 3ffdd65a5ffb2..51271bdddf459 100644 --- a/ext/standard/tests/strings/htmlentities24.phpt +++ b/ext/standard/tests/strings/htmlentities24.phpt @@ -9,7 +9,7 @@ Test htmlentities() function /* retrieving htmlentities from the ANSI character table */ echo "*** Retrieving htmlentities for 256 characters ***\n"; for($i=0; $i<256; $i++) - var_dump( bin2hex( htmlentities(b"chr($i)")) ); + var_dump( bin2hex( htmlentities("chr($i)")) ); /* giving arguments as NULL */ echo "\n*** Testing htmlentities() with NULL as first,second and third argument ***\n"; diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt index 5d741e5ecb507..2c886b9af7bd5 100644 --- a/ext/standard/tests/strings/htmlspecialchars.phpt +++ b/ext/standard/tests/strings/htmlspecialchars.phpt @@ -9,7 +9,7 @@ Test htmlspecialchars() function /* retrieving htmlspecialchars from the ANSI character table */ echo "*** Retrieving htmlspecialchars for 256 characters ***\n"; for($i=0; $i<256; $i++) -var_dump( bin2hex( htmlspecialchars(b"chr($i)") ) ); +var_dump( bin2hex( htmlspecialchars("chr($i)") ) ); /* giving NULL as the argument */ echo "\n*** Testing htmlspecialchars() with NULL as first, second and third argument ***\n"; diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt index fc3666ff6545b9a7e7cf5522b93e6ec105121df7..7b1295c54e07a8581fe56f942fbb87f80bc1fe73 100644 GIT binary patch delta 12 Tcmey&{fT?S8m7%_ncSEGCddT^ delta 14 Vcmeyw{h52i8Yaf1&1;z4m;o=z1!n*N diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt index a627d77bf4b5e4d5a374c6006a8b2297481a03a3..621b69521cc3f37d6340b99d8cd269917880d04e 100644 GIT binary patch delta 12 Tcmcb~dV_VtM#jyX7}Xg8BmxAi delta 14 Vcmcb?dXsg-Mn=Y@%^Mlj838Pd1r7iJ diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt index eda414bc2526d..c1f8805ac06f0 100644 --- a/ext/standard/tests/strings/md5_basic1.phpt +++ b/ext/standard/tests/strings/md5_basic1.phpt @@ -8,7 +8,7 @@ Test md5() function : basic functionality */ echo "*** Testing md5() : basic functionality ***\n"; -var_dump(md5(b"apple")); +var_dump(md5("apple")); ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt index 1f89ba82f5112..670872f74d554 100644 --- a/ext/standard/tests/strings/md5_basic2.phpt +++ b/ext/standard/tests/strings/md5_basic2.phpt @@ -8,7 +8,7 @@ Test md5() function : basic functionality - with raw output */ echo "*** Testing md5() : basic functionality - with raw output***\n"; -$str = b"Hello World"; +$str = "Hello World"; $md5_raw = md5($str, true); var_dump(bin2hex($md5_raw)); diff --git a/ext/standard/tests/strings/quoted_printable_decode_error.phpt b/ext/standard/tests/strings/quoted_printable_decode_error.phpt index 5018837049e87..0515fea2a71b7 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_error.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_error.phpt @@ -13,7 +13,7 @@ echo "\n-- Testing quoted_printable_decode() function with no arguments --\n"; var_dump( quoted_printable_decode() ); echo "\n-- Testing quoted_printable_decode() function with more than expected no. of arguments --\n"; -$str = b"=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= +$str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= =20=D4=cf=D2=C7=CF=D7=D9=C5= =20= =D0= diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index fafe106d51e3f..20d62e69990e9 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -19,7 +19,7 @@ return false; /* Writing into file */ $filename = "DataFile.txt"; -$content = b"Add this to the file\n"; +$content = "Add this to the file\n"; if (is_writable($filename)) { if (fwrite($handle2, $content) === FALSE) { echo "Cannot write to file ($filename)"; diff --git a/ext/standard/tests/strings/strip_tags_variation6.phpt b/ext/standard/tests/strings/strip_tags_variation6.phpt index 454f46e5588f8..c838970868297 100644 --- a/ext/standard/tests/strings/strip_tags_variation6.phpt +++ b/ext/standard/tests/strings/strip_tags_variation6.phpt @@ -19,7 +19,7 @@ echo "*** Testing strip_tags() : usage variations ***\n"; $strings = array ( " I am html string ".chr(0)."", " I am html string\0 ", - b"I am html string", + "I am html string", "I am html string".decbin(65)."" ); diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index f0a863cee94e6..0d2171496c2bb 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -13,7 +13,7 @@ var_dump( stristr("test stRIng", "striNG") ); var_dump( stristr("teST StrinG", "stRIn") ); var_dump( stristr("tesT string", "t S") ); var_dump( stristr("test strinG", "g") ); -var_dump( bin2hex(stristr(b"te".chr(0).b"St", chr(0))) ); +var_dump( bin2hex(stristr("te".chr(0)."St", chr(0))) ); var_dump( stristr("tEst", "test") ); var_dump( stristr("teSt", "test") ); diff --git a/ext/standard/tests/url/bug47174.phpt b/ext/standard/tests/url/bug47174.phpt index 0296dbe753503..6d080632531a2 100644 --- a/ext/standard/tests/url/bug47174.phpt +++ b/ext/standard/tests/url/bug47174.phpt @@ -2,13 +2,13 @@ Bug #47174 (base64_decode() interprets pad char in mid string as terminator) --FILE-- diff --git a/ext/xmlrpc/tests/bug50285.phpt b/ext/xmlrpc/tests/bug50285.phpt index 5da803c367c20..0a5fb962b4ec2 100644 --- a/ext/xmlrpc/tests/bug50285.phpt +++ b/ext/xmlrpc/tests/bug50285.phpt @@ -14,11 +14,11 @@ function test2($func, $params) { } function test3($func, $params) { - return array('One', 3 => 'Three', b'Five' => 5, 'Six'); + return array('One', 3 => 'Three', 'Five' => 5, 'Six'); } function test4($func, $params) { - return array('One', 'Three', 'Five', b'Six' => 6); + return array('One', 'Three', 'Five', 'Six' => 6); } $server = xmlrpc_server_create(); diff --git a/ext/zlib/tests/gzfile_basic.phpt b/ext/zlib/tests/gzfile_basic.phpt index 17055646d8bd2..56bc8b2d7adad 100644 --- a/ext/zlib/tests/gzfile_basic.phpt +++ b/ext/zlib/tests/gzfile_basic.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- Date: Sun, 6 Nov 2016 22:42:27 +0100 Subject: [PATCH 2/8] Remove tests and iterations directly related with the b prefix --- Zend/tests/heredoc_002.phpt | 23 --- Zend/tests/nowdoc_002.phpt | 23 --- .../tests/array/array_combine_variation6.phpt | 53 ------- .../array/array_diff_assoc_variation1.phpt | 22 +-- .../array/array_diff_assoc_variation10.phpt | 50 ------- .../array/array_diff_assoc_variation2.phpt | 22 +-- .../array/array_diff_assoc_variation3.phpt | 24 +--- .../array/array_diff_assoc_variation4.phpt | 20 +-- .../tests/array/array_diff_variation1.phpt | 20 +-- .../tests/array/array_diff_variation10.phpt | 44 ------ .../tests/array/array_diff_variation2.phpt | 20 +-- .../tests/array/array_diff_variation3.phpt | 20 +-- .../tests/array/array_diff_variation4.phpt | 18 +-- .../tests/array/array_flip_variation2.phpt | Bin 2179 -> 2018 bytes .../array_intersect_assoc_variation10.phpt | 54 ------- .../array/array_intersect_variation10.phpt | 53 ------- .../tests/array/array_map_variation9.phpt | 55 ------- .../array_merge_recursive_variation8.phpt | 73 ---------- .../tests/array/array_pad_variation4.phpt | 60 -------- .../tests/array/array_unique_variation7.phpt | 33 ----- .../array_walk_recursive_variation3.phpt | 27 ++-- .../array_walk_recursive_variation6.phpt | 13 -- .../tests/array/array_walk_variation3.phpt | 27 ++-- .../tests/array/array_walk_variation6.phpt | 13 -- .../tests/array/uasort_variation3.phpt | Bin 2584 -> 2477 bytes .../tests/array/usort_variation3.phpt | 28 ++-- .../tests/file/disk_free_space_basic.phpt | 5 - .../file/disk_total_space_variation.phpt | 5 - .../tests/file/fileinode_variation.phpt | 9 +- ext/standard/tests/file/flock_variation.phpt | 43 ------ .../tests/file/fnmatch_variation.phpt | 40 ------ .../gettype_settype_variation4.phpt | 135 ------------------ 32 files changed, 60 insertions(+), 972 deletions(-) delete mode 100644 Zend/tests/heredoc_002.phpt delete mode 100644 Zend/tests/nowdoc_002.phpt delete mode 100644 ext/standard/tests/array/array_combine_variation6.phpt delete mode 100644 ext/standard/tests/array/array_diff_assoc_variation10.phpt delete mode 100644 ext/standard/tests/array/array_diff_variation10.phpt delete mode 100644 ext/standard/tests/array/array_intersect_assoc_variation10.phpt delete mode 100644 ext/standard/tests/array/array_intersect_variation10.phpt delete mode 100644 ext/standard/tests/array/array_map_variation9.phpt delete mode 100644 ext/standard/tests/array/array_merge_recursive_variation8.phpt delete mode 100644 ext/standard/tests/array/array_pad_variation4.phpt delete mode 100644 ext/standard/tests/array/array_unique_variation7.phpt diff --git a/Zend/tests/heredoc_002.phpt b/Zend/tests/heredoc_002.phpt deleted file mode 100644 index 481ada996cc61..0000000000000 --- a/Zend/tests/heredoc_002.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -basic binary heredoc syntax ---FILE-- - ---EXPECT-- -This is a heredoc test. -This is another heredoc test. diff --git a/Zend/tests/nowdoc_002.phpt b/Zend/tests/nowdoc_002.phpt deleted file mode 100644 index 3b17da814f928..0000000000000 --- a/Zend/tests/nowdoc_002.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -basic binary nowdoc syntax ---FILE-- - ---EXPECT-- -This is a nowdoc test. -This is another nowdoc test. diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt deleted file mode 100644 index 94c7b4d664a90..0000000000000 --- a/ext/standard/tests/array/array_combine_variation6.phpt +++ /dev/null @@ -1,53 +0,0 @@ ---TEST-- -Test array_combine() function : usage variations - binary safe checking ---FILE-- - ---EXPECTF-- -*** Testing array_combine() : binary safe checking *** -array(2) { - ["hello"]=> - string(5) "hello" - ["world"]=> - string(5) "world" -} -array(2) { - ["hello"]=> - string(5) "hello" - ["world"]=> - string(5) "world" -} -array(2) { - ["hello"]=> - string(5) "hello" - ["world"]=> - string(5) "world" -} -Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index b6c63794b3d60..0b5ce9ffbe117 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt @@ -70,22 +70,18 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - - // binary data -/*21*/ b"binary", - (binary)"binary", // object data -/*23*/ new classA(), +/*21*/ new classA(), // undefined data -/*24*/ @$undefined_var, +/*22*/ @$undefined_var, // unset data -/*25*/ @$unset_var, +/*23*/ @$unset_var, // resource variable -/*26*/ $fp, +/*24*/ $fp, ); // loop through each element of $inputs to check the behavior of array_diff_assoc @@ -219,16 +215,6 @@ NULL -- Iteration 24 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d -NULL - --- Iteration 25 -- - -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d -NULL - --- Iteration 26 -- - Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d NULL Done \ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt deleted file mode 100644 index 0687ed8a5bf5a..0000000000000 --- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt +++ /dev/null @@ -1,50 +0,0 @@ ---TEST-- -Test array_diff_assoc() function : usage variations - binary safe check ---FILE-- - "hello", - "str2" => "world"); - -$array2 = array( b"1" => 'hello', - b"world", - "hello", - 'test'); - -var_dump(array_diff_assoc($array1, $array2)); -var_dump(array_diff_assoc($array2, $array1)); - -echo "Done"; -?> ---EXPECTF-- -*** Testing array_diff_assoc() : usage variations *** -array(3) { - [0]=> - string(1) "1" - ["str1"]=> - string(5) "hello" - ["str2"]=> - string(5) "world" -} -array(2) { - [3]=> - string(5) "hello" - [4]=> - string(4) "test" -} -Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt index 5de94424e8963..09501c95abdf2 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt @@ -70,22 +70,18 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - - // binary data -/*21*/ b"binary", - (binary)"binary", // object data -/*23*/ new classA(), +/*21*/ new classA(), // undefined data -/*24*/ @$undefined_var, +/*22*/ @$undefined_var, // unset data -/*25*/ @$unset_var, +/*23*/ @$unset_var, // resource variable -/*26*/ $fp, +/*24*/ $fp, ); // loop through each element of $inputs to check the behavior of array_diff_assoc @@ -220,16 +216,6 @@ NULL -- Iteration 24 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d -NULL - --- Iteration 25 -- - -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d -NULL - --- Iteration 26 -- - Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d NULL Done \ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt index 1d4aaf2e436a1..bd4937102f669 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt @@ -79,25 +79,19 @@ $inputs = array( "string", 'string', $heredoc), - - // binary data -/*7*/ -'binary' => array( - b"binary", - (binary)"binary"), // object data -/*8*/ +/*7*/ 'object' => array( new classA()), // undefined data -/*9*/ +/*8*/ 'undefined' => array( @$undefined_var), // unset data -/*10*/ +/*9*/ 'unset' => array( @$unset_var), ); @@ -178,27 +172,19 @@ array(3) { } -- Iteration 7 -- -array(2) { - [0]=> - string(6) "binary" - [1]=> - string(6) "binary" -} - --- Iteration 8 -- array(1) { [0]=> object(classA)#%d (0) { } } --- Iteration 9 -- +-- Iteration 8 -- array(1) { [0]=> NULL } --- Iteration 10 -- +-- Iteration 9 -- array(1) { [0]=> NULL diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index 34e979ab299de..23e977f99dcae 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -71,20 +71,14 @@ $inputs = array( "string" => 'stringd', 'string' => 'strings', $heredoc => 'stringh'), - - // binary data -/*7*/ -'binary' => array( - b"binary1" => 'binary 1', - (binary)"binary2" => 'binary 2'), // undefined data -/*8*/ +/*7*/ 'undefined' => array( @$undefined_var => 'undefined'), // unset data -/*9*/ +/*8*/ 'unset' => array( @$unset_var => 'unset'), @@ -156,20 +150,12 @@ array(2) { } -- Iteration 7 -- -array(2) { - ["binary1"]=> - string(8) "binary 1" - ["binary2"]=> - string(8) "binary 2" -} - --- Iteration 8 -- array(1) { [""]=> string(9) "undefined" } --- Iteration 9 -- +-- Iteration 8 -- array(1) { [""]=> string(5) "unset" diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt index f9a34b0a59371..a5ca4b01216c3 100644 --- a/ext/standard/tests/array/array_diff_variation1.phpt +++ b/ext/standard/tests/array/array_diff_variation1.phpt @@ -70,22 +70,18 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - - // binary data -/*21*/ b"binary", - (binary)"binary", // object data -/*23*/ new classA(), +/*21*/ new classA(), // undefined data -/*24*/ @$undefined_var, +/*22*/ @$undefined_var, // unset data -/*25*/ @$unset_var, +/*23*/ @$unset_var, // resource variable -/*26*/ $fp +/*24*/ $fp ); // loop through each element of $inputs to check the behavior of array_diff @@ -197,12 +193,4 @@ NULL -- Iteration 24 -- Warning: array_diff(): Argument #1 is not an array in %s on line %d NULL - --- Iteration 25 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d -NULL - --- Iteration 26 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d -NULL Done \ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt deleted file mode 100644 index 9442b946d9e9b..0000000000000 --- a/ext/standard/tests/array/array_diff_variation10.phpt +++ /dev/null @@ -1,44 +0,0 @@ ---TEST-- -Test array_diff() function : usage variations - binary safe checking ---FILE-- - "hello", - "str2" => "world"); - -$array2 = array( b"1" => 'hello', - b"world", - "hello", - 'test'); - -var_dump(array_diff($array1, $array2)); -var_dump(array_diff($array2, $array1)); - -echo "Done"; -?> ---EXPECTF-- -*** Testing array_diff() : usage variations *** -array(1) { - [0]=> - string(1) "1" -} -array(1) { - [4]=> - string(4) "test" -} -Done diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt index be68c40c2f88b..c22d3bae83fbd 100644 --- a/ext/standard/tests/array/array_diff_variation2.phpt +++ b/ext/standard/tests/array/array_diff_variation2.phpt @@ -70,22 +70,18 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - - // binary data -/*21*/ b"binary", - (binary)"binary", // object data -/*23*/ new classA(), +/*21*/ new classA(), // undefined data -/*24*/ @$undefined_var, +/*22*/ @$undefined_var, // unset data -/*25*/ @$unset_var, +/*23*/ @$unset_var, // resource variable -/*26*/ $fp +/*24*/ $fp ); // loop through each element of $inputs to check the behavior of array_diff @@ -196,12 +192,4 @@ NULL -- Iteration 24 -- Warning: array_diff(): Argument #2 is not an array in %s on line %d NULL - --- Iteration 25 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d -NULL - --- Iteration 26 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d -NULL Done \ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 84f73fd287f26..2f12ab1deafa2 100644 --- a/ext/standard/tests/array/array_diff_variation3.phpt +++ b/ext/standard/tests/array/array_diff_variation3.phpt @@ -75,19 +75,13 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ -"binary" => array( - // binary data - b"binary", - (binary)"binary"), -/*9*/ +/*8*/ "undefined" => array( // undefined data @$undefined_var), -/*10*/ +/*9*/ "unset" => array( // unset data @$unset_var) @@ -169,20 +163,12 @@ array(3) { } Iteration: 8 -array(2) { - [0]=> - string(6) "binary" - [1]=> - string(6) "binary" -} - - Iteration: 9 array(1) { [0]=> NULL } - Iteration: 10 + Iteration: 9 array(1) { [0]=> NULL diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index 75b01adaa1769..1f0ab0b673350 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -75,19 +75,13 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ -"binary" => array( - // binary data - b"binary", - (binary)"binary"), -/*9*/ +/*8*/ "undefined" => array( // undefined data @$undefined_var), -/*10*/ +/*9*/ "unset" => array( // unset data @$unset_var) @@ -173,12 +167,4 @@ array(2) { [1]=> int(2) } - - Iteration: 10 -array(2) { - [0]=> - int(1) - [1]=> - int(2) -} Done \ No newline at end of file diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt index 997c391306e5cf751d4603cad8fb3c679155dab4..ee07eb8a2621c29b21026d2370626fd03fc855f4 100644 GIT binary patch delta 23 fcmZn`e8j)uHOppOR!K%iqs`%L&Ww{^vd;nlVXg<* delta 167 zcmaFF-z>P{HH)i4Qf6LaQKdq5Y9*I~f>NTAUUEi}hJmJ@Qj(H_t(}58L_QuUZ>X*V zRFb3w5kZ#Se2+zqk3`t5rk!YwPAY+YC PRha=*L5!H}#J&Ikr?N7E diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt deleted file mode 100644 index 9bce974a9dd66..0000000000000 --- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt +++ /dev/null @@ -1,54 +0,0 @@ ---TEST-- -Test array_intersect_assoc() function : usage variations - binary safe checking ---FILE-- - ---EXPECTF-- -*** Testing array_intersect_assoc() : binary safe checking *** -array(2) { - [0]=> - string(5) "hello" - [1]=> - string(5) "world" -} -array(2) { - [0]=> - string(5) "hello" - [1]=> - string(5) "world" -} -array(2) { - [0]=> - string(5) "hello" - [1]=> - string(5) "world" -} -Done \ No newline at end of file diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt deleted file mode 100644 index e193f97d465a7..0000000000000 --- a/ext/standard/tests/array/array_intersect_variation10.phpt +++ /dev/null @@ -1,53 +0,0 @@ ---TEST-- -Test array_intersect() function : usage variations - binary safe checking ---FILE-- - ---EXPECTF-- -*** Testing array_intersect() : binary safe checking *** -array(2) { - [0]=> - string(5) "hello" - [1]=> - string(5) "world" -} -array(2) { - [0]=> - string(5) "hello" - [1]=> - string(5) "world" -} -array(2) { - [0]=> - string(5) "hello" - [1]=> - string(5) "world" -} -Done diff --git a/ext/standard/tests/array/array_map_variation9.phpt b/ext/standard/tests/array/array_map_variation9.phpt deleted file mode 100644 index f33b717c6c9c2..0000000000000 --- a/ext/standard/tests/array/array_map_variation9.phpt +++ /dev/null @@ -1,55 +0,0 @@ ---TEST-- -Test array_map() function : usage variations - binary safe checking ---FILE-- - $b); -} - -// array with binary data -$arr1 = array(b"hello", b"world", "1", b"22.22"); - -echo "-- checking binary safe array with one parameter callback function --\n"; -var_dump( array_map('callback1', $arr1) ); - -echo "-- checking binary safe array with two parameter callback function --\n"; -try { - var_dump( array_map(b"callback2", $arr1) ); -} catch (Throwable $e) { - echo "Exception: " . $e->getMessage() . "\n"; -} - -echo "Done"; -?> ---EXPECTF-- -*** Testing array_map() : array with binary data for 'arr1' argument *** --- checking binary safe array with one parameter callback function -- -array(4) { - [0]=> - string(5) "hello" - [1]=> - string(5) "world" - [2]=> - string(1) "1" - [3]=> - string(5) "22.22" -} --- checking binary safe array with two parameter callback function -- -Exception: Too few arguments to function callback2(), 1 passed and exactly 2 expected -Done diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt deleted file mode 100644 index 6ad2f6989fc26..0000000000000 --- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt +++ /dev/null @@ -1,73 +0,0 @@ ---TEST-- -Test array_merge_recursive() function : usage variations - binary safe checking ---FILE-- - "hello", b"world", "str1" => b"hello", "str2" => "world"); - -// initialize the second argument -$arr2 = array(b"str1" => b"binary", b"hello" => "binary", b"str2" => b"binary"); - -echo "-- With default argument --\n"; -var_dump( array_merge_recursive($arr1) ); - -echo "-- With more arguments --\n"; -var_dump( array_merge_recursive($arr1, $arr2) ); - -echo "Done"; -?> ---EXPECTF-- -*** Testing array_merge_recursive() : array with binary data for $arr1 argument *** --- With default argument -- -array(5) { - [0]=> - string(1) "1" - ["hello"]=> - string(5) "hello" - [1]=> - string(5) "world" - ["str1"]=> - string(5) "hello" - ["str2"]=> - string(5) "world" -} --- With more arguments -- -array(5) { - [0]=> - string(1) "1" - ["hello"]=> - array(2) { - [0]=> - string(5) "hello" - [1]=> - string(6) "binary" - } - [1]=> - string(5) "world" - ["str1"]=> - array(2) { - [0]=> - string(5) "hello" - [1]=> - string(6) "binary" - } - ["str2"]=> - array(2) { - [0]=> - string(5) "world" - [1]=> - string(6) "binary" - } -} -Done diff --git a/ext/standard/tests/array/array_pad_variation4.phpt b/ext/standard/tests/array/array_pad_variation4.phpt deleted file mode 100644 index 83c1e8300d2d8..0000000000000 --- a/ext/standard/tests/array/array_pad_variation4.phpt +++ /dev/null @@ -1,60 +0,0 @@ ---TEST-- -Test array_pad() function : usage variations - binary safe checking ---FILE-- - ---EXPECTF-- -*** Testing array_pad() : Passing binary values to $pad_value argument *** -array(6) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - string(5) "hello" - [4]=> - string(5) "hello" - [5]=> - string(5) "hello" -} -array(6) { - [0]=> - string(5) "hello" - [1]=> - string(5) "hello" - [2]=> - string(5) "hello" - [3]=> - int(1) - [4]=> - int(2) - [5]=> - int(3) -} -Done diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt deleted file mode 100644 index e998a73c6cc02..0000000000000 --- a/ext/standard/tests/array/array_unique_variation7.phpt +++ /dev/null @@ -1,33 +0,0 @@ ---TEST-- -Test array_unique() function : usage variations - binary safe checking ---FILE-- - "hello", "str2" => "world"); - -var_dump( array_unique($input) ); - -echo "Done"; -?> ---EXPECTF-- -*** Testing array_unique() : array with binary data for $input argument *** -array(3) { - [0]=> - string(1) "1" - [1]=> - string(5) "hello" - [2]=> - string(5) "world" -} -Done diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt index 9abdc0b5c236a..bfadd9e2c193d 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt @@ -48,11 +48,8 @@ $input_values = array( // empty array array(), - // binary array - array(array(b'binary')), - // mixed array -/*8*/ array(16, 8.345, array("Fruits"), array(true, null), array(FALSE), array(-98, 0.005, 'banana')) +/*7*/ array(16, 8.345, array("Fruits"), array(true, null), array(FALSE), array(-98, 0.005, 'banana')) ); for($count = 0; $count < count($input_values); $count++) { @@ -106,18 +103,14 @@ bool(true) bool(true) -- Iteration 7 -- -7 : 0 binary -bool(true) - --- Iteration 8 -- -8 : 0 16 -8 : 1 8.345 -8 : 0 Fruits -8 : 0 1 -8 : 1 -8 : 0 -8 : 0 -98 -8 : 1 0.005 -8 : 2 banana +7 : 0 16 +7 : 1 8.345 +7 : 0 Fruits +7 : 0 1 +7 : 1 +7 : 0 +7 : 0 -98 +7 : 1 0.005 +7 : 2 banana bool(true) Done diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt index 747eb7403c44a..f6b2f51163ae8 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt @@ -69,11 +69,6 @@ $input = array( "a" => "Apple", 'z' => array('b' => 'Bananna', "c" => "carrot"), echo "-- Associative array with string keys --\n"; var_dump( array_walk_recursive($input, "for_string")); -// binary key -$input = array( b"a" => "Apple", b"b" => "Banana"); -echo "-- Associative array with binary keys --\n"; -var_dump( array_walk_recursive($input, "for_string")); - // Mixed keys - numeric/string $input = array( 0 => array(0 => 1, 1 => 2), "x" => array("a" => "Apple", "b" => "Banana"), 2 =>3); echo "-- Associative array with numeric/string keys --\n"; @@ -118,14 +113,6 @@ string(6) "carrot" string(1) "o" string(6) "Orange" -bool(true) --- Associative array with binary keys -- -string(1) "a" -string(5) "Apple" - -string(1) "b" -string(6) "Banana" - bool(true) -- Associative array with numeric/string keys -- int(0) diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt index 9ff7d5dfac921..5cccb51fd28bc 100644 --- a/ext/standard/tests/array/array_walk_variation3.phpt +++ b/ext/standard/tests/array/array_walk_variation3.phpt @@ -48,11 +48,8 @@ $input_values = array( // empty array array(), - // binary array - array(b"binary"), - // mixed array -/*8*/ array(16, 8.345, "Fruits", true, null, FALSE, -98, 0.005, 'banana') +/*7*/ array(16, 8.345, "Fruits", true, null, FALSE, -98, 0.005, 'banana') ); for($count = 0; $count < count($input_values); $count++) { @@ -106,18 +103,14 @@ bool(true) bool(true) -- Iteration 7 -- -7 : 0 binary -bool(true) - --- Iteration 8 -- -8 : 0 16 -8 : 1 8.345 -8 : 2 Fruits -8 : 3 1 -8 : 4 -8 : 5 -8 : 6 -98 -8 : 7 0.005 -8 : 8 banana +7 : 0 16 +7 : 1 8.345 +7 : 2 Fruits +7 : 3 1 +7 : 4 +7 : 5 +7 : 6 -98 +7 : 7 0.005 +7 : 8 banana bool(true) Done diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt index c1f23233ec94b..10b55a044c7b0 100644 --- a/ext/standard/tests/array/array_walk_variation6.phpt +++ b/ext/standard/tests/array/array_walk_variation6.phpt @@ -69,11 +69,6 @@ $input = array( "a" => "Apple", 'b' => 'Bananna', "c" => "carrot", 'o' => "Orang echo "-- Associative array with string keys --\n"; var_dump( array_walk($input, "for_string")); -// binary keys -$input = array( b"a" => "Apple", b"b" => "Banana"); -echo "-- Associative array with binary keys --\n"; -var_dump( array_walk($input, "for_string")); - // Mixed keys - numeric/string $input = array( 0 => 1, 1 => 2, "a" => "Apple", "b" => "Banana", 2 =>3); echo "-- Associative array with numeric/string keys --\n"; @@ -114,14 +109,6 @@ string(6) "carrot" string(1) "o" string(6) "Orange" -bool(true) --- Associative array with binary keys -- -string(1) "a" -string(5) "Apple" - -string(1) "b" -string(6) "Banana" - bool(true) -- Associative array with numeric/string keys -- int(0) diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt index 9147d59916ed1216794744fda981f9a144374a77..5ef2f9d6e2391339e4e8bdd204f6dea6f4754af8 100644 GIT binary patch delta 22 ecmbOsvQ~HlGy7(H_F6_pqseNTAUUEi}hJmJ@Qj(H_t(}62sSZ#)NeQA1 yEM#o3`43wQBcsXWMvh5ZN{I|fO0l+fKvkJ}B^oBCnm|@GOg%!v*kCdr=X?N}_8=et diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt index 3758fe9c9a628..b99fc0a4f84ce 100644 --- a/ext/standard/tests/array/usort_variation3.phpt +++ b/ext/standard/tests/array/usort_variation3.phpt @@ -58,10 +58,6 @@ $array_arg = array( // null keys NULL => 35, - // binary key - "a".chr(0)."b" => 45, - b"binary" => 30, - //heredoc keys $simple_heredoc => 75, $multiline_heredoc => 200, @@ -80,7 +76,7 @@ var_dump($array_arg); bool(true) -- Sorted array after usort() function call -- -array(15) { +array(13) { [0]=> int(200) [1]=> @@ -88,28 +84,24 @@ array(15) { [2]=> int(75) [3]=> - int(45) - [4]=> int(35) - [5]=> - int(30) - [6]=> + [4]=> int(25) - [7]=> + [5]=> int(9) - [8]=> + [6]=> int(8) - [9]=> + [7]=> int(7) - [10]=> + [8]=> int(6) - [11]=> + [9]=> int(5) - [12]=> + [10]=> int(4) - [13]=> + [11]=> int(1) - [14]=> + [12]=> int(0) } ===DONE=== diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 2904ff9a5bfe0..1f7748e3bf0b3 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -44,9 +44,6 @@ else { var_dump($space1, $space2); } -echo "*** Testing with Binary Input ***\n"; -var_dump( disk_free_space(b"$file_path") ); - echo"\n--- Done ---"; ?> @@ -70,7 +67,5 @@ float(%d) float(%d) Free Space Value Is Correct -*** Testing with Binary Input *** -float(%d) --- Done --- diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt index ba2ceb2d1b96a..cce879c67b893 100644 --- a/ext/standard/tests/file/disk_total_space_variation.phpt +++ b/ext/standard/tests/file/disk_total_space_variation.phpt @@ -53,9 +53,6 @@ foreach($dirs_arr as $dir1) { $count++; } -echo "*** Testing with Binary Input ***\n"; -var_dump( disk_total_space(b"$file_path") ); - echo"\n--- Done ---"; ?> @@ -117,7 +114,5 @@ NULL Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d NULL -*** Testing with Binary Input *** -float(%d) --- Done --- diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt index 1fac953098b3f..b033ab2738b31 100644 --- a/ext/standard/tests/file/fileinode_variation.phpt +++ b/ext/standard/tests/file/fileinode_variation.phpt @@ -76,11 +76,6 @@ mkdir("$file_path/dir/subdir"); print( fileinode("$file_path/dir/subdir") )."\n"; clearstatcache(); -echo "-- Testing with binary input --\n"; -print( fileinode(b"$file_path/dir") )."\n"; -clearstatcache(); -print( fileinode(b"$file_path/dir/subdir") ); - rmdir("$file_path/dir/subdir"); rmdir("$file_path/dir"); @@ -106,7 +101,5 @@ echo "\n*** Done ***"; -- Testing with directories -- %d %d --- Testing with binary input -- -%d -%d + *** Done *** diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index af67ab402a9a1..d34f78f7f2421 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -40,9 +40,6 @@ $wouldblocks = array( array(), "string", "", - /* binary input */ - b"string", - b"", "\0" ); @@ -93,10 +90,6 @@ bool(true) bool(true) -- Inner iteration 11 in 0 -- bool(true) --- Inner iteration 12 in 0 -- -bool(true) --- Inner iteration 13 in 0 -- -bool(true) --- Outer iteration 1 --- bool(true) -- Inner iteration 0 in 1 -- @@ -123,10 +116,6 @@ bool(true) bool(true) -- Inner iteration 11 in 1 -- bool(true) --- Inner iteration 12 in 1 -- -bool(true) --- Inner iteration 13 in 1 -- -bool(true) --- Outer iteration 2 --- bool(true) -- Inner iteration 0 in 2 -- @@ -153,10 +142,6 @@ bool(true) bool(true) -- Inner iteration 11 in 2 -- bool(true) --- Inner iteration 12 in 2 -- -bool(true) --- Inner iteration 13 in 2 -- -bool(true) --- Outer iteration 3 --- bool(true) -- Inner iteration 0 in 3 -- @@ -183,10 +168,6 @@ bool(true) bool(true) -- Inner iteration 11 in 3 -- bool(true) --- Inner iteration 12 in 3 -- -bool(true) --- Inner iteration 13 in 3 -- -bool(true) --- Outer iteration 4 --- bool(true) -- Inner iteration 0 in 4 -- @@ -213,10 +194,6 @@ bool(true) bool(true) -- Inner iteration 11 in 4 -- bool(true) --- Inner iteration 12 in 4 -- -bool(true) --- Inner iteration 13 in 4 -- -bool(true) --- Outer iteration 5 --- bool(true) -- Inner iteration 0 in 5 -- @@ -243,10 +220,6 @@ bool(true) bool(true) -- Inner iteration 11 in 5 -- bool(true) --- Inner iteration 12 in 5 -- -bool(true) --- Inner iteration 13 in 5 -- -bool(true) --- Outer iteration 6 --- bool(true) -- Inner iteration 0 in 6 -- @@ -273,10 +246,6 @@ bool(true) bool(true) -- Inner iteration 11 in 6 -- bool(true) --- Inner iteration 12 in 6 -- -bool(true) --- Inner iteration 13 in 6 -- -bool(true) --- Outer iteration 7 --- bool(true) -- Inner iteration 0 in 7 -- @@ -303,10 +272,6 @@ bool(true) bool(true) -- Inner iteration 11 in 7 -- bool(true) --- Inner iteration 12 in 7 -- -bool(true) --- Inner iteration 13 in 7 -- -bool(true) --- Outer iteration 8 --- bool(true) -- Inner iteration 0 in 8 -- @@ -333,10 +298,6 @@ bool(true) bool(true) -- Inner iteration 11 in 8 -- bool(true) --- Inner iteration 12 in 8 -- -bool(true) --- Inner iteration 13 in 8 -- -bool(true) --- Outer iteration 9 --- bool(true) -- Inner iteration 0 in 9 -- @@ -363,9 +324,5 @@ bool(true) bool(true) -- Inner iteration 11 in 9 -- bool(true) --- Inner iteration 12 in 9 -- -bool(true) --- Inner iteration 13 in 9 -- -bool(true) *** Done *** diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt index 6d28528c1ce92..6e29eff742c95 100644 --- a/ext/standard/tests/file/fnmatch_variation.phpt +++ b/ext/standard/tests/file/fnmatch_variation.phpt @@ -55,13 +55,6 @@ $pattern_arr = array( 29 => "MATCH.TMP", 30 => "MATCH*", 31 => $file_name, - -/* binary inputs */ -32 => b"match*", -33 => b"*.tmp", -34 => b"mat*", -35 => b"mat*tmp", -36 => b"m*t", ); for( $i = 0; $i Date: Sun, 6 Nov 2016 22:54:30 +0100 Subject: [PATCH 3/8] Remove the binary cast from tests not related to it --- Zend/tests/ns_069.inc | 2 +- Zend/tests/ns_069.phpt | 4 ++-- ext/dom/tests/bug40836.phpt | 2 +- ext/dom/tests/bug41374.phpt | 2 +- ext/mysqli/tests/mysqli_debug_append.phpt | 2 +- ext/pcntl/tests/pcntl_exec_2.phpt | 2 +- ext/phar/tests/009.phpt | 2 +- ext/simplexml/tests/bug37386.phpt | 2 +- ext/simplexml/tests/sxe_001.phpt | 2 +- ext/simplexml/tests/sxe_002.phpt | 2 +- ext/simplexml/tests/sxe_003.phpt | 2 +- ext/simplexml/tests/sxe_004.phpt | 2 +- ext/simplexml/tests/sxe_005.phpt | 2 +- ext/standard/tests/file/bug27508.phpt | 2 +- ext/standard/tests/file/bug60120.phpt | 2 +- .../tests/file/disk_free_space_basic.phpt | 2 +- .../tests/file/disk_free_space_error.phpt | 2 +- .../tests/file/disk_total_space_basic.phpt | 2 +- .../tests/file/disk_total_space_error.phpt | 2 +- .../file/file_put_contents_variation4.phpt | 2 +- .../file/file_put_contents_variation5.phpt | 2 +- .../file/file_put_contents_variation6.phpt | 4 ++-- ext/standard/tests/file/file_variation.phpt | 4 ++-- .../tests/file/filesize_variation3-win32.phpt | 2 +- ext/standard/tests/file/fopen_variation12.phpt | 2 +- ext/standard/tests/file/fopen_variation16.phpt | 2 +- ext/standard/tests/file/fopen_variation17.phpt | 2 +- ext/standard/tests/file/fopen_variation5.phpt | 8 ++++---- ext/standard/tests/file/fopen_variation7.phpt | 2 +- ext/standard/tests/file/fopen_variation8.phpt | 8 ++++---- ext/standard/tests/file/fopen_variation9.phpt | 2 +- .../fseek_ftell_rewind_basic2-win32-mb.phpt | 2 +- .../file/fseek_ftell_rewind_basic2-win32.phpt | 2 +- .../tests/file/fseek_ftell_rewind_basic2.phpt | 2 +- .../fseek_ftell_rewind_variation2-win32.phpt | 2 +- .../file/fseek_ftell_rewind_variation2.phpt | 2 +- .../fseek_ftell_rewind_variation4-win32.phpt | 2 +- .../file/fseek_ftell_rewind_variation4.phpt | 2 +- .../fseek_ftell_rewind_variation6-win32.phpt | 2 +- .../file/fseek_ftell_rewind_variation6.phpt | 2 +- .../fseek_ftell_rewind_variation8-win32.phpt | 2 +- .../file/fseek_ftell_rewind_variation8.phpt | 2 +- ext/standard/tests/file/ftruncate_error.phpt | 2 +- .../tests/file/lstat_stat_variation7.phpt | 2 +- ext/standard/tests/file/popen_pclose_basic.phpt | 4 ++-- ext/standard/tests/file/userstreams.phpt | 2 +- ext/standard/tests/network/inet.phpt | 4 ++-- .../tests/streams/proc_open_bug60120.phpt | 2 +- .../tests/streams/proc_open_bug64438.phpt | 2 +- ext/standard/tests/strings/bug40915.phpt | Bin 377 -> 344 bytes .../tests/strings/convert_cyr_string.phpt | 14 +++++++------- ext/standard/tests/strings/str_getcsv_001.phpt | 2 +- 52 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Zend/tests/ns_069.inc b/Zend/tests/ns_069.inc index 4f186390ad635..46d8f8f48888b 100644 --- a/Zend/tests/ns_069.inc +++ b/Zend/tests/ns_069.inc @@ -1,3 +1,3 @@ preserveWhiteSpace = false; -$xml = (binary)' +$xml = ' 2007-02-14T00:00:00+01:00 diff --git a/ext/dom/tests/bug41374.phpt b/ext/dom/tests/bug41374.phpt index 21fc3454cdd8b..e2d4aa9b7acd1 100644 --- a/ext/dom/tests/bug41374.phpt +++ b/ext/dom/tests/bug41374.phpt @@ -4,7 +4,7 @@ Bug #41374 (wholetext concats values of wrong nodes) --FILE-- foobaz EOXML; diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt index f916995464615..fbb0d0a84e6bb 100644 --- a/ext/mysqli/tests/mysqli_debug_append.phpt +++ b/ext/mysqli/tests/mysqli_debug_append.phpt @@ -46,7 +46,7 @@ if (!$IS_MYSQLND) printf("[004] Cannot create trace file to test append mode\n"); } else { - if (!fwrite($fp, (binary) 'mysqli_debug.phpt test line')) + if (!fwrite($fp, 'mysqli_debug.phpt test line')) printf("[005] Cannot write to trace file.\n"); fclose($fp); diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt b/ext/pcntl/tests/pcntl_exec_2.phpt index 95214bc55b9a3..5383593d979bb 100644 --- a/ext/pcntl/tests/pcntl_exec_2.phpt +++ b/ext/pcntl/tests/pcntl_exec_2.phpt @@ -10,7 +10,7 @@ if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE --FILE-- "; -$file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . (binary) str_repeat((binary)'A', 500); +$file .= pack('VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . str_repeat('A', 500); file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/simplexml/tests/bug37386.phpt b/ext/simplexml/tests/bug37386.phpt index cf86906137ef0..06b69c4705a81 100644 --- a/ext/simplexml/tests/bug37386.phpt +++ b/ext/simplexml/tests/bug37386.phpt @@ -5,7 +5,7 @@ Bug #39760 (autocreating element doesn't assign value to first node) --FILE-- "); +$sx1 = new SimpleXMLElement(""); $sx1->node[0] = 'node1'; $sx1->node[1] = 'node2'; diff --git a/ext/simplexml/tests/sxe_001.phpt b/ext/simplexml/tests/sxe_001.phpt index bb93eea076568..be293efb39298 100644 --- a/ext/simplexml/tests/sxe_001.phpt +++ b/ext/simplexml/tests/sxe_001.phpt @@ -25,7 +25,7 @@ $xml =<< EOF; -var_dump(simplexml_load_string((binary)$xml, 'SimpleXMLIterator')); +var_dump(simplexml_load_string($xml, 'SimpleXMLIterator')); ?> ===DONE=== diff --git a/ext/simplexml/tests/sxe_002.phpt b/ext/simplexml/tests/sxe_002.phpt index b937b011d0d39..aff3f8384451d 100644 --- a/ext/simplexml/tests/sxe_002.phpt +++ b/ext/simplexml/tests/sxe_002.phpt @@ -35,7 +35,7 @@ $xml =<< EOF; -$sxe = simplexml_load_string((binary)$xml, 'SimpleXMLIterator'); +$sxe = simplexml_load_string($xml, 'SimpleXMLIterator'); foreach(new RecursiveIteratorIterator($sxe, 1) as $name => $data) { var_dump($name); diff --git a/ext/simplexml/tests/sxe_003.phpt b/ext/simplexml/tests/sxe_003.phpt index 58c7523160595..8a45071dd2dc5 100644 --- a/ext/simplexml/tests/sxe_003.phpt +++ b/ext/simplexml/tests/sxe_003.phpt @@ -35,7 +35,7 @@ $xml =<< EOF; -$sxe = simplexml_load_string((binary)$xml, 'SimpleXMLIterator'); +$sxe = simplexml_load_string($xml, 'SimpleXMLIterator'); foreach($sxe->getChildren() as $name => $data) { var_dump($name); diff --git a/ext/simplexml/tests/sxe_004.phpt b/ext/simplexml/tests/sxe_004.phpt index 20431de8be6d1..ac4bcd8bf7f81 100644 --- a/ext/simplexml/tests/sxe_004.phpt +++ b/ext/simplexml/tests/sxe_004.phpt @@ -74,7 +74,7 @@ class SXETest extends SimpleXMLIterator } } -$sxe = new SXETest((binary)$xml); +$sxe = new SXETest($xml); $rit = new RecursiveIteratorIterator($sxe, RecursiveIteratorIterator::SELF_FIRST); foreach($rit as $data) { diff --git a/ext/simplexml/tests/sxe_005.phpt b/ext/simplexml/tests/sxe_005.phpt index 183d351166915..8763085a091d9 100644 --- a/ext/simplexml/tests/sxe_005.phpt +++ b/ext/simplexml/tests/sxe_005.phpt @@ -26,7 +26,7 @@ class SXETest extends SimpleXMLIterator } } -$sxe = new SXETest((binary)$xml); +$sxe = new SXETest($xml); var_dump(count($sxe)); var_dump(count($sxe->elem1)); diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index 361095da5f94c..26959ec511605 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -46,7 +46,7 @@ stream_wrapper_register("myFile", "FileStream") or die("Failed to register protocol"); $tmp_dir = __DIR__; -$tn = (binary) tempnam($tmp_dir, 'foo'); +$tn = tempnam($tmp_dir, 'foo'); if (!$tn) { die("tempnam failed"); } diff --git a/ext/standard/tests/file/bug60120.phpt b/ext/standard/tests/file/bug60120.phpt index 8915bb833c974..776a6d44c8636 100644 --- a/ext/standard/tests/file/bug60120.phpt +++ b/ext/standard/tests/file/bug60120.phpt @@ -49,7 +49,7 @@ while ($pipes || $writePipes) { } if ($w) { - $written = fwrite($writePipes[0], (binary)substr($stdin, $stdinOffset), 8192); + $written = fwrite($writePipes[0], substr($stdin, $stdinOffset), 8192); if (false !== $written) { $stdinOffset += $written; } diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 1f7748e3bf0b3..e0c9cf4d76e3f 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -30,7 +30,7 @@ var_dump( $space1 ); $fh = fopen($file_path.$dir."/disk_free_space.tmp", "a"); $data = str_repeat("x", 0xffff); -fwrite($fh, (binary)$data); +fwrite($fh, $data); fclose($fh); echo "\n Free Space after writing to a file\n"; diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt index ddd25a35db866..ab2ad090812f8 100644 --- a/ext/standard/tests/file/disk_free_space_error.phpt +++ b/ext/standard/tests/file/disk_free_space_error.phpt @@ -27,7 +27,7 @@ var_dump( disk_free_space( $file_path."/dir1" )); // Invalid directory var_dump( diskfreespace( $file_path."/dir1" )); $fh = fopen( $file_path."/disk_free_space.tmp", "w" ); -fwrite( $fh, (binary)" Garbage data for the temporary file" ); +fwrite( $fh, " Garbage data for the temporary file" ); var_dump( disk_free_space( $file_path."/disk_free_space.tmp" )); // file input instead of directory var_dump( diskfreespace( $file_path."/disk_free_space.tmp" )); fclose($fh); diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt index d211f39437bf7..cfef2a42452f5 100644 --- a/ext/standard/tests/file/disk_total_space_basic.phpt +++ b/ext/standard/tests/file/disk_total_space_basic.phpt @@ -20,7 +20,7 @@ $dir = "/disk_total_space"; mkdir($file_path.$dir); var_dump( disk_total_space($file_path.$dir) ); $fh = fopen($file_path.$dir."/disk_total_space.tmp", "w"); -fwrite($fh, (binary)"Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data"); +fwrite($fh, "Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data"); fclose($fh); diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt index d986f779ba66f..b60ad6048f2db 100644 --- a/ext/standard/tests/file/disk_total_space_error.phpt +++ b/ext/standard/tests/file/disk_total_space_error.phpt @@ -24,7 +24,7 @@ var_dump( disk_total_space( $file_path, "extra argument") ); // More than valid var_dump( disk_total_space( $file_path."/dir1" )); // Invalid directory $fh = fopen( $file_path."/disk_total_space.tmp", "w" ); -fwrite( $fh, (binary)" Garbage data for the temporary file" ); +fwrite( $fh, " Garbage data for the temporary file" ); var_dump( disk_total_space( $file_path."/disk_total_space.tmp" )); // file input instead of directory fclose($fh); diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index d919c4a08f993..62d814c9fdfee 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -37,7 +37,7 @@ function runtest() { global $filename; //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists // in the include path. In this case it doesn't so the file should be written in the current dir. - file_put_contents($filename, (binary) "File in include path", FILE_USE_INCLUDE_PATH); + file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); $line = file_get_contents($filename); echo "$line\n"; unlink($filename); diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt index baaa7a65d9c3d..fe1961d16cff0 100644 --- a/ext/standard/tests/file/file_put_contents_variation5.phpt +++ b/ext/standard/tests/file/file_put_contents_variation5.phpt @@ -30,7 +30,7 @@ rmdir($thisTestDir); function runtest() { global $scriptLocFile, $filename; - file_put_contents($filename, (binary) "File written in working directory", FILE_USE_INCLUDE_PATH); + file_put_contents($filename, "File written in working directory", FILE_USE_INCLUDE_PATH); if(file_exists($scriptLocFile)) { echo "Fail - this is PHP52 behaviour\n"; unlink($scriptLocFile); diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index aaea612b36368..a0977faff8a3a 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -40,8 +40,8 @@ function runtest() { //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists // in the include path. In this case it doesn't so the file should be written in the current dir. - file_put_contents($filename, (binary) "File in include path", FILE_USE_INCLUDE_PATH); - file_put_contents($filename, (binary) ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); + file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); + file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); $line = file_get_contents($filename); echo "$line\n"; unlink($filename); diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 512d5f3eb6589..506575fde798e 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -16,7 +16,7 @@ $file_path = dirname(__FILE__); foreach( $data_array as $data ) { echo "--Iteration $count --\n"; $fh = fopen($file_path."/file_variation.tmp", "w"); - fwrite($fh, (binary)$data); + fwrite($fh, $data); var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); $count++; @@ -35,7 +35,7 @@ var_dump( file($file_path1."/file1_variation.tmp", 1) ); echo "*** Using file function to remove line containing a key string ***\n"; $file_handle = fopen($file_path."/file2_variation.tmp", "w"); $key = "SEARCH_KEY"; -fwrite( $file_handle, (binary)"The key string to be searched is SEARCH_KEY\nLine without key string\nThe key string to be searched is SEARCH_KEY" ); +fwrite( $file_handle,"The key string to be searched is SEARCH_KEY\nLine without key string\nThe key string to be searched is SEARCH_KEY" ); $out_array = file($file_path."/file2_variation.tmp"); echo "File contents in array form Before replacement of the key\n"; diff --git a/ext/standard/tests/file/filesize_variation3-win32.phpt b/ext/standard/tests/file/filesize_variation3-win32.phpt index ab38c7d1c34d0..94ba6f478af68 100644 --- a/ext/standard/tests/file/filesize_variation3-win32.phpt +++ b/ext/standard/tests/file/filesize_variation3-win32.phpt @@ -18,7 +18,7 @@ $file_path = dirname(__FILE__); echo "*** Testing filesize(): usage variations ***\n"; $filename = $file_path."/filesize_variation3.tmp"; $file_handle = fopen($filename, "w"); -fwrite($file_handle, (binary)str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes +fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes fclose($file_handle); echo "-- Testing filesize() after truncating the file to a new length --\n"; diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index 9df4490236fda..c207ec1836b32 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -18,7 +18,7 @@ restore_include_path(); function testme() { $tmpfile = basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w", true); - fwrite($h, (binary) "This is the test file"); + fwrite($h, "This is the test file"); fclose($h); diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index e14f2e1c16ee4..8b793f78588f7 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -40,7 +40,7 @@ function runtest() { $tmpfile = $extraDir.'/fopen_variation16.tmp'; $h = fopen($tmpfile, "w+", true); - fwrite($h, (binary) "This is the test file"); + fwrite($h, "This is the test file"); fclose($h); $h = @fopen($dir1.'/'.$tmpfile, "r"); diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 8abae0fbe5071..461807d26ff20 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -39,7 +39,7 @@ function runtest() { $tmpfile = $extraDir . '/' . basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w+", true); - fwrite($h, (binary) "This is the test file"); + fwrite($h, "This is the test file"); fclose($h); $h = @fopen($dir1.'/'.$tmpfile, "r"); diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index 975560f5ce5d5..1fccbb70a9829 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -63,7 +63,7 @@ function test_fopen($mode) { // create a file in the middle directory $h = fopen($secondFile, "w"); - fwrite($h, (binary) "in dir2"); + fwrite($h, "in dir2"); fclose($h); echo "\n** testing with mode=$mode **\n"; @@ -75,7 +75,7 @@ function test_fopen($mode) { //create a file in dir1 $h = fopen($firstFile, "w"); - fwrite($h, (binary) "in dir1"); + fwrite($h, "in dir1"); fclose($h); //should now read dir1 file @@ -86,7 +86,7 @@ function test_fopen($mode) { // create a file in working directory $h = fopen($filename, "w"); - fwrite($h, (binary) "in working dir"); + fwrite($h, "in working dir"); fclose($h); //should still read dir1 file @@ -106,7 +106,7 @@ function test_fopen($mode) { // create a file in the script directory $h = fopen($scriptFile, "w"); - fwrite($h, (binary) "in script dir"); + fwrite($h, "in script dir"); fclose($h); //should read the file in script dir diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index 13f075cfff718..f5c1048c07d69 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -32,7 +32,7 @@ function runtest() { global $dir1; $tmpfile = basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w", true); - fwrite($h, (binary)"This is the test file"); + fwrite($h, "This is the test file"); fclose($h); diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index dd95014ff3100..eecaec7b4c5ac 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -62,7 +62,7 @@ function test_fopen($mode) { // create a file in the middle directory $h = fopen($secondFile, "w"); - fwrite($h, (binary) "in dir2"); + fwrite($h, "in dir2"); fclose($h); echo "\n** testing with mode=$mode **\n"; @@ -74,7 +74,7 @@ function test_fopen($mode) { //create a file in dir1 $h = fopen($firstFile, "w"); - fwrite($h, (binary) "in dir1"); + fwrite($h, "in dir1"); fclose($h); //should now read dir1 file @@ -85,7 +85,7 @@ function test_fopen($mode) { // create a file in working directory $h = fopen($filename, "w"); - fwrite($h, (binary) "in working dir"); + fwrite($h, "in working dir"); fclose($h); //should read the dir1 file @@ -105,7 +105,7 @@ function test_fopen($mode) { // create a file in the script directory $h = fopen($scriptFile, "w"); - fwrite($h, (binary) "in script dir"); + fwrite($h, "in script dir"); fclose($h); //should read the file in script dir diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index 4b0a7270db5a3..5d1ca139f40d0 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -32,7 +32,7 @@ rmdir($thisTestDir); function runtest() { $tmpfile = basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w", true); - fwrite($h, (binary) "This is the test file"); + fwrite($h, "This is the test file"); fclose($h); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt index ab983a2680be5..1bd95c3450fb3 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); // set file pointer to 0 var_dump( rewind($file_handle) ); // set to beginning of file diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt index 915ab0e558699..e25ebe094615c 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); // set file pointer to 0 var_dump( rewind($file_handle) ); // set to beginning of file diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt index 63d0edd5a557e..ede0c4324558f 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -48,7 +48,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); // set file pointer to 0 var_dump( rewind($file_handle) ); // set to beginning of file diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt index ad01c3aef1e05..cb51150dcf00b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -48,7 +48,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); echo "-- Testing fseek() without using argument whence --\n"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt index 67987cb71229f..c2179fcaee642 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -48,7 +48,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); echo "-- Testing fseek() without using argument whence --\n"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt index 09c83447d83a6..1bb55b53b3ae3 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -47,7 +47,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); foreach($offset as $count){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt index e4029c718a1f0..3c84f3eb7c671 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -47,7 +47,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); foreach($offset as $count){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt index d4519123c65e1..8c84e7e386b20 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -47,7 +47,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); foreach($offset as $count){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt index 44519884a9076..4de9b3f6888f0 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -47,7 +47,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); foreach($offset as $count){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt index 5586e2bd5a05e..c6ba6c430f21a 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -48,7 +48,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); foreach($offset as $count){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt index a2a0d676c2eae..b4a0fa97f35d7 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -48,7 +48,7 @@ foreach($file_content_types as $file_content_type){ $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 512); //get the data of size 512 $data_to_be_written = $data_to_be_written; - fwrite($file_handle,(binary)$data_to_be_written); + fwrite($file_handle,$data_to_be_written); rewind($file_handle); foreach($offset as $count){ diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index 40dcf4cf510bb..3ccd32a2d4032 100644 --- a/ext/standard/tests/file/ftruncate_error.phpt +++ b/ext/standard/tests/file/ftruncate_error.phpt @@ -11,7 +11,7 @@ echo "*** Testing ftruncate() : error conditions ***\n"; $filename = dirname(__FILE__)."/ftruncate_error.tmp"; $file_handle = fopen($filename, "w" ); -fwrite($file_handle, (binary)"Testing ftruncate error conditions \n"); +fwrite($file_handle, "Testing ftruncate error conditions \n"); fflush($file_handle); echo "\n Initial file size = ".filesize($filename)."\n"; diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt index 2296193c91ca8..5a1e1c3994620 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -29,7 +29,7 @@ echo "*** Testing stat() on file after data is written in it ***\n"; $fh = fopen($file_name,"w"); $old_stat = stat($file_name); clearstatcache(); -fwrite($fh, str_repeat((binary)"Hello World", $old_stat['blksize'])); +fwrite($fh, str_repeat("Hello World", $old_stat['blksize'])); $new_stat = stat($file_name); // compare self stats diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt index 9812193c66d34..55a87bb02a60f 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -47,8 +47,8 @@ $file_handle = popen("sort", "w"); $counter = 0; $newline = "\n"; foreach($arr as $str) { - fwrite($file_handle, (binary)$str); - fwrite($file_handle, (binary)$newline); + fwrite($file_handle, $str); + fwrite($file_handle, $newline); } pclose($file_handle); diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt index d39898bbe2aa4..0e649e9a92319 100644 --- a/ext/standard/tests/file/userstreams.phpt +++ b/ext/standard/tests/file/userstreams.phpt @@ -67,7 +67,7 @@ for ($i = 0; $i < 30; $i++) { /* store the data in a regular file so that we can compare * the results */ $tf = tmpfile(); -fwrite($tf, (binary)$DATA); +fwrite($tf, $DATA); $n = ftell($tf); rewind($tf) or die("failed to rewind tmp file!"); if (ftell($tf) != 0) diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt index d2dcbb48c1cb9..6e9a1553c8632 100644 --- a/ext/standard/tests/network/inet.phpt +++ b/ext/standard/tests/network/inet.phpt @@ -9,10 +9,10 @@ if (!function_exists("inet_pton")) die("skip no inet_pton()"); diff --git a/ext/standard/tests/strings/str_getcsv_001.phpt b/ext/standard/tests/strings/str_getcsv_001.phpt index 23c6faf9180f4..becff2163badc 100644 --- a/ext/standard/tests/strings/str_getcsv_001.phpt +++ b/ext/standard/tests/strings/str_getcsv_001.phpt @@ -18,7 +18,7 @@ var_dump(str_getcsv('.foo..bar.', '.', '.', '.')); print "-----\n"; var_dump(str_getcsv('.foo. .bar.', ' ', '.', '.')); print "-----\n"; -var_dump(str_getcsv((binary)'1foo1 1bar111', (binary)' ', (binary)'1 ', (binary) '\ ')); +var_dump(str_getcsv('1foo1 1bar111', ' ', '1 ', '\ ')); print "-----\n"; var_dump(str_getcsv('.foo . . bar .', ' ', '.', '')); print "-----\n"; From c30c227c90c3da10c39d9cceea67a2c065e75d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= Date: Sun, 6 Nov 2016 23:03:29 +0100 Subject: [PATCH 4/8] Changed binary casts to string on tests --- ext/oci8/tests/xmltype_02.phpt | 2 +- ext/spl/tests/recursive_tree_iterator_005.phpt | 16 ++++++++-------- .../tests/file/popen_pclose_basic-win32-mb.phpt | 4 ++-- .../tests/file/popen_pclose_basic-win32.phpt | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt index 28e9401baf485..b0f882728e5f4 100644 --- a/ext/oci8/tests/xmltype_02.phpt +++ b/ext/oci8/tests/xmltype_02.phpt @@ -69,7 +69,7 @@ var_dump($row); echo "Test 2 Manipulate the data using SimpleXML\n"; -$sx = simplexml_load_string((binary)$row[0]->load()); +$sx = simplexml_load_string((string)$row[0]->load()); $row[0]->free(); var_dump($sx); diff --git a/ext/spl/tests/recursive_tree_iterator_005.phpt b/ext/spl/tests/recursive_tree_iterator_005.phpt index b14811fbe8dd9..95b1eb252b102 100644 --- a/ext/spl/tests/recursive_tree_iterator_005.phpt +++ b/ext/spl/tests/recursive_tree_iterator_005.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: RecursiveTreeIterator and binary vs unicode (PHP 6.0+) +SPL: RecursiveTreeIterator and strings --INI-- error_reporting=E_ALL&~E_NOTICE --FILE-- @@ -7,11 +7,11 @@ error_reporting=E_ALL&~E_NOTICE $ary = array( 0 => array( - (binary) "binary", + "string", "abc2", 1, ), - (binary) "binary" => array( + "string" => array( 2, "b", 3 => array( @@ -42,7 +42,7 @@ foreach($it as $k => $v) { ===DONE=== --EXPECT-- string(7) "|-Array" -string(10) "| |-binary" +string(10) "| |-string" string(8) "| |-abc2" string(5) "| \-1" string(7) "\-Array" @@ -61,7 +61,7 @@ string(3) "|-0" string(5) "| |-0" string(5) "| |-1" string(5) "| \-2" -string(8) "\-binary" +string(8) "\-string" string(5) " |-0" string(5) " |-1" string(5) " |-3" @@ -78,15 +78,15 @@ string(3) "|-0" string(5) "Array" string(7) "|-Array" string(5) "| |-0" -string(6) "binary" -string(10) "| |-binary" +string(6) "string" +string(10) "| |-string" string(5) "| |-1" string(4) "abc2" string(8) "| |-abc2" string(5) "| \-2" string(1) "1" string(5) "| \-1" -string(8) "\-binary" +string(8) "\-string" string(5) "Array" string(7) "\-Array" string(5) " |-0" diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt index 7e0a0e0c548b0..1d65ce0e4c476 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -45,8 +45,8 @@ $sysroot = exec('echo %SYSTEMROOT%'); $file_handle = popen("$sysroot/system32/sort", "w"); $newline = "\n"; foreach($arr as $str) { - fwrite($file_handle, (binary)$str); - fwrite($file_handle, (binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)$newline); + fwrite($file_handle, (string)$str); + fwrite($file_handle, (string)(string)(string)(string)(string)(string)(string)(string)(string)$newline); } pclose($file_handle); diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt index 6351d866f370f..d854182860b5c 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -45,8 +45,8 @@ $sysroot = exec('echo %SYSTEMROOT%'); $file_handle = popen("$sysroot/system32/sort", "w"); $newline = "\n"; foreach($arr as $str) { - fwrite($file_handle, (binary)$str); - fwrite($file_handle, (binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)$newline); + fwrite($file_handle, (string)$str); + fwrite($file_handle, (string)(string)(string)(string)(string)(string)(string)(string)(string)$newline); } pclose($file_handle); From d530a5eefa02e7f023e5b99d53de20296efb50bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= Date: Sun, 6 Nov 2016 23:10:16 +0100 Subject: [PATCH 5/8] Remove binary cast usage from helper files --- ext/mysqli/tests/local_infile_tools.inc | 22 +++++-------------- ext/phar/shortarc.php | 8 +++---- ext/phar/tests/cache_list/files/phar_test.inc | 14 ++++++------ ext/phar/tests/files/phar_oo_test.inc | 2 +- ext/phar/tests/files/phar_test.inc | 14 ++++++------ .../tar/files/make.dangerous.tar.php.inc | 8 +++---- .../tests/tar/files/make_invalid_tar.php.inc | 2 +- ext/phar/tests/tar/files/tarmaker.php.inc | 8 +++---- 8 files changed, 34 insertions(+), 44 deletions(-) diff --git a/ext/mysqli/tests/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc index 7b4d9c12a9835..9913a74e4cd3d 100644 --- a/ext/mysqli/tests/local_infile_tools.inc +++ b/ext/mysqli/tests/local_infile_tools.inc @@ -59,22 +59,12 @@ register_shutdown_function("shutdown_clean", $file); } - if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) { - if (!fwrite($fp, (binary)"'97';'x';\n") || - !fwrite($fp, (binary)"'98';'y';\n") || - !fwrite($fp, (binary)"99;'z';\n")) { - if ($verbose) - printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file); - return NULL; - } - } else { - if (!fwrite($fp, "97;'x';\n") || - !fwrite($fp, "98;'y';\n") || - !fwrite($fp, "99;'z';\n")) { - if ($verbose) - printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file); - return NULL; - } + if (!fwrite($fp, "97;'x';\n") || + !fwrite($fp, "98;'y';\n") || + !fwrite($fp, "99;'z';\n")) { + if ($verbose) + printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file); + return NULL; } fclose($fp); diff --git a/ext/phar/shortarc.php b/ext/phar/shortarc.php index 1bf3baa8aa17b..fa5263664664a 100644 --- a/ext/phar/shortarc.php +++ b/ext/phar/shortarc.php @@ -114,15 +114,15 @@ static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); - $L = unpack('V', $a = (binary)fread($fp, 4)); - $m = (binary)''; + $L = unpack('V', $a = fread($fp, 4)); + $m = ''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } - $last = (binary)fread($fp, $read); + $last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -268,7 +268,7 @@ static function extractFile($path, $entry, $fp) $stat[7] . ")"); } - if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { + if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } diff --git a/ext/phar/tests/cache_list/files/phar_test.inc b/ext/phar/tests/cache_list/files/phar_test.inc index f82471d13b4cb..0931794dd73df 100644 --- a/ext/phar/tests/cache_list/files/phar_test.inc +++ b/ext/phar/tests/cache_list/files/phar_test.inc @@ -4,7 +4,7 @@ if (function_exists('date_default_timezone_set')) { date_default_timezone_set('UTC'); } -$manifest = (binary)''; +$manifest = ''; $glags = 0; foreach($files as $name => $cont) @@ -36,12 +36,12 @@ foreach($files as $name => $cont) if (empty($comp)) $comp = $cont; if (empty($ulen)) $ulen = strlen($cont); if (empty($clen)) $clen = strlen($comp); - if (empty($crc32))$crc32= crc32((binary)$cont); + if (empty($crc32))$crc32= crc32($cont); if (isset($meta)) $meta = serialize($meta); // write manifest entry - $manifest .= pack('V', strlen($name)) . (binary)$name; - $manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . (binary)$meta; + $manifest .= pack('V', strlen($name)) . $name; + $manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . $meta; // globals $gflags |= $flags; @@ -52,13 +52,13 @@ 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)) . (binary)$alias . pack('V', strlen($pmeta)) . (binary)$pmeta . $manifest; -$file = (binary)$file; +$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . $alias . pack('V', strlen($pmeta)) . $pmeta . $manifest; + $file .= pack('V', strlen($manifest)) . $manifest; foreach($files as $cont) { - $file .= (binary)$cont; + $file .= $cont; } file_put_contents($fname, $file); diff --git a/ext/phar/tests/files/phar_oo_test.inc b/ext/phar/tests/files/phar_oo_test.inc index 45421568dee10..a0857b4aee811 100644 --- a/ext/phar/tests/files/phar_oo_test.inc +++ b/ext/phar/tests/files/phar_oo_test.inc @@ -5,7 +5,7 @@ ini_set('date.timezone', 'GMT'); $tname = basename(current(get_included_files()), ".php"); $fname = dirname(__FILE__) . "/$tname.phar.php"; $pname = 'phar://' . $fname; -$file = (binary)''; +$file = ''; $files = array(); diff --git a/ext/phar/tests/files/phar_test.inc b/ext/phar/tests/files/phar_test.inc index 6f939695422ed..53567a46bccbe 100644 --- a/ext/phar/tests/files/phar_test.inc +++ b/ext/phar/tests/files/phar_test.inc @@ -4,7 +4,7 @@ if (function_exists('date_default_timezone_set')) { date_default_timezone_set('UTC'); } -$manifest = (binary)''; +$manifest = ''; $gflags = 0; foreach($files as $name => $cont) @@ -36,12 +36,12 @@ foreach($files as $name => $cont) if (empty($comp)) $comp = $cont; if (empty($ulen)) $ulen = strlen($cont); if (empty($clen)) $clen = strlen($comp); - if (empty($crc32))$crc32= crc32((binary)$cont); + if (empty($crc32))$crc32= crc32($cont); if (isset($meta)) $meta = serialize($meta); // write manifest entry - $manifest .= pack('V', strlen($name)) . (binary)$name; - $manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . (binary)$meta; + $manifest .= pack('V', strlen($name)) . $name; + $manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . $meta; // globals $gflags |= $flags; @@ -52,13 +52,13 @@ 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)) . (binary)$alias . pack('V', strlen($pmeta)) . (binary)$pmeta . $manifest; -$file = (binary)$file; +$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . $alias . pack('V', strlen($pmeta)) . $pmeta . $manifest; +$file = $file; $file .= pack('V', strlen($manifest)) . $manifest; foreach($files as $cont) { - $file .= (binary)$cont; + $file .= $cont; } file_put_contents($fname, $file); diff --git a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc index deeaa41761973..4e9e673e5cf42 100644 --- a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc +++ b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc @@ -108,16 +108,16 @@ class danger_tarmaker $checksum = pack('a8', sprintf('%6s ', decoct($checksum))); - fwrite($this->tmp, (binary)$block . $checksum . $blockend, 512); + fwrite($this->tmp, $block . $checksum . $blockend, 512); if (is_resource($fileOrStream)) { stream_copy_to_stream($fileOrStream, $this->tmp); if ($stat['size'] % 512) { - fwrite($this->tmp, (binary)str_repeat("\0", 512 - $stat['size'] % 512)); + fwrite($this->tmp, str_repeat("\0", 512 - $stat['size'] % 512)); } } else { - fwrite($this->tmp, (binary)$fileOrStream); + fwrite($this->tmp, $fileOrStream); if (strlen($fileOrStream) % 512) { - fwrite($this->tmp, (binary)str_repeat("\0", 512 - strlen($fileOrStream) % 512)); + fwrite($this->tmp, str_repeat("\0", 512 - strlen($fileOrStream) % 512)); } } } diff --git a/ext/phar/tests/tar/files/make_invalid_tar.php.inc b/ext/phar/tests/tar/files/make_invalid_tar.php.inc index 413dd7bd1bdd5..c18bd199b3808 100644 --- a/ext/phar/tests/tar/files/make_invalid_tar.php.inc +++ b/ext/phar/tests/tar/files/make_invalid_tar.php.inc @@ -3,7 +3,7 @@ include dirname(__FILE__) . '/tarmaker.php.inc'; class corrupter extends tarmaker { function close() { - fwrite($this->tmp, (binary)'oopsie'); + fwrite($this->tmp, 'oopsie'); fclose($this->tmp); } } \ No newline at end of file diff --git a/ext/phar/tests/tar/files/tarmaker.php.inc b/ext/phar/tests/tar/files/tarmaker.php.inc index 9b8d348fbb6e2..902507881a0ce 100644 --- a/ext/phar/tests/tar/files/tarmaker.php.inc +++ b/ext/phar/tests/tar/files/tarmaker.php.inc @@ -107,16 +107,16 @@ class tarmaker $checksum = pack('a8', sprintf('%6s ', decoct($checksum))); - fwrite($this->tmp, (binary)$block . $checksum . $blockend, 512); + fwrite($this->tmp, $block . $checksum . $blockend, 512); if (is_resource($fileOrStream)) { stream_copy_to_stream($fileOrStream, $this->tmp); if ($stat['size'] % 512) { - fwrite($this->tmp, (binary)str_repeat("\0", 512 - $stat['size'] % 512)); + fwrite($this->tmp, str_repeat("\0", 512 - $stat['size'] % 512)); } } else { - fwrite($this->tmp, (binary)$fileOrStream); + fwrite($this->tmp, $fileOrStream); if (strlen($fileOrStream) % 512) { - fwrite($this->tmp, (binary)str_repeat("\0", 512 - strlen($fileOrStream) % 512)); + fwrite($this->tmp, str_repeat("\0", 512 - strlen($fileOrStream) % 512)); } } } From 33dbceaf869b0938823d2d43a805f89fd604b41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= Date: Sun, 6 Nov 2016 23:11:57 +0100 Subject: [PATCH 6/8] Remove binary casts from PHAR's default stub --- ext/phar/stub.h | 9 ++-- .../tests/cache_list/copyonwrite11.phar.phpt | 2 +- ext/phar/tests/cache_list/files/nophar.phar | Bin 7049 -> 7017 bytes ext/phar/tests/cache_list/files/openssl.phar | Bin 6901 -> 7129 bytes ext/phar/tests/files/include_path2.phar | Bin 6837 -> 6807 bytes ext/phar/tests/files/nophar.phar | Bin 7049 -> 7017 bytes ext/phar/tests/files/openssl.phar | Bin 6901 -> 7129 bytes ext/phar/tests/phar_commitwrite.phpt | 2 +- ext/phar/tests/phar_convert_repeated.phpt | 2 +- ext/phar/tests/phar_create_in_cwd.phpt | 2 +- ext/phar/tests/phar_createdefaultstub.phpt | 40 +++++++++--------- ext/phar/tests/phar_offset_check.phpt | 4 +- ext/phar/tests/phar_setdefaultstub.phpt | 38 ++++++++--------- ext/phar/tests/tar/phar_convert_phar.phpt | 6 +-- ext/phar/tests/tar/phar_convert_phar2.phpt | 6 +-- ext/phar/tests/tar/phar_convert_phar3.phpt | 6 +-- ext/phar/tests/tar/phar_convert_phar4.phpt | 8 ++-- ext/phar/tests/zip/phar_convert_phar.phpt | 6 +-- 18 files changed, 65 insertions(+), 66 deletions(-) diff --git a/ext/phar/stub.h b/ext/phar/stub.h index 139ac5da5718d..2ae2ed8b08603 100644 --- a/ext/phar/stub.h +++ b/ext/phar/stub.h @@ -24,11 +24,10 @@ static inline zend_string* phar_get_stub(const char *index_php, const char *web, 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 \"\\n \\n 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 = (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 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_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::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($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 int newstub_len = 6665; + static const int newstub_len = 6633; - return strpprintf(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); + return strpprintf(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); } diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt index 65388163dc541..bf7367c8b6b87 100644 --- a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt @@ -18,5 +18,5 @@ echo strlen($p2->getStub()),"\n"; echo "ok\n"; __HALT_COMPILER(); ?> " -6685 +6653 ok \ No newline at end of file diff --git a/ext/phar/tests/cache_list/files/nophar.phar b/ext/phar/tests/cache_list/files/nophar.phar index 4eb3083c924aa6c5ca06071d6607ae6f5dd8c59e..e6bf37a8458086fd96b705df6c984e7c2768bdf8 100644 GIT binary patch delta 115 zcmeA)e`&Vi78jGL;p979#iD6Nsfj5XDrp5e3MQJG)?6yN3bqQ9OSt1V-{$V%*_<tL zosq?&K`vslo0L3+kqKk;NJ&COR!SX_`RFO*qEz@q^=Zp)?fXGxTJ<aT&tqa>U~qTx GbpimE;wD`H delta 133 zcmaE9)@i=s78jF+@#H&P#T*(*nR$stm70_NxkVA26z+I9XY*n14ju&0TjDw+%V8^h zkI8CM@(_k6jFBTH2@&a(IwBKW`f=T?tYdq3HgGY1v)FT_aeMZACI$uucPC#b030eW AZ~y=R diff --git a/ext/phar/tests/cache_list/files/openssl.phar b/ext/phar/tests/cache_list/files/openssl.phar index f3864d7faacb9b6a50215f8f0b9513839ef71fd5..1e6f5e2f7e69597f434dbb2b0fffdee7374ac647 100644 GIT binary patch delta 554 zcmexrdedCU#=an<fQw6|JT*zdRzV#|Z4^1d#bjzY`5srXXj)NfVv2@JT7iy&iKeDC zmr5>B(d07j_|12@J9swdN~~k7=jEEkz`(!)#DYM~2*eP;38XUfQc^4QfHp`1IoDg| zB0#h&&&@g8pz7Fxe4w2mCBjf8Ai7Xqbvm+=B>iNNl4ht95N&RJtskVM9>@mUn!*Z| z1<^jq9|B+ofW4@YnU|bXnv$xZ1T{;^nhPS4nw*iZpagV8OrDZ8vQTE80$5BX5$Nf( z{DRax4JEjTlynr7ihx8(eNkzurZw1*;u2tR<;JI{mc%FL=ar=9l@x2JBx+ixCFkT9 zr-GR<SEOVX<t65(YQ)F8dHT4<$7?F+DJbdd>FK8^Sp)4&;nGyuu)r}^cg9lBmN|Qk zGa`2z9Or3wHz|nzs_JrO-|PJudpUQ$-uJ`zO7i#BC(7P>2v$twk9Y4DnVxxc<K&rX z%}yJ>-l^Do&g+@F{ujR8zb*wVllpjQk6zPmJ^%fxyG#ozG<K!sGtUxvA>$NQ8vo$! g-|Z(--u|i-HD9&l+r8MeCZ-L*P!s@ScPC#b02&st$^ZZW delta 310 zcmca<{?$~(#=an<fQw6|JT*zdRzW>8FD12NqtFR1CJWQacesi<G?Fs&5{oJ|C;M}Y zA~-4B@o>)O!`vM_2%fjZI>ver1_lO3AQlAEATp^aF)t-AwY(rBu}BX@0L2(MfjBKQ zC)H4|q@sig$XUI`(E~)U(VBc?8^{14$jB5ES*U*e-d2ZL@%Z1m3e0kG6$^jQwC!s3 zNSea0abdR+`@<rAC*R|S!qR^@biKRutD{-%q+M7Y_<eJ;7VQ4?B-%jZOb+A8!-;pK zyi+ev)@F~{Z0WI{Tcn`u_2P{N0-I`&`PQyA;nuU9v%IBy>lBlNdqTHvNcw29Y>E-n TkN?Sgs~dpM5CCF#CtoK3d=6*K diff --git a/ext/phar/tests/files/include_path2.phar b/ext/phar/tests/files/include_path2.phar index bb0ba79c84e0017bf8497cc4354f67ee6b98e354..190b60e9a81abdbfbe04e52a9ade806da525f4d9 100644 GIT binary patch delta 104 zcmdmLI^A@`9WEwQ<H`59ibd0kQWH}&RMHA`6ihTVt+`Zk6>JqImvP5$zRTUgvpH8{ z9U~Jj*JNoab(a4fauJi=q|_jc0x3<ICg!lnO}59KH^m&P5V+c>le}5Tmx+Oa!QIK% F2>=7}A+!Jh delta 119 zcmbPky47^U9WEvd)5-U^ia9irGV>CPDm5nua*HB3Y25K}&gP@s9Xtr0uf#gW$$ur) wS&HU-^q8z6r3PUHNomS3y6WFemzc&A;#u}G!Qseuhf6woObiSR?oPf=0Meu>8~^|S diff --git a/ext/phar/tests/files/nophar.phar b/ext/phar/tests/files/nophar.phar index 4eb3083c924aa6c5ca06071d6607ae6f5dd8c59e..e9d3fef414d27d1d62b6a1032ba0c6ce0aae7135 100644 GIT binary patch delta 115 zcmeA)e`&Vi78jGL;p979#iD6Nsfj5XDrp5e3MQJG)?6yN3bqQ9OSt1V-{$V%*_<tL zososTK`vslo0L3+kqKk;NJ&COR!SX_VOvu_!7+cH*IU-t+YdxLbK1ORaAjg(U~qTx GbpiloX(WLF delta 133 zcmaE9)@i=s78jF+@#H&P#T*(*nR$stm70_NxkVA26z+I9XY*n14ju&0TjDw+%V8^h zkI8CM@(_k6jFBTH2@&a(IwBKW`f=T?tYdq3HgGY1v)FT_aeMZACI$uucPC#b030eW AZ~y=R diff --git a/ext/phar/tests/files/openssl.phar b/ext/phar/tests/files/openssl.phar index f3864d7faacb9b6a50215f8f0b9513839ef71fd5..1e6f5e2f7e69597f434dbb2b0fffdee7374ac647 100644 GIT binary patch delta 554 zcmexrdedCU#=an<fQw6|JT*zdRzV#|Z4^1d#bjzY`5srXXj)NfVv2@JT7iy&iKeDC zmr5>B(d07j_|12@J9swdN~~k7=jEEkz`(!)#DYM~2*eP;38XUfQc^4QfHp`1IoDg| zB0#h&&&@g8pz7Fxe4w2mCBjf8Ai7Xqbvm+=B>iNNl4ht95N&RJtskVM9>@mUn!*Z| z1<^jq9|B+ofW4@YnU|bXnv$xZ1T{;^nhPS4nw*iZpagV8OrDZ8vQTE80$5BX5$Nf( z{DRax4JEjTlynr7ihx8(eNkzurZw1*;u2tR<;JI{mc%FL=ar=9l@x2JBx+ixCFkT9 zr-GR<SEOVX<t65(YQ)F8dHT4<$7?F+DJbdd>FK8^Sp)4&;nGyuu)r}^cg9lBmN|Qk zGa`2z9Or3wHz|nzs_JrO-|PJudpUQ$-uJ`zO7i#BC(7P>2v$twk9Y4DnVxxc<K&rX z%}yJ>-l^Do&g+@F{ujR8zb*wVllpjQk6zPmJ^%fxyG#ozG<K!sGtUxvA>$NQ8vo$! g-|Z(--u|i-HD9&l+r8MeCZ-L*P!s@ScPC#b02&st$^ZZW delta 310 zcmca<{?$~(#=an<fQw6|JT*zdRzW>8FD12NqtFR1CJWQacesi<G?Fs&5{oJ|C;M}Y zA~-4B@o>)O!`vM_2%fjZI>ver1_lO3AQlAEATp^aF)t-AwY(rBu}BX@0L2(MfjBKQ zC)H4|q@sig$XUI`(E~)U(VBc?8^{14$jB5ES*U*e-d2ZL@%Z1m3e0kG6$^jQwC!s3 zNSea0abdR+`@<rAC*R|S!qR^@biKRutD{-%q+M7Y_<eJ;7VQ4?B-%jZOb+A8!-;pK zyi+ev)@F~{Z0WI{Tcn`u_2P{N0-I`&`PQyA;nuU9v%IBy>lBlNdqTHvNcw29Y>E-n TkN?Sgs~dpM5CCF#CtoK3d=6*K diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt index 36d473e5c21a1..63878355b04b4 100644 --- a/ext/phar/tests/phar_commitwrite.phpt +++ b/ext/phar/tests/phar_commitwrite.phpt @@ -29,7 +29,7 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar'); __HALT_COMPILER(); ?> --EXPECT-- -int(6683) +int(6651) string(200) "<?php function __autoload($class) { diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt index e4b1fe41d770c..b2ef195ea7868 100644 --- a/ext/phar/tests/phar_convert_repeated.phpt +++ b/ext/phar/tests/phar_convert_repeated.phpt @@ -123,7 +123,7 @@ NULL bool(true) bool(false) bool(false) -int(6683) +int(6651) NULL ================= convertToZip() ===================== bool(false) diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt index 4b0e6594fb14d..83de7bed28983 100644 --- a/ext/phar/tests/phar_create_in_cwd.phpt +++ b/ext/phar/tests/phar_create_in_cwd.phpt @@ -32,7 +32,7 @@ __HALT_COMPILER(); unlink(dirname(__FILE__) . '/brandnewphar.phar'); ?> --EXPECT-- -int(6683) +int(6651) string(200) "<?php function __autoload($class) { diff --git a/ext/phar/tests/phar_createdefaultstub.phpt b/ext/phar/tests/phar_createdefaultstub.phpt index abc9ad8e5b157..a8648dc311a32 100644 --- a/ext/phar/tests/phar_createdefaultstub.phpt +++ b/ext/phar/tests/phar_createdefaultstub.phpt @@ -34,7 +34,7 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --EXPECT-- -string(6683) "<?php +string(6651) "<?php $web = 'index.php'; @@ -144,21 +144,21 @@ const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'index.php'; -const LEN = 6685; +const LEN = 6653; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = (binary)fread($fp, 4)); -$m = (binary)''; +$L = unpack('V', $a = fread($fp, 4)); +$m = ''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = (binary)fread($fp, $read); +$last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -298,7 +298,7 @@ die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } -if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { +if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } @@ -328,7 +328,7 @@ Extract_Phar::go(); __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -string(6694) "<?php +string(6662) "<?php $web = 'index.php'; @@ -438,21 +438,21 @@ const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6696; +const LEN = 6664; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = (binary)fread($fp, 4)); -$m = (binary)''; +$L = unpack('V', $a = fread($fp, 4)); +$m = ''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = (binary)fread($fp, $read); +$last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -592,7 +592,7 @@ die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } -if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { +if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } @@ -622,7 +622,7 @@ Extract_Phar::go(); __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -int(7074) +int(7042) ============================================================================ ============================================================================ Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed @@ -630,7 +630,7 @@ Illegal filename passed in for stub creation, was 401 characters long, and only ============================================================================ ============================================================================ ============================================================================ -string(6696) "<?php +string(6664) "<?php $web = 'the/web.php'; @@ -740,21 +740,21 @@ const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6698; +const LEN = 6666; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = (binary)fread($fp, 4)); -$m = (binary)''; +$L = unpack('V', $a = fread($fp, 4)); +$m = ''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = (binary)fread($fp, $read); +$last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -894,7 +894,7 @@ die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } -if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { +if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } @@ -924,6 +924,6 @@ Extract_Phar::go(); __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -int(7074) +int(7042) Illegal web filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed ===DONE=== diff --git a/ext/phar/tests/phar_offset_check.phpt b/ext/phar/tests/phar_offset_check.phpt index fe12534915d07..a4a65e9e0411e 100644 --- a/ext/phar/tests/phar_offset_check.phpt +++ b/ext/phar/tests/phar_offset_check.phpt @@ -70,8 +70,8 @@ var_dump($phar->getAlias()); 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(6685) -int(6685) +int(6653) +int(6653) Cannot set alias ".phar/alias.txt" directly in phar "%sphar_offset_check.phar.php", use setAlias string(5) "susan" string(5) "susan" diff --git a/ext/phar/tests/phar_setdefaultstub.phpt b/ext/phar/tests/phar_setdefaultstub.phpt index 434e6471f5876..a36c005eac3e1 100644 --- a/ext/phar/tests/phar_setdefaultstub.phpt +++ b/ext/phar/tests/phar_setdefaultstub.phpt @@ -54,7 +54,7 @@ try { unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECT-- -string(6685) "<?php +string(6653) "<?php $web = 'index.php'; @@ -164,21 +164,21 @@ const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'index.php'; -const LEN = 6685; +const LEN = 6653; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = (binary)fread($fp, 4)); -$m = (binary)''; +$L = unpack('V', $a = fread($fp, 4)); +$m = ''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = (binary)fread($fp, $read); +$last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -318,7 +318,7 @@ die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } -if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { +if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } @@ -349,7 +349,7 @@ __HALT_COMPILER(); ?> " ============================================================================ ============================================================================ -string(6696) "<?php +string(6664) "<?php $web = 'index.php'; @@ -459,21 +459,21 @@ const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6696; +const LEN = 6664; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = (binary)fread($fp, 4)); -$m = (binary)''; +$L = unpack('V', $a = fread($fp, 4)); +$m = ''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = (binary)fread($fp, $read); +$last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -613,7 +613,7 @@ die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } -if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { +if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } @@ -644,7 +644,7 @@ __HALT_COMPILER(); ?> " ============================================================================ ============================================================================ -string(6698) "<?php +string(6666) "<?php $web = 'the/web.php'; @@ -754,21 +754,21 @@ const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 6698; +const LEN = 6666; static function go($return = false) { $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); -$L = unpack('V', $a = (binary)fread($fp, 4)); -$m = (binary)''; +$L = unpack('V', $a = fread($fp, 4)); +$m = ''; do { $read = 8192; if ($L[1] - strlen($m) < 8192) { $read = $L[1] - strlen($m); } -$last = (binary)fread($fp, $read); +$last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); @@ -908,7 +908,7 @@ die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } -if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) { +if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } @@ -939,6 +939,6 @@ __HALT_COMPILER(); ?> " ============================================================================ ============================================================================ -int(7076) +int(7044) Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed ===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt index d754ac1df3f96..fce826a729996 100644 --- a/ext/phar/tests/tar/phar_convert_phar.phpt +++ b/ext/phar/tests/tar/phar_convert_phar.phpt @@ -47,12 +47,12 @@ __HALT_COMPILER(); ?> --EXPECT-- bool(false) -int(6683) +int(6651) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" bool(true) -int(6683) +int(6651) bool(true) -int(6683) +int(6651) ===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt index 58901ca7fc736..496948b14c34a 100644 --- a/ext/phar/tests/tar/phar_convert_phar2.phpt +++ b/ext/phar/tests/tar/phar_convert_phar2.phpt @@ -49,14 +49,14 @@ __HALT_COMPILER(); ?> --EXPECT-- bool(false) -int(6683) +int(6651) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" bool(true) int(4096) -int(6683) +int(6651) bool(true) bool(true) -int(6683) +int(6651) ===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt index 543c89b502037..f4768194d1c2e 100644 --- a/ext/phar/tests/tar/phar_convert_phar3.phpt +++ b/ext/phar/tests/tar/phar_convert_phar3.phpt @@ -49,14 +49,14 @@ __HALT_COMPILER(); ?> --EXPECT-- bool(false) -int(6683) +int(6651) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" bool(true) int(8192) -int(6683) +int(6651) bool(true) bool(true) -int(6683) +int(6651) ===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar4.phpt b/ext/phar/tests/tar/phar_convert_phar4.phpt index 9b095f11c269e..544b96b0bd080 100644 --- a/ext/phar/tests/tar/phar_convert_phar4.phpt +++ b/ext/phar/tests/tar/phar_convert_phar4.phpt @@ -14,7 +14,7 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar'; $phar = new Phar($fname); $phar['a.txt'] = 'some text'; -$phar->setMetadata(b'hi'); +$phar->setMetadata('hi'); $phar->stopBuffering(); var_dump($phar->isFileFormat(Phar::TAR)); var_dump(strlen($phar->getStub())); @@ -54,7 +54,7 @@ __HALT_COMPILER(); ?> --EXPECT-- bool(false) -int(6683) +int(6651) string(2) "hi" bool(true) string(60) "<?php // tar-based phar archive stub file @@ -62,10 +62,10 @@ __HALT_COMPILER();" string(2) "hi" bool(true) int(4096) -int(6683) +int(6651) string(2) "hi" bool(true) bool(true) -int(6683) +int(6651) string(2) "hi" ===DONE=== diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt index cad6d9fc7f896..815656dbf671d 100644 --- a/ext/phar/tests/zip/phar_convert_phar.phpt +++ b/ext/phar/tests/zip/phar_convert_phar.phpt @@ -46,12 +46,12 @@ __HALT_COMPILER(); ?> --EXPECT-- bool(false) -int(6683) +int(6651) bool(true) string(60) "<?php // zip-based phar archive stub file __HALT_COMPILER();" bool(true) -int(6683) +int(6651) bool(true) -int(6683) +int(6651) ===DONE=== From 12fa6174737608d5b14fa88d4f7bbf3f1981d9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= <mail@pmmaga.net> Date: Sun, 6 Nov 2016 23:18:08 +0100 Subject: [PATCH 7/8] Remove the b prefix from the language scanner --- Zend/zend_language_scanner.c | 2415 +++++++++++++++++----------------- Zend/zend_language_scanner.l | 17 +- 2 files changed, 1193 insertions(+), 1239 deletions(-) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index a509accb97bf0..3221d3e1f4372 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1352,7 +1352,7 @@ int start_line = CG(zend_lineno); yy19: YYDEBUG(19, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2214 "Zend/zend_language_scanner.l" +#line 2211 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { RETURN_TOKEN(END); @@ -1404,7 +1404,7 @@ int start_line = CG(zend_lineno); ++YYCURSOR; YYDEBUG(22, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2158 "Zend/zend_language_scanner.l" +#line 2155 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); RETURN_TOKEN('`'); @@ -1419,7 +1419,7 @@ int start_line = CG(zend_lineno); ++YYCURSOR; YYDEBUG(25, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2145 "Zend/zend_language_scanner.l" +#line 2142 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (zend_long) '{'; yy_push_state(ST_IN_SCRIPTING); @@ -1572,7 +1572,7 @@ int start_line = CG(zend_lineno); yy41: YYDEBUG(41, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2164 "Zend/zend_language_scanner.l" +#line 2161 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1632,7 +1632,7 @@ int start_line = CG(zend_lineno); ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2153 "Zend/zend_language_scanner.l" +#line 2150 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); RETURN_TOKEN('"'); @@ -1647,7 +1647,7 @@ int start_line = CG(zend_lineno); ++YYCURSOR; YYDEBUG(47, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2145 "Zend/zend_language_scanner.l" +#line 2142 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (zend_long) '{'; yy_push_state(ST_IN_SCRIPTING); @@ -1743,7 +1743,7 @@ int start_line = CG(zend_lineno); ++YYCURSOR; YYDEBUG(63, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2131 "Zend/zend_language_scanner.l" +#line 2128 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -1818,7 +1818,7 @@ int start_line = CG(zend_lineno); yy67: YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2256 "Zend/zend_language_scanner.l" +#line 2253 "Zend/zend_language_scanner.l" { int newline = 0; @@ -1906,7 +1906,7 @@ int start_line = CG(zend_lineno); ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2145 "Zend/zend_language_scanner.l" +#line 2142 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (zend_long) '{'; yy_push_state(ST_IN_SCRIPTING); @@ -2159,17 +2159,17 @@ int start_line = CG(zend_lineno); YYDEBUG(-1, yych); switch ((yych = *YYCURSOR)) { case 'C': - case 'c': goto yy704; + case 'c': goto yy700; case 'L': - case 'l': goto yy705; + case 'l': goto yy701; case 'M': - case 'm': goto yy706; + case 'm': goto yy702; case 'N': - case 'n': goto yy707; + case 'n': goto yy703; case 'V': - case 'v': goto yy708; + case 'v': goto yy704; case 'X': - case 'x': goto yy709; + case 'x': goto yy705; default: goto yy150; } yy87: @@ -2186,20 +2186,20 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'H') { - if (yych == 'E') goto yy686; + if (yych == 'E') goto yy682; goto yy150; } else { - if (yych <= 'I') goto yy687; + if (yych <= 'I') goto yy683; if (yych <= 'N') goto yy150; - goto yy688; + goto yy684; } } else { if (yych <= 'h') { - if (yych == 'e') goto yy686; + if (yych == 'e') goto yy682; goto yy150; } else { - if (yych <= 'i') goto yy687; - if (yych == 'o') goto yy688; + if (yych <= 'i') goto yy683; + if (yych == 'o') goto yy684; goto yy150; } } @@ -2208,20 +2208,20 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'N') { - if (yych == 'I') goto yy662; + if (yych == 'I') goto yy658; goto yy150; } else { - if (yych <= 'O') goto yy663; + if (yych <= 'O') goto yy659; if (yych <= 'T') goto yy150; - goto yy664; + goto yy660; } } else { if (yych <= 'n') { - if (yych == 'i') goto yy662; + if (yych == 'i') goto yy658; goto yy150; } else { - if (yych <= 'o') goto yy663; - if (yych == 'u') goto yy664; + if (yych <= 'o') goto yy659; + if (yych == 'u') goto yy660; goto yy150; } } @@ -2230,48 +2230,48 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'K') { - if (yych == 'A') goto yy627; + if (yych == 'A') goto yy623; goto yy150; } else { - if (yych <= 'L') goto yy628; + if (yych <= 'L') goto yy624; if (yych <= 'N') goto yy150; - goto yy629; + goto yy625; } } else { if (yych <= 'k') { - if (yych == 'a') goto yy627; + if (yych == 'a') goto yy623; goto yy150; } else { - if (yych <= 'l') goto yy628; - if (yych == 'o') goto yy629; + if (yych <= 'l') goto yy624; + if (yych == 'o') goto yy625; goto yy150; } } yy91: YYDEBUG(91, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy609; - if (yych == 'e') goto yy609; + if (yych == 'E') goto yy605; + if (yych == 'e') goto yy605; goto yy150; yy92: YYDEBUG(92, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy597; - if (yych == 'i') goto yy597; + if (yych == 'I') goto yy593; + if (yych == 'i') goto yy593; goto yy150; yy93: YYDEBUG(93, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { - if (yych == 'H') goto yy585; + if (yych == 'H') goto yy581; if (yych <= 'Q') goto yy150; - goto yy586; + goto yy582; } else { if (yych <= 'h') { if (yych <= 'g') goto yy150; - goto yy585; + goto yy581; } else { - if (yych == 'r') goto yy586; + if (yych == 'r') goto yy582; goto yy150; } } @@ -2280,53 +2280,53 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'L') { - if (yych == 'F') goto yy532; + if (yych == 'F') goto yy528; goto yy150; } else { - if (yych <= 'M') goto yy534; - if (yych <= 'N') goto yy535; + if (yych <= 'M') goto yy530; + if (yych <= 'N') goto yy531; if (yych <= 'R') goto yy150; - goto yy536; + goto yy532; } } else { if (yych <= 'm') { - if (yych == 'f') goto yy532; + if (yych == 'f') goto yy528; if (yych <= 'l') goto yy150; - goto yy534; + goto yy530; } else { - if (yych <= 'n') goto yy535; - if (yych == 's') goto yy536; + if (yych <= 'n') goto yy531; + if (yych == 's') goto yy532; goto yy150; } } yy95: YYDEBUG(95, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy527; - if (yych == 'h') goto yy527; + if (yych == 'H') goto yy523; + if (yych == 'h') goto yy523; goto yy150; yy96: YYDEBUG(96, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'M') { - if (yych == 'B') goto yy509; + if (yych == 'B') goto yy505; goto yy150; } else { - if (yych <= 'N') goto yy510; + if (yych <= 'N') goto yy506; if (yych <= 'Q') goto yy150; - if (yych <= 'R') goto yy511; - goto yy512; + if (yych <= 'R') goto yy507; + goto yy508; } } else { if (yych <= 'n') { - if (yych == 'b') goto yy509; + if (yych == 'b') goto yy505; if (yych <= 'm') goto yy150; - goto yy510; + goto yy506; } else { if (yych <= 'q') goto yy150; - if (yych <= 'r') goto yy511; - if (yych <= 's') goto yy512; + if (yych <= 'r') goto yy507; + if (yych <= 's') goto yy508; goto yy150; } } @@ -2334,40 +2334,24 @@ int start_line = CG(zend_lineno); YYDEBUG(97, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'W') { - if (yych == 'T') goto yy497; + if (yych == 'T') goto yy493; if (yych <= 'V') goto yy150; - goto yy498; + goto yy494; } else { if (yych <= 't') { if (yych <= 's') goto yy150; - goto yy497; + goto yy493; } else { - if (yych == 'w') goto yy498; + if (yych == 'w') goto yy494; goto yy150; } } yy98: YYDEBUG(98, *YYCURSOR); - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ';') { - if (yych <= '"') { - if (yych <= '!') goto yy150; - goto yy489; - } else { - if (yych == '\'') goto yy490; - goto yy150; - } - } else { - if (yych <= 'R') { - if (yych <= '<') goto yy488; - if (yych <= 'Q') goto yy150; - goto yy491; - } else { - if (yych == 'r') goto yy491; - goto yy150; - } - } + yych = *++YYCURSOR; + if (yych == 'R') goto yy488; + if (yych == 'r') goto yy488; + goto yy150; yy99: YYDEBUG(99, *YYCURSOR); yych = *++YYCURSOR; @@ -2416,7 +2400,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(yytext[0]); } -#line 2420 "Zend/zend_language_scanner.c" +#line 2404 "Zend/zend_language_scanner.c" yy103: YYDEBUG(103, *YYCURSOR); ++YYCURSOR; @@ -2430,7 +2414,7 @@ int start_line = CG(zend_lineno); HANDLE_NEWLINES(yytext, yyleng); RETURN_TOKEN(T_WHITESPACE); } -#line 2434 "Zend/zend_language_scanner.c" +#line 2418 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -2445,10 +2429,10 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_NS_SEPARATOR); } -#line 2449 "Zend/zend_language_scanner.c" +#line 2433 "Zend/zend_language_scanner.c" yy108: YYDEBUG(108, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych == '.') goto yy441; @@ -2489,7 +2473,7 @@ int start_line = CG(zend_lineno); goto yy150; yy112: YYDEBUG(112, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= 'D') { @@ -2679,7 +2663,7 @@ int start_line = CG(zend_lineno); yy_push_state(ST_IN_SCRIPTING); RETURN_TOKEN('{'); } -#line 2683 "Zend/zend_language_scanner.c" +#line 2667 "Zend/zend_language_scanner.c" yy133: YYDEBUG(133, *YYCURSOR); ++YYCURSOR; @@ -2693,10 +2677,10 @@ int start_line = CG(zend_lineno); } RETURN_TOKEN('}'); } -#line 2697 "Zend/zend_language_scanner.c" +#line 2681 "Zend/zend_language_scanner.c" yy135: YYDEBUG(135, *YYCURSOR); - yyaccept = 2; + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'E') { if (yych <= '9') { @@ -2766,10 +2750,10 @@ int start_line = CG(zend_lineno); ZEND_ASSERT(!errno); RETURN_TOKEN(T_LNUMBER); } -#line 2770 "Zend/zend_language_scanner.c" +#line 2754 "Zend/zend_language_scanner.c" yy137: YYDEBUG(137, *YYCURSOR); - yyaccept = 2; + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych == '.') goto yy151; @@ -2823,18 +2807,16 @@ int start_line = CG(zend_lineno); RETURN_TOKEN(T_COMMENT); } -#line 2827 "Zend/zend_language_scanner.c" +#line 2811 "Zend/zend_language_scanner.c" yy141: YYDEBUG(141, *YYCURSOR); ++YYCURSOR; -yy142: YYDEBUG(142, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1966 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; - int bprefix = (yytext[0] != '\'') ? 1 : 0; while (1) { if (YYCURSOR < YYLIMIT) { @@ -2857,7 +2839,7 @@ int start_line = CG(zend_lineno); } } - ZVAL_STRINGL(zendlval, yytext+bprefix+1, yyleng-bprefix-2); + ZVAL_STRINGL(zendlval, yytext+1, yyleng-2); /* convert escape sequences */ s = t = Z_STRVAL_P(zendlval); @@ -2898,22 +2880,20 @@ int start_line = CG(zend_lineno); } RETURN_TOKEN(T_CONSTANT_ENCAPSED_STRING); } -#line 2902 "Zend/zend_language_scanner.c" +#line 2884 "Zend/zend_language_scanner.c" yy143: YYDEBUG(143, *YYCURSOR); ++YYCURSOR; -yy144: YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2035 "Zend/zend_language_scanner.l" +#line 2034 "Zend/zend_language_scanner.l" { - int bprefix = (yytext[0] != '"') ? 1 : 0; while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { case '"': yyleng = YYCURSOR - SCNG(yy_text); - zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"'); + zend_scan_escape_string(zendlval, yytext+1, yyleng-2, '"'); RETURN_TOKEN(T_CONSTANT_ENCAPSED_STRING); case '$': if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') { @@ -2946,24 +2926,24 @@ int start_line = CG(zend_lineno); BEGIN(ST_DOUBLE_QUOTES); RETURN_TOKEN('"'); } -#line 2950 "Zend/zend_language_scanner.c" +#line 2930 "Zend/zend_language_scanner.c" yy145: YYDEBUG(145, *YYCURSOR); ++YYCURSOR; YYDEBUG(146, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2125 "Zend/zend_language_scanner.l" +#line 2122 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); RETURN_TOKEN('`'); } -#line 2961 "Zend/zend_language_scanner.c" +#line 2941 "Zend/zend_language_scanner.c" yy147: YYDEBUG(147, *YYCURSOR); ++YYCURSOR; YYDEBUG(148, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2387 "Zend/zend_language_scanner.l" +#line 2384 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { RETURN_TOKEN(END); @@ -2972,7 +2952,7 @@ int start_line = CG(zend_lineno); zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 2976 "Zend/zend_language_scanner.c" +#line 2956 "Zend/zend_language_scanner.c" yy149: YYDEBUG(149, *YYCURSOR); ++YYCURSOR; @@ -2986,7 +2966,7 @@ int start_line = CG(zend_lineno); goto yy87; yy151: YYDEBUG(151, *YYCURSOR); - yyaccept = 3; + yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(3); yych = *YYCURSOR; @@ -3008,10 +2988,10 @@ int start_line = CG(zend_lineno); ZEND_ASSERT(end == yytext + yyleng); RETURN_TOKEN(T_DNUMBER); } -#line 3012 "Zend/zend_language_scanner.c" +#line 2992 "Zend/zend_language_scanner.c" yy154: YYDEBUG(154, *YYCURSOR); - yyaccept = 2; + yyaccept = 1; YYMARKER = ++YYCURSOR; YYFILL(3); yych = *YYCURSOR; @@ -3040,29 +3020,25 @@ int start_line = CG(zend_lineno); yy157: YYDEBUG(157, *YYCURSOR); YYCURSOR = YYMARKER; - if (yyaccept <= 3) { + if (yyaccept <= 2) { if (yyaccept <= 1) { if (yyaccept <= 0) { - goto yy87; - } else { goto yy102; - } - } else { - if (yyaccept <= 2) { - goto yy136; } else { - goto yy153; + goto yy136; } + } else { + goto yy153; } } else { - if (yyaccept <= 5) { - if (yyaccept <= 4) { + if (yyaccept <= 4) { + if (yyaccept <= 3) { goto yy190; } else { goto yy210; } } else { - goto yy601; + goto yy597; } } yy158: @@ -3132,7 +3108,7 @@ int start_line = CG(zend_lineno); RETURN_TOKEN(T_DNUMBER); } } -#line 3136 "Zend/zend_language_scanner.c" +#line 3112 "Zend/zend_language_scanner.c" yy166: YYDEBUG(166, *YYCURSOR); ++YYCURSOR; @@ -3172,7 +3148,7 @@ int start_line = CG(zend_lineno); RETURN_TOKEN(T_DNUMBER); } } -#line 3176 "Zend/zend_language_scanner.c" +#line 3152 "Zend/zend_language_scanner.c" yy169: YYDEBUG(169, *YYCURSOR); ++YYCURSOR; @@ -3202,7 +3178,7 @@ int start_line = CG(zend_lineno); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); RETURN_TOKEN(T_VARIABLE); } -#line 3206 "Zend/zend_language_scanner.c" +#line 3182 "Zend/zend_language_scanner.c" yy172: YYDEBUG(172, *YYCURSOR); yych = *++YYCURSOR; @@ -3220,7 +3196,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_LOGICAL_XOR); } -#line 3224 "Zend/zend_language_scanner.c" +#line 3200 "Zend/zend_language_scanner.c" yy175: YYDEBUG(175, *YYCURSOR); ++YYCURSOR; @@ -3233,7 +3209,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_LOGICAL_OR); } -#line 3237 "Zend/zend_language_scanner.c" +#line 3213 "Zend/zend_language_scanner.c" yy177: YYDEBUG(177, *YYCURSOR); ++YYCURSOR; @@ -3243,7 +3219,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_XOR_EQUAL); } -#line 3247 "Zend/zend_language_scanner.c" +#line 3223 "Zend/zend_language_scanner.c" yy179: YYDEBUG(179, *YYCURSOR); ++YYCURSOR; @@ -3253,7 +3229,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_BOOLEAN_OR); } -#line 3257 "Zend/zend_language_scanner.c" +#line 3233 "Zend/zend_language_scanner.c" yy181: YYDEBUG(181, *YYCURSOR); ++YYCURSOR; @@ -3263,7 +3239,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_OR_EQUAL); } -#line 3267 "Zend/zend_language_scanner.c" +#line 3243 "Zend/zend_language_scanner.c" yy183: YYDEBUG(183, *YYCURSOR); ++YYCURSOR; @@ -3273,7 +3249,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_BOOLEAN_AND); } -#line 3277 "Zend/zend_language_scanner.c" +#line 3253 "Zend/zend_language_scanner.c" yy185: YYDEBUG(185, *YYCURSOR); ++YYCURSOR; @@ -3283,7 +3259,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_AND_EQUAL); } -#line 3287 "Zend/zend_language_scanner.c" +#line 3263 "Zend/zend_language_scanner.c" yy187: YYDEBUG(187, *YYCURSOR); ++YYCURSOR; @@ -3293,10 +3269,10 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_MOD_EQUAL); } -#line 3297 "Zend/zend_language_scanner.c" +#line 3273 "Zend/zend_language_scanner.c" yy189: YYDEBUG(189, *YYCURSOR); - yyaccept = 4; + yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yych == '*') goto yy194; yy190: @@ -3335,7 +3311,7 @@ int start_line = CG(zend_lineno); RETURN_TOKEN(T_COMMENT); } -#line 3339 "Zend/zend_language_scanner.c" +#line 3315 "Zend/zend_language_scanner.c" yy191: YYDEBUG(191, *YYCURSOR); yych = *++YYCURSOR; @@ -3349,7 +3325,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_DIV_EQUAL); } -#line 3353 "Zend/zend_language_scanner.c" +#line 3329 "Zend/zend_language_scanner.c" yy194: YYDEBUG(194, *YYCURSOR); yych = *++YYCURSOR; @@ -3377,7 +3353,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_POW); } -#line 3381 "Zend/zend_language_scanner.c" +#line 3357 "Zend/zend_language_scanner.c" yy199: YYDEBUG(199, *YYCURSOR); ++YYCURSOR; @@ -3387,7 +3363,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_MUL_EQUAL); } -#line 3391 "Zend/zend_language_scanner.c" +#line 3367 "Zend/zend_language_scanner.c" yy201: YYDEBUG(201, *YYCURSOR); ++YYCURSOR; @@ -3397,7 +3373,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_POW_EQUAL); } -#line 3401 "Zend/zend_language_scanner.c" +#line 3377 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); ++YYCURSOR; @@ -3408,7 +3384,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_SR); } -#line 3412 "Zend/zend_language_scanner.c" +#line 3388 "Zend/zend_language_scanner.c" yy205: YYDEBUG(205, *YYCURSOR); ++YYCURSOR; @@ -3418,7 +3394,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_IS_GREATER_OR_EQUAL); } -#line 3422 "Zend/zend_language_scanner.c" +#line 3398 "Zend/zend_language_scanner.c" yy207: YYDEBUG(207, *YYCURSOR); ++YYCURSOR; @@ -3428,10 +3404,10 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_SR_EQUAL); } -#line 3432 "Zend/zend_language_scanner.c" +#line 3408 "Zend/zend_language_scanner.c" yy209: YYDEBUG(209, *YYCURSOR); - yyaccept = 5; + yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ';') goto yy210; if (yych <= '<') goto yy219; @@ -3443,7 +3419,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_SL); } -#line 3447 "Zend/zend_language_scanner.c" +#line 3423 "Zend/zend_language_scanner.c" yy211: YYDEBUG(211, *YYCURSOR); ++YYCURSOR; @@ -3454,7 +3430,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_IS_SMALLER_OR_EQUAL); } -#line 3458 "Zend/zend_language_scanner.c" +#line 3434 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); ++YYCURSOR; @@ -3465,7 +3441,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_IS_NOT_EQUAL); } -#line 3469 "Zend/zend_language_scanner.c" +#line 3445 "Zend/zend_language_scanner.c" yy215: YYDEBUG(215, *YYCURSOR); ++YYCURSOR; @@ -3475,7 +3451,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_SPACESHIP); } -#line 3479 "Zend/zend_language_scanner.c" +#line 3455 "Zend/zend_language_scanner.c" yy217: YYDEBUG(217, *YYCURSOR); ++YYCURSOR; @@ -3485,7 +3461,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_SL_EQUAL); } -#line 3489 "Zend/zend_language_scanner.c" +#line 3465 "Zend/zend_language_scanner.c" yy219: YYDEBUG(219, *YYCURSOR); ++YYCURSOR; @@ -3590,15 +3566,14 @@ int start_line = CG(zend_lineno); yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2077 "Zend/zend_language_scanner.l" +#line 2075 "Zend/zend_language_scanner.l" { char *s; - int bprefix = (yytext[0] != '<') ? 1 : 0; zend_heredoc_label *heredoc_label = emalloc(sizeof(zend_heredoc_label)); CG(zend_lineno)++; - heredoc_label->length = yyleng-bprefix-3-1-(yytext[yyleng-2]=='\r'?1:0); - s = yytext+bprefix+3; + heredoc_label->length = yyleng-3-1-(yytext[yyleng-2]=='\r'?1:0); + s = yytext+3; while ((*s == ' ') || (*s == '\t')) { s++; heredoc_label->length--; @@ -3637,7 +3612,7 @@ int start_line = CG(zend_lineno); RETURN_TOKEN(T_START_HEREDOC); } -#line 3641 "Zend/zend_language_scanner.c" +#line 3616 "Zend/zend_language_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); yych = *++YYCURSOR; @@ -3681,7 +3656,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_IS_NOT_IDENTICAL); } -#line 3685 "Zend/zend_language_scanner.c" +#line 3660 "Zend/zend_language_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); ++YYCURSOR; @@ -3691,7 +3666,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_PLUS_EQUAL); } -#line 3695 "Zend/zend_language_scanner.c" +#line 3670 "Zend/zend_language_scanner.c" yy238: YYDEBUG(238, *YYCURSOR); ++YYCURSOR; @@ -3701,7 +3676,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_INC); } -#line 3705 "Zend/zend_language_scanner.c" +#line 3680 "Zend/zend_language_scanner.c" yy240: YYDEBUG(240, *YYCURSOR); yych = *++YYCURSOR; @@ -3724,7 +3699,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_LIST); } -#line 3728 "Zend/zend_language_scanner.c" +#line 3703 "Zend/zend_language_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); ++YYCURSOR; @@ -3735,7 +3710,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_IS_EQUAL); } -#line 3739 "Zend/zend_language_scanner.c" +#line 3714 "Zend/zend_language_scanner.c" yy246: YYDEBUG(246, *YYCURSOR); ++YYCURSOR; @@ -3745,7 +3720,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_DOUBLE_ARROW); } -#line 3749 "Zend/zend_language_scanner.c" +#line 3724 "Zend/zend_language_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); ++YYCURSOR; @@ -3755,7 +3730,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_IS_IDENTICAL); } -#line 3759 "Zend/zend_language_scanner.c" +#line 3734 "Zend/zend_language_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); yych = *++YYCURSOR; @@ -3889,7 +3864,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_NS_C); } -#line 3893 "Zend/zend_language_scanner.c" +#line 3868 "Zend/zend_language_scanner.c" yy270: YYDEBUG(270, *YYCURSOR); yych = *++YYCURSOR; @@ -3913,7 +3888,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_DIR); } -#line 3917 "Zend/zend_language_scanner.c" +#line 3892 "Zend/zend_language_scanner.c" yy275: YYDEBUG(275, *YYCURSOR); yych = *++YYCURSOR; @@ -3942,7 +3917,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_LINE); } -#line 3946 "Zend/zend_language_scanner.c" +#line 3921 "Zend/zend_language_scanner.c" yy281: YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; @@ -3981,7 +3956,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_METHOD_C); } -#line 3985 "Zend/zend_language_scanner.c" +#line 3960 "Zend/zend_language_scanner.c" yy289: YYDEBUG(289, *YYCURSOR); yych = *++YYCURSOR; @@ -4036,7 +4011,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_FUNC_C); } -#line 4040 "Zend/zend_language_scanner.c" +#line 4015 "Zend/zend_language_scanner.c" yy300: YYDEBUG(300, *YYCURSOR); yych = *++YYCURSOR; @@ -4060,7 +4035,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_FILE); } -#line 4064 "Zend/zend_language_scanner.c" +#line 4039 "Zend/zend_language_scanner.c" yy305: YYDEBUG(305, *YYCURSOR); yych = *++YYCURSOR; @@ -4094,7 +4069,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_TRAIT_C); } -#line 4098 "Zend/zend_language_scanner.c" +#line 4073 "Zend/zend_language_scanner.c" yy312: YYDEBUG(312, *YYCURSOR); yych = *++YYCURSOR; @@ -4128,7 +4103,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_CLASS_C); } -#line 4132 "Zend/zend_language_scanner.c" +#line 4107 "Zend/zend_language_scanner.c" yy319: YYDEBUG(319, *YYCURSOR); yych = *++YYCURSOR; @@ -4194,7 +4169,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_HALT_COMPILER); } -#line 4198 "Zend/zend_language_scanner.c" +#line 4173 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4218,7 +4193,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_USE); } -#line 4222 "Zend/zend_language_scanner.c" +#line 4197 "Zend/zend_language_scanner.c" yy336: YYDEBUG(336, *YYCURSOR); yych = *++YYCURSOR; @@ -4241,7 +4216,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_UNSET); } -#line 4245 "Zend/zend_language_scanner.c" +#line 4220 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); ++YYCURSOR; @@ -4417,7 +4392,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_INT_CAST); } -#line 4421 "Zend/zend_language_scanner.c" +#line 4396 "Zend/zend_language_scanner.c" yy358: YYDEBUG(358, *YYCURSOR); yych = *++YYCURSOR; @@ -4465,7 +4440,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_DOUBLE_CAST); } -#line 4469 "Zend/zend_language_scanner.c" +#line 4444 "Zend/zend_language_scanner.c" yy367: YYDEBUG(367, *YYCURSOR); yych = *++YYCURSOR; @@ -4539,7 +4514,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_STRING_CAST); } -#line 4543 "Zend/zend_language_scanner.c" +#line 4518 "Zend/zend_language_scanner.c" yy381: YYDEBUG(381, *YYCURSOR); yych = *++YYCURSOR; @@ -4576,7 +4551,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_ARRAY_CAST); } -#line 4580 "Zend/zend_language_scanner.c" +#line 4555 "Zend/zend_language_scanner.c" yy388: YYDEBUG(388, *YYCURSOR); yych = *++YYCURSOR; @@ -4618,7 +4593,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_OBJECT_CAST); } -#line 4622 "Zend/zend_language_scanner.c" +#line 4597 "Zend/zend_language_scanner.c" yy396: YYDEBUG(396, *YYCURSOR); yych = *++YYCURSOR; @@ -4663,7 +4638,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_BOOL_CAST); } -#line 4667 "Zend/zend_language_scanner.c" +#line 4642 "Zend/zend_language_scanner.c" yy404: YYDEBUG(404, *YYCURSOR); yych = *++YYCURSOR; @@ -4727,7 +4702,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_UNSET_CAST); } -#line 4731 "Zend/zend_language_scanner.c" +#line 4706 "Zend/zend_language_scanner.c" yy416: YYDEBUG(416, *YYCURSOR); yych = *++YYCURSOR; @@ -4745,7 +4720,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_VAR); } -#line 4749 "Zend/zend_language_scanner.c" +#line 4724 "Zend/zend_language_scanner.c" yy419: YYDEBUG(419, *YYCURSOR); yych = *++YYCURSOR; @@ -4769,7 +4744,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_NEW); } -#line 4773 "Zend/zend_language_scanner.c" +#line 4748 "Zend/zend_language_scanner.c" yy423: YYDEBUG(423, *YYCURSOR); yych = *++YYCURSOR; @@ -4812,7 +4787,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_NAMESPACE); } -#line 4816 "Zend/zend_language_scanner.c" +#line 4791 "Zend/zend_language_scanner.c" yy431: YYDEBUG(431, *YYCURSOR); ++YYCURSOR; @@ -4826,7 +4801,7 @@ int start_line = CG(zend_lineno); BEGIN(INITIAL); RETURN_TOKEN(T_CLOSE_TAG); /* implicit ';' at php-end tag */ } -#line 4830 "Zend/zend_language_scanner.c" +#line 4805 "Zend/zend_language_scanner.c" yy433: YYDEBUG(433, *YYCURSOR); ++YYCURSOR; @@ -4836,7 +4811,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_COALESCE); } -#line 4840 "Zend/zend_language_scanner.c" +#line 4815 "Zend/zend_language_scanner.c" yy435: YYDEBUG(435, *YYCURSOR); yych = *++YYCURSOR; @@ -4848,7 +4823,7 @@ int start_line = CG(zend_lineno); goto yy432; yy437: YYDEBUG(437, *YYCURSOR); - yyaccept = 3; + yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(3); yych = *YYCURSOR; @@ -4871,7 +4846,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_CONCAT_EQUAL); } -#line 4875 "Zend/zend_language_scanner.c" +#line 4850 "Zend/zend_language_scanner.c" yy441: YYDEBUG(441, *YYCURSOR); yych = *++YYCURSOR; @@ -4884,7 +4859,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_ELLIPSIS); } -#line 4888 "Zend/zend_language_scanner.c" +#line 4863 "Zend/zend_language_scanner.c" yy444: YYDEBUG(444, *YYCURSOR); ++YYCURSOR; @@ -4894,7 +4869,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM); } -#line 4898 "Zend/zend_language_scanner.c" +#line 4873 "Zend/zend_language_scanner.c" yy446: YYDEBUG(446, *YYCURSOR); ++YYCURSOR; @@ -4920,7 +4895,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_MINUS_EQUAL); } -#line 4924 "Zend/zend_language_scanner.c" +#line 4899 "Zend/zend_language_scanner.c" yy450: YYDEBUG(450, *YYCURSOR); ++YYCURSOR; @@ -4930,7 +4905,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_DEC); } -#line 4934 "Zend/zend_language_scanner.c" +#line 4909 "Zend/zend_language_scanner.c" yy452: YYDEBUG(452, *YYCURSOR); ++YYCURSOR; @@ -4941,7 +4916,7 @@ int start_line = CG(zend_lineno); yy_push_state(ST_LOOKING_FOR_PROPERTY); RETURN_TOKEN(T_OBJECT_OPERATOR); } -#line 4945 "Zend/zend_language_scanner.c" +#line 4920 "Zend/zend_language_scanner.c" yy454: YYDEBUG(454, *YYCURSOR); yych = *++YYCURSOR; @@ -4990,7 +4965,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_PUBLIC); } -#line 4994 "Zend/zend_language_scanner.c" +#line 4969 "Zend/zend_language_scanner.c" yy461: YYDEBUG(461, *YYCURSOR); yych = *++YYCURSOR; @@ -5049,7 +5024,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_PROTECTED); } -#line 5053 "Zend/zend_language_scanner.c" +#line 5028 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5083,7 +5058,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_PRIVATE); } -#line 5087 "Zend/zend_language_scanner.c" +#line 5062 "Zend/zend_language_scanner.c" yy476: YYDEBUG(476, *YYCURSOR); ++YYCURSOR; @@ -5096,7 +5071,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_PRINT); } -#line 5100 "Zend/zend_language_scanner.c" +#line 5075 "Zend/zend_language_scanner.c" yy478: YYDEBUG(478, *YYCURSOR); yych = *++YYCURSOR; @@ -5125,7 +5100,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_GOTO); } -#line 5129 "Zend/zend_language_scanner.c" +#line 5104 "Zend/zend_language_scanner.c" yy483: YYDEBUG(483, *YYCURSOR); yych = *++YYCURSOR; @@ -5153,1812 +5128,1794 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_GLOBAL); } -#line 5157 "Zend/zend_language_scanner.c" +#line 5132 "Zend/zend_language_scanner.c" yy488: YYDEBUG(488, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '<') goto yy496; - goto yy157; + if (yych == 'E') goto yy489; + if (yych != 'e') goto yy150; yy489: YYDEBUG(489, *YYCURSOR); yych = *++YYCURSOR; - goto yy144; + if (yych == 'A') goto yy490; + if (yych != 'a') goto yy150; yy490: YYDEBUG(490, *YYCURSOR); yych = *++YYCURSOR; - goto yy142; + if (yych == 'K') goto yy491; + if (yych != 'k') goto yy150; yy491: YYDEBUG(491, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy492; - if (yych != 'e') goto yy150; -yy492: - YYDEBUG(492, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'A') goto yy493; - if (yych != 'a') goto yy150; -yy493: - YYDEBUG(493, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'K') goto yy494; - if (yych != 'k') goto yy150; -yy494: - YYDEBUG(494, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(495, *YYCURSOR); + YYDEBUG(492, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1246 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_BREAK); } -#line 5198 "Zend/zend_language_scanner.c" -yy496: - YYDEBUG(496, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == '<') goto yy219; - goto yy157; -yy497: - YYDEBUG(497, *YYCURSOR); +#line 5160 "Zend/zend_language_scanner.c" +yy493: + YYDEBUG(493, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy504; - if (yych == 'a') goto yy504; + if (yych == 'A') goto yy500; + if (yych == 'a') goto yy500; goto yy150; -yy498: - YYDEBUG(498, *YYCURSOR); +yy494: + YYDEBUG(494, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy499; + if (yych == 'I') goto yy495; if (yych != 'i') goto yy150; -yy499: - YYDEBUG(499, *YYCURSOR); +yy495: + YYDEBUG(495, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy500; + if (yych == 'T') goto yy496; if (yych != 't') goto yy150; -yy500: - YYDEBUG(500, *YYCURSOR); +yy496: + YYDEBUG(496, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy501; + if (yych == 'C') goto yy497; if (yych != 'c') goto yy150; -yy501: - YYDEBUG(501, *YYCURSOR); +yy497: + YYDEBUG(497, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy502; + if (yych == 'H') goto yy498; if (yych != 'h') goto yy150; -yy502: - YYDEBUG(502, *YYCURSOR); +yy498: + YYDEBUG(498, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(503, *YYCURSOR); + YYDEBUG(499, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1230 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_SWITCH); } -#line 5242 "Zend/zend_language_scanner.c" -yy504: - YYDEBUG(504, *YYCURSOR); +#line 5199 "Zend/zend_language_scanner.c" +yy500: + YYDEBUG(500, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy505; + if (yych == 'T') goto yy501; if (yych != 't') goto yy150; -yy505: - YYDEBUG(505, *YYCURSOR); +yy501: + YYDEBUG(501, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy506; + if (yych == 'I') goto yy502; if (yych != 'i') goto yy150; -yy506: - YYDEBUG(506, *YYCURSOR); +yy502: + YYDEBUG(502, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy507; + if (yych == 'C') goto yy503; if (yych != 'c') goto yy150; -yy507: - YYDEBUG(507, *YYCURSOR); +yy503: + YYDEBUG(503, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(508, *YYCURSOR); + YYDEBUG(504, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1416 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_STATIC); } -#line 5270 "Zend/zend_language_scanner.c" -yy509: - YYDEBUG(509, *YYCURSOR); +#line 5227 "Zend/zend_language_scanner.c" +yy505: + YYDEBUG(505, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy520; - if (yych == 's') goto yy520; + if (yych == 'S') goto yy516; + if (yych == 's') goto yy516; goto yy150; -yy510: - YYDEBUG(510, *YYCURSOR); +yy506: + YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy518; - if (yych == 'd') goto yy518; + if (yych == 'D') goto yy514; + if (yych == 'd') goto yy514; goto yy150; -yy511: - YYDEBUG(511, *YYCURSOR); +yy507: + YYDEBUG(507, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy514; - if (yych == 'r') goto yy514; + if (yych == 'R') goto yy510; + if (yych == 'r') goto yy510; goto yy150; -yy512: - YYDEBUG(512, *YYCURSOR); +yy508: + YYDEBUG(508, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(513, *YYCURSOR); + YYDEBUG(509, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1226 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_AS); } -#line 5301 "Zend/zend_language_scanner.c" -yy514: - YYDEBUG(514, *YYCURSOR); +#line 5258 "Zend/zend_language_scanner.c" +yy510: + YYDEBUG(510, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy515; + if (yych == 'A') goto yy511; if (yych != 'a') goto yy150; -yy515: - YYDEBUG(515, *YYCURSOR); +yy511: + YYDEBUG(511, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy516; + if (yych == 'Y') goto yy512; if (yych != 'y') goto yy150; -yy516: - YYDEBUG(516, *YYCURSOR); +yy512: + YYDEBUG(512, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(517, *YYCURSOR); + YYDEBUG(513, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1452 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ARRAY); } -#line 5324 "Zend/zend_language_scanner.c" -yy518: - YYDEBUG(518, *YYCURSOR); +#line 5281 "Zend/zend_language_scanner.c" +yy514: + YYDEBUG(514, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(519, *YYCURSOR); + YYDEBUG(515, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1560 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_LOGICAL_AND); } -#line 5337 "Zend/zend_language_scanner.c" -yy520: - YYDEBUG(520, *YYCURSOR); +#line 5294 "Zend/zend_language_scanner.c" +yy516: + YYDEBUG(516, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy521; + if (yych == 'T') goto yy517; if (yych != 't') goto yy150; -yy521: - YYDEBUG(521, *YYCURSOR); +yy517: + YYDEBUG(517, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy522; + if (yych == 'R') goto yy518; if (yych != 'r') goto yy150; -yy522: - YYDEBUG(522, *YYCURSOR); +yy518: + YYDEBUG(518, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy523; + if (yych == 'A') goto yy519; if (yych != 'a') goto yy150; -yy523: - YYDEBUG(523, *YYCURSOR); +yy519: + YYDEBUG(519, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy524; + if (yych == 'C') goto yy520; if (yych != 'c') goto yy150; -yy524: - YYDEBUG(524, *YYCURSOR); +yy520: + YYDEBUG(520, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy525; + if (yych == 'T') goto yy521; if (yych != 't') goto yy150; -yy525: - YYDEBUG(525, *YYCURSOR); +yy521: + YYDEBUG(521, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(526, *YYCURSOR); + YYDEBUG(522, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1420 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ABSTRACT); } -#line 5375 "Zend/zend_language_scanner.c" -yy527: - YYDEBUG(527, *YYCURSOR); +#line 5332 "Zend/zend_language_scanner.c" +yy523: + YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy528; + if (yych == 'I') goto yy524; if (yych != 'i') goto yy150; -yy528: - YYDEBUG(528, *YYCURSOR); +yy524: + YYDEBUG(524, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy529; + if (yych == 'L') goto yy525; if (yych != 'l') goto yy150; -yy529: - YYDEBUG(529, *YYCURSOR); +yy525: + YYDEBUG(525, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy530; + if (yych == 'E') goto yy526; if (yych != 'e') goto yy150; -yy530: - YYDEBUG(530, *YYCURSOR); +yy526: + YYDEBUG(526, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(531, *YYCURSOR); + YYDEBUG(527, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1186 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_WHILE); } -#line 5403 "Zend/zend_language_scanner.c" -yy532: - YYDEBUG(532, *YYCURSOR); +#line 5360 "Zend/zend_language_scanner.c" +yy528: + YYDEBUG(528, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(533, *YYCURSOR); + YYDEBUG(529, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1170 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_IF); } -#line 5416 "Zend/zend_language_scanner.c" -yy534: - YYDEBUG(534, *YYCURSOR); +#line 5373 "Zend/zend_language_scanner.c" +yy530: + YYDEBUG(530, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy576; - if (yych == 'p') goto yy576; + if (yych == 'P') goto yy572; + if (yych == 'p') goto yy572; goto yy150; -yy535: - YYDEBUG(535, *YYCURSOR); +yy531: + YYDEBUG(531, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'C') { if (yych <= 'B') goto yy150; - goto yy543; + goto yy539; } else { if (yych <= 'R') goto yy150; - if (yych <= 'S') goto yy541; - goto yy542; + if (yych <= 'S') goto yy537; + goto yy538; } } else { if (yych <= 'r') { - if (yych == 'c') goto yy543; + if (yych == 'c') goto yy539; goto yy150; } else { - if (yych <= 's') goto yy541; - if (yych <= 't') goto yy542; + if (yych <= 's') goto yy537; + if (yych <= 't') goto yy538; goto yy150; } } -yy536: - YYDEBUG(536, *YYCURSOR); +yy532: + YYDEBUG(532, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy537; + if (yych == 'S') goto yy533; if (yych != 's') goto yy150; -yy537: - YYDEBUG(537, *YYCURSOR); +yy533: + YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy538; + if (yych == 'E') goto yy534; if (yych != 'e') goto yy150; -yy538: - YYDEBUG(538, *YYCURSOR); +yy534: + YYDEBUG(534, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy539; + if (yych == 'T') goto yy535; if (yych != 't') goto yy150; -yy539: - YYDEBUG(539, *YYCURSOR); +yy535: + YYDEBUG(535, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(540, *YYCURSOR); + YYDEBUG(536, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1404 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ISSET); } -#line 5472 "Zend/zend_language_scanner.c" -yy541: - YYDEBUG(541, *YYCURSOR); +#line 5429 "Zend/zend_language_scanner.c" +yy537: + YYDEBUG(537, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy562; - if (yych == 't') goto yy562; + if (yych == 'T') goto yy558; + if (yych == 't') goto yy558; goto yy150; -yy542: - YYDEBUG(542, *YYCURSOR); +yy538: + YYDEBUG(538, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy555; - if (yych == 'e') goto yy555; + if (yych == 'E') goto yy551; + if (yych == 'e') goto yy551; goto yy150; -yy543: - YYDEBUG(543, *YYCURSOR); +yy539: + YYDEBUG(539, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy544; + if (yych == 'L') goto yy540; if (yych != 'l') goto yy150; -yy544: - YYDEBUG(544, *YYCURSOR); +yy540: + YYDEBUG(540, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy545; + if (yych == 'U') goto yy541; if (yych != 'u') goto yy150; -yy545: - YYDEBUG(545, *YYCURSOR); +yy541: + YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy546; + if (yych == 'D') goto yy542; if (yych != 'd') goto yy150; -yy546: - YYDEBUG(546, *YYCURSOR); +yy542: + YYDEBUG(542, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy547; + if (yych == 'E') goto yy543; if (yych != 'e') goto yy150; -yy547: - YYDEBUG(547, *YYCURSOR); +yy543: + YYDEBUG(543, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '9') { if (yych >= '0') goto yy149; } else { - if (yych <= '@') goto yy548; + if (yych <= '@') goto yy544; if (yych <= 'Z') goto yy149; } } else { if (yych <= '`') { - if (yych <= '_') goto yy549; + if (yych <= '_') goto yy545; } else { if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy548: - YYDEBUG(548, *YYCURSOR); +yy544: + YYDEBUG(544, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1372 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INCLUDE); } -#line 5530 "Zend/zend_language_scanner.c" -yy549: - YYDEBUG(549, *YYCURSOR); +#line 5487 "Zend/zend_language_scanner.c" +yy545: + YYDEBUG(545, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy550; + if (yych == 'O') goto yy546; if (yych != 'o') goto yy150; -yy550: - YYDEBUG(550, *YYCURSOR); +yy546: + YYDEBUG(546, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy551; + if (yych == 'N') goto yy547; if (yych != 'n') goto yy150; -yy551: - YYDEBUG(551, *YYCURSOR); +yy547: + YYDEBUG(547, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy552; + if (yych == 'C') goto yy548; if (yych != 'c') goto yy150; -yy552: - YYDEBUG(552, *YYCURSOR); +yy548: + YYDEBUG(548, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy553; + if (yych == 'E') goto yy549; if (yych != 'e') goto yy150; -yy553: - YYDEBUG(553, *YYCURSOR); +yy549: + YYDEBUG(549, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(554, *YYCURSOR); + YYDEBUG(550, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1376 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INCLUDE_ONCE); } -#line 5563 "Zend/zend_language_scanner.c" -yy555: - YYDEBUG(555, *YYCURSOR); +#line 5520 "Zend/zend_language_scanner.c" +yy551: + YYDEBUG(551, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy556; + if (yych == 'R') goto yy552; if (yych != 'r') goto yy150; -yy556: - YYDEBUG(556, *YYCURSOR); +yy552: + YYDEBUG(552, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy557; + if (yych == 'F') goto yy553; if (yych != 'f') goto yy150; -yy557: - YYDEBUG(557, *YYCURSOR); +yy553: + YYDEBUG(553, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy558; + if (yych == 'A') goto yy554; if (yych != 'a') goto yy150; -yy558: - YYDEBUG(558, *YYCURSOR); +yy554: + YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy559; + if (yych == 'C') goto yy555; if (yych != 'c') goto yy150; -yy559: - YYDEBUG(559, *YYCURSOR); +yy555: + YYDEBUG(555, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy560; + if (yych == 'E') goto yy556; if (yych != 'e') goto yy150; -yy560: - YYDEBUG(560, *YYCURSOR); +yy556: + YYDEBUG(556, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(561, *YYCURSOR); + YYDEBUG(557, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1270 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INTERFACE); } -#line 5601 "Zend/zend_language_scanner.c" -yy562: - YYDEBUG(562, *YYCURSOR); +#line 5558 "Zend/zend_language_scanner.c" +yy558: + YYDEBUG(558, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { - if (yych == 'A') goto yy563; + if (yych == 'A') goto yy559; if (yych <= 'D') goto yy150; - goto yy564; + goto yy560; } else { if (yych <= 'a') { if (yych <= '`') goto yy150; } else { - if (yych == 'e') goto yy564; + if (yych == 'e') goto yy560; goto yy150; } } -yy563: - YYDEBUG(563, *YYCURSOR); +yy559: + YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy570; - if (yych == 'n') goto yy570; + if (yych == 'N') goto yy566; + if (yych == 'n') goto yy566; goto yy150; -yy564: - YYDEBUG(564, *YYCURSOR); +yy560: + YYDEBUG(560, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy565; + if (yych == 'A') goto yy561; if (yych != 'a') goto yy150; -yy565: - YYDEBUG(565, *YYCURSOR); +yy561: + YYDEBUG(561, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy566; + if (yych == 'D') goto yy562; if (yych != 'd') goto yy150; -yy566: - YYDEBUG(566, *YYCURSOR); +yy562: + YYDEBUG(562, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy567; + if (yych == 'O') goto yy563; if (yych != 'o') goto yy150; -yy567: - YYDEBUG(567, *YYCURSOR); +yy563: + YYDEBUG(563, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy568; + if (yych == 'F') goto yy564; if (yych != 'f') goto yy150; -yy568: - YYDEBUG(568, *YYCURSOR); +yy564: + YYDEBUG(564, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(569, *YYCURSOR); + YYDEBUG(565, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1396 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INSTEADOF); } -#line 5655 "Zend/zend_language_scanner.c" -yy570: - YYDEBUG(570, *YYCURSOR); +#line 5612 "Zend/zend_language_scanner.c" +yy566: + YYDEBUG(566, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy571; + if (yych == 'C') goto yy567; if (yych != 'c') goto yy150; -yy571: - YYDEBUG(571, *YYCURSOR); +yy567: + YYDEBUG(567, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy572; + if (yych == 'E') goto yy568; if (yych != 'e') goto yy150; -yy572: - YYDEBUG(572, *YYCURSOR); +yy568: + YYDEBUG(568, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy573; + if (yych == 'O') goto yy569; if (yych != 'o') goto yy150; -yy573: - YYDEBUG(573, *YYCURSOR); +yy569: + YYDEBUG(569, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy574; + if (yych == 'F') goto yy570; if (yych != 'f') goto yy150; -yy574: - YYDEBUG(574, *YYCURSOR); +yy570: + YYDEBUG(570, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(575, *YYCURSOR); + YYDEBUG(571, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1222 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INSTANCEOF); } -#line 5688 "Zend/zend_language_scanner.c" -yy576: - YYDEBUG(576, *YYCURSOR); +#line 5645 "Zend/zend_language_scanner.c" +yy572: + YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy577; + if (yych == 'L') goto yy573; if (yych != 'l') goto yy150; -yy577: - YYDEBUG(577, *YYCURSOR); +yy573: + YYDEBUG(573, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy578; + if (yych == 'E') goto yy574; if (yych != 'e') goto yy150; -yy578: - YYDEBUG(578, *YYCURSOR); +yy574: + YYDEBUG(574, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy579; + if (yych == 'M') goto yy575; if (yych != 'm') goto yy150; -yy579: - YYDEBUG(579, *YYCURSOR); +yy575: + YYDEBUG(575, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy580; + if (yych == 'E') goto yy576; if (yych != 'e') goto yy150; -yy580: - YYDEBUG(580, *YYCURSOR); +yy576: + YYDEBUG(576, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy581; + if (yych == 'N') goto yy577; if (yych != 'n') goto yy150; -yy581: - YYDEBUG(581, *YYCURSOR); +yy577: + YYDEBUG(577, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy582; + if (yych == 'T') goto yy578; if (yych != 't') goto yy150; -yy582: - YYDEBUG(582, *YYCURSOR); +yy578: + YYDEBUG(578, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy583; + if (yych == 'S') goto yy579; if (yych != 's') goto yy150; -yy583: - YYDEBUG(583, *YYCURSOR); +yy579: + YYDEBUG(579, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(584, *YYCURSOR); + YYDEBUG(580, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1282 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_IMPLEMENTS); } -#line 5736 "Zend/zend_language_scanner.c" -yy585: - YYDEBUG(585, *YYCURSOR); +#line 5693 "Zend/zend_language_scanner.c" +yy581: + YYDEBUG(581, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy593; - if (yych == 'r') goto yy593; + if (yych == 'R') goto yy589; + if (yych == 'r') goto yy589; goto yy150; -yy586: - YYDEBUG(586, *YYCURSOR); +yy582: + YYDEBUG(582, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'A') goto yy589; + if (yych == 'A') goto yy585; if (yych <= 'X') goto yy150; } else { if (yych <= 'a') { if (yych <= '`') goto yy150; - goto yy589; + goto yy585; } else { if (yych != 'y') goto yy150; } } - YYDEBUG(587, *YYCURSOR); + YYDEBUG(583, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(588, *YYCURSOR); + YYDEBUG(584, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1154 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_TRY); } -#line 5768 "Zend/zend_language_scanner.c" -yy589: - YYDEBUG(589, *YYCURSOR); +#line 5725 "Zend/zend_language_scanner.c" +yy585: + YYDEBUG(585, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy590; + if (yych == 'I') goto yy586; if (yych != 'i') goto yy150; -yy590: - YYDEBUG(590, *YYCURSOR); +yy586: + YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy591; + if (yych == 'T') goto yy587; if (yych != 't') goto yy150; -yy591: - YYDEBUG(591, *YYCURSOR); +yy587: + YYDEBUG(587, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(592, *YYCURSOR); + YYDEBUG(588, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1274 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_TRAIT); } -#line 5791 "Zend/zend_language_scanner.c" -yy593: - YYDEBUG(593, *YYCURSOR); +#line 5748 "Zend/zend_language_scanner.c" +yy589: + YYDEBUG(589, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy594; + if (yych == 'O') goto yy590; if (yych != 'o') goto yy150; -yy594: - YYDEBUG(594, *YYCURSOR); +yy590: + YYDEBUG(590, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'W') goto yy595; + if (yych == 'W') goto yy591; if (yych != 'w') goto yy150; -yy595: - YYDEBUG(595, *YYCURSOR); +yy591: + YYDEBUG(591, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(596, *YYCURSOR); + YYDEBUG(592, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1166 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_THROW); } -#line 5814 "Zend/zend_language_scanner.c" -yy597: - YYDEBUG(597, *YYCURSOR); +#line 5771 "Zend/zend_language_scanner.c" +yy593: + YYDEBUG(593, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy598; + if (yych == 'E') goto yy594; if (yych != 'e') goto yy150; -yy598: - YYDEBUG(598, *YYCURSOR); +yy594: + YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy599; + if (yych == 'L') goto yy595; if (yych != 'l') goto yy150; -yy599: - YYDEBUG(599, *YYCURSOR); +yy595: + YYDEBUG(595, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy600; + if (yych == 'D') goto yy596; if (yych != 'd') goto yy150; -yy600: - YYDEBUG(600, *YYCURSOR); - yyaccept = 6; +yy596: + YYDEBUG(596, *YYCURSOR); + yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 4) { goto yy149; } if (yych <= '\f') { - if (yych <= 0x08) goto yy601; - if (yych <= '\n') goto yy602; + if (yych <= 0x08) goto yy597; + if (yych <= '\n') goto yy598; } else { - if (yych <= '\r') goto yy602; - if (yych == ' ') goto yy602; + if (yych <= '\r') goto yy598; + if (yych == ' ') goto yy598; } -yy601: - YYDEBUG(601, *YYCURSOR); +yy597: + YYDEBUG(597, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1150 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_YIELD); } -#line 5851 "Zend/zend_language_scanner.c" -yy602: - YYDEBUG(602, *YYCURSOR); +#line 5808 "Zend/zend_language_scanner.c" +yy598: + YYDEBUG(598, *YYCURSOR); ++YYCURSOR; YYFILL(4); yych = *YYCURSOR; - YYDEBUG(603, *YYCURSOR); + YYDEBUG(599, *YYCURSOR); if (yych <= 0x1F) { if (yych <= '\n') { if (yych <= 0x08) goto yy157; - goto yy602; + goto yy598; } else { - if (yych == '\r') goto yy602; + if (yych == '\r') goto yy598; goto yy157; } } else { if (yych <= 'F') { - if (yych <= ' ') goto yy602; + if (yych <= ' ') goto yy598; if (yych <= 'E') goto yy157; } else { if (yych != 'f') goto yy157; } } - YYDEBUG(604, *YYCURSOR); + YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy605; + if (yych == 'R') goto yy601; if (yych != 'r') goto yy157; -yy605: - YYDEBUG(605, *YYCURSOR); +yy601: + YYDEBUG(601, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy606; + if (yych == 'O') goto yy602; if (yych != 'o') goto yy157; -yy606: - YYDEBUG(606, *YYCURSOR); +yy602: + YYDEBUG(602, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy607; + if (yych == 'M') goto yy603; if (yych != 'm') goto yy157; -yy607: - YYDEBUG(607, *YYCURSOR); +yy603: + YYDEBUG(603, *YYCURSOR); ++YYCURSOR; - YYDEBUG(608, *YYCURSOR); + YYDEBUG(604, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1145 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); RETURN_TOKEN(T_YIELD_FROM); } -#line 5898 "Zend/zend_language_scanner.c" -yy609: - YYDEBUG(609, *YYCURSOR); +#line 5855 "Zend/zend_language_scanner.c" +yy605: + YYDEBUG(605, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { - if (yych == 'Q') goto yy611; + if (yych == 'Q') goto yy607; if (yych <= 'S') goto yy150; } else { if (yych <= 'q') { if (yych <= 'p') goto yy150; - goto yy611; + goto yy607; } else { if (yych != 't') goto yy150; } } - YYDEBUG(610, *YYCURSOR); + YYDEBUG(606, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy623; - if (yych == 'u') goto yy623; + if (yych == 'U') goto yy619; + if (yych == 'u') goto yy619; goto yy150; -yy611: - YYDEBUG(611, *YYCURSOR); +yy607: + YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy612; + if (yych == 'U') goto yy608; if (yych != 'u') goto yy150; -yy612: - YYDEBUG(612, *YYCURSOR); +yy608: + YYDEBUG(608, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy613; + if (yych == 'I') goto yy609; if (yych != 'i') goto yy150; -yy613: - YYDEBUG(613, *YYCURSOR); +yy609: + YYDEBUG(609, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy614; + if (yych == 'R') goto yy610; if (yych != 'r') goto yy150; -yy614: - YYDEBUG(614, *YYCURSOR); +yy610: + YYDEBUG(610, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy615; + if (yych == 'E') goto yy611; if (yych != 'e') goto yy150; -yy615: - YYDEBUG(615, *YYCURSOR); +yy611: + YYDEBUG(611, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '9') { if (yych >= '0') goto yy149; } else { - if (yych <= '@') goto yy616; + if (yych <= '@') goto yy612; if (yych <= 'Z') goto yy149; } } else { if (yych <= '`') { - if (yych <= '_') goto yy617; + if (yych <= '_') goto yy613; } else { if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy616: - YYDEBUG(616, *YYCURSOR); +yy612: + YYDEBUG(612, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1380 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_REQUIRE); } -#line 5963 "Zend/zend_language_scanner.c" -yy617: - YYDEBUG(617, *YYCURSOR); +#line 5920 "Zend/zend_language_scanner.c" +yy613: + YYDEBUG(613, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy618; + if (yych == 'O') goto yy614; if (yych != 'o') goto yy150; -yy618: - YYDEBUG(618, *YYCURSOR); +yy614: + YYDEBUG(614, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy619; + if (yych == 'N') goto yy615; if (yych != 'n') goto yy150; -yy619: - YYDEBUG(619, *YYCURSOR); +yy615: + YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy620; + if (yych == 'C') goto yy616; if (yych != 'c') goto yy150; -yy620: - YYDEBUG(620, *YYCURSOR); +yy616: + YYDEBUG(616, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy621; + if (yych == 'E') goto yy617; if (yych != 'e') goto yy150; -yy621: - YYDEBUG(621, *YYCURSOR); +yy617: + YYDEBUG(617, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(622, *YYCURSOR); + YYDEBUG(618, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1384 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_REQUIRE_ONCE); } -#line 5996 "Zend/zend_language_scanner.c" -yy623: - YYDEBUG(623, *YYCURSOR); +#line 5953 "Zend/zend_language_scanner.c" +yy619: + YYDEBUG(619, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy624; + if (yych == 'R') goto yy620; if (yych != 'r') goto yy150; -yy624: - YYDEBUG(624, *YYCURSOR); +yy620: + YYDEBUG(620, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy625; + if (yych == 'N') goto yy621; if (yych != 'n') goto yy150; -yy625: - YYDEBUG(625, *YYCURSOR); +yy621: + YYDEBUG(621, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(626, *YYCURSOR); + YYDEBUG(622, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1141 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_RETURN); } -#line 6019 "Zend/zend_language_scanner.c" -yy627: - YYDEBUG(627, *YYCURSOR); +#line 5976 "Zend/zend_language_scanner.c" +yy623: + YYDEBUG(623, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'L') { if (yych <= 'K') goto yy150; - goto yy650; + goto yy646; } else { if (yych <= 'R') goto yy150; - if (yych <= 'S') goto yy649; - goto yy648; + if (yych <= 'S') goto yy645; + goto yy644; } } else { if (yych <= 'r') { - if (yych == 'l') goto yy650; + if (yych == 'l') goto yy646; goto yy150; } else { - if (yych <= 's') goto yy649; - if (yych <= 't') goto yy648; + if (yych <= 's') goto yy645; + if (yych <= 't') goto yy644; goto yy150; } } -yy628: - YYDEBUG(628, *YYCURSOR); +yy624: + YYDEBUG(624, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { - if (yych == 'A') goto yy640; + if (yych == 'A') goto yy636; if (yych <= 'N') goto yy150; - goto yy641; + goto yy637; } else { if (yych <= 'a') { if (yych <= '`') goto yy150; - goto yy640; + goto yy636; } else { - if (yych == 'o') goto yy641; + if (yych == 'o') goto yy637; goto yy150; } } -yy629: - YYDEBUG(629, *YYCURSOR); +yy625: + YYDEBUG(625, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy630; + if (yych == 'N') goto yy626; if (yych != 'n') goto yy150; -yy630: - YYDEBUG(630, *YYCURSOR); +yy626: + YYDEBUG(626, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'R') goto yy150; - if (yych >= 'T') goto yy632; + if (yych >= 'T') goto yy628; } else { if (yych <= 'r') goto yy150; - if (yych <= 's') goto yy631; - if (yych <= 't') goto yy632; + if (yych <= 's') goto yy627; + if (yych <= 't') goto yy628; goto yy150; } -yy631: - YYDEBUG(631, *YYCURSOR); +yy627: + YYDEBUG(627, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy638; - if (yych == 't') goto yy638; + if (yych == 'T') goto yy634; + if (yych == 't') goto yy634; goto yy150; -yy632: - YYDEBUG(632, *YYCURSOR); +yy628: + YYDEBUG(628, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy633; + if (yych == 'I') goto yy629; if (yych != 'i') goto yy150; -yy633: - YYDEBUG(633, *YYCURSOR); +yy629: + YYDEBUG(629, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy634; + if (yych == 'N') goto yy630; if (yych != 'n') goto yy150; -yy634: - YYDEBUG(634, *YYCURSOR); +yy630: + YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy635; + if (yych == 'U') goto yy631; if (yych != 'u') goto yy150; -yy635: - YYDEBUG(635, *YYCURSOR); +yy631: + YYDEBUG(631, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy636; + if (yych == 'E') goto yy632; if (yych != 'e') goto yy150; -yy636: - YYDEBUG(636, *YYCURSOR); +yy632: + YYDEBUG(632, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(637, *YYCURSOR); + YYDEBUG(633, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1250 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CONTINUE); } -#line 6113 "Zend/zend_language_scanner.c" -yy638: - YYDEBUG(638, *YYCURSOR); +#line 6070 "Zend/zend_language_scanner.c" +yy634: + YYDEBUG(634, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(639, *YYCURSOR); + YYDEBUG(635, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1137 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CONST); } -#line 6126 "Zend/zend_language_scanner.c" -yy640: - YYDEBUG(640, *YYCURSOR); +#line 6083 "Zend/zend_language_scanner.c" +yy636: + YYDEBUG(636, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy645; - if (yych == 's') goto yy645; + if (yych == 'S') goto yy641; + if (yych == 's') goto yy641; goto yy150; -yy641: - YYDEBUG(641, *YYCURSOR); +yy637: + YYDEBUG(637, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy642; + if (yych == 'N') goto yy638; if (yych != 'n') goto yy150; -yy642: - YYDEBUG(642, *YYCURSOR); +yy638: + YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy643; + if (yych == 'E') goto yy639; if (yych != 'e') goto yy150; -yy643: - YYDEBUG(643, *YYCURSOR); +yy639: + YYDEBUG(639, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(644, *YYCURSOR); + YYDEBUG(640, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1332 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CLONE); } -#line 6155 "Zend/zend_language_scanner.c" -yy645: - YYDEBUG(645, *YYCURSOR); +#line 6112 "Zend/zend_language_scanner.c" +yy641: + YYDEBUG(641, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy646; + if (yych == 'S') goto yy642; if (yych != 's') goto yy150; -yy646: - YYDEBUG(646, *YYCURSOR); +yy642: + YYDEBUG(642, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(647, *YYCURSOR); + YYDEBUG(643, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1266 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CLASS); } -#line 6173 "Zend/zend_language_scanner.c" -yy648: - YYDEBUG(648, *YYCURSOR); +#line 6130 "Zend/zend_language_scanner.c" +yy644: + YYDEBUG(644, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy659; - if (yych == 'c') goto yy659; + if (yych == 'C') goto yy655; + if (yych == 'c') goto yy655; goto yy150; -yy649: - YYDEBUG(649, *YYCURSOR); +yy645: + YYDEBUG(645, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy657; - if (yych == 'e') goto yy657; + if (yych == 'E') goto yy653; + if (yych == 'e') goto yy653; goto yy150; -yy650: - YYDEBUG(650, *YYCURSOR); +yy646: + YYDEBUG(646, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy651; + if (yych == 'L') goto yy647; if (yych != 'l') goto yy150; -yy651: - YYDEBUG(651, *YYCURSOR); +yy647: + YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy652; + if (yych == 'A') goto yy648; if (yych != 'a') goto yy150; -yy652: - YYDEBUG(652, *YYCURSOR); +yy648: + YYDEBUG(648, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy653; + if (yych == 'B') goto yy649; if (yych != 'b') goto yy150; -yy653: - YYDEBUG(653, *YYCURSOR); +yy649: + YYDEBUG(649, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy654; + if (yych == 'L') goto yy650; if (yych != 'l') goto yy150; -yy654: - YYDEBUG(654, *YYCURSOR); +yy650: + YYDEBUG(650, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy655; + if (yych == 'E') goto yy651; if (yych != 'e') goto yy150; -yy655: - YYDEBUG(655, *YYCURSOR); +yy651: + YYDEBUG(651, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(656, *YYCURSOR); + YYDEBUG(652, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1456 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CALLABLE); } -#line 6223 "Zend/zend_language_scanner.c" -yy657: - YYDEBUG(657, *YYCURSOR); +#line 6180 "Zend/zend_language_scanner.c" +yy653: + YYDEBUG(653, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(658, *YYCURSOR); + YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1238 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CASE); } -#line 6236 "Zend/zend_language_scanner.c" -yy659: - YYDEBUG(659, *YYCURSOR); +#line 6193 "Zend/zend_language_scanner.c" +yy655: + YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy660; + if (yych == 'H') goto yy656; if (yych != 'h') goto yy150; -yy660: - YYDEBUG(660, *YYCURSOR); +yy656: + YYDEBUG(656, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(661, *YYCURSOR); + YYDEBUG(657, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1158 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CATCH); } -#line 6254 "Zend/zend_language_scanner.c" -yy662: - YYDEBUG(662, *YYCURSOR); +#line 6211 "Zend/zend_language_scanner.c" +yy658: + YYDEBUG(658, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy679; - if (yych == 'n') goto yy679; + if (yych == 'N') goto yy675; + if (yych == 'n') goto yy675; goto yy150; -yy663: - YYDEBUG(663, *YYCURSOR); +yy659: + YYDEBUG(659, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy672; - if (yych == 'r') goto yy672; + if (yych == 'R') goto yy668; + if (yych == 'r') goto yy668; goto yy150; -yy664: - YYDEBUG(664, *YYCURSOR); +yy660: + YYDEBUG(660, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy665; + if (yych == 'N') goto yy661; if (yych != 'n') goto yy150; -yy665: - YYDEBUG(665, *YYCURSOR); +yy661: + YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy666; + if (yych == 'C') goto yy662; if (yych != 'c') goto yy150; -yy666: - YYDEBUG(666, *YYCURSOR); +yy662: + YYDEBUG(662, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy667; + if (yych == 'T') goto yy663; if (yych != 't') goto yy150; -yy667: - YYDEBUG(667, *YYCURSOR); +yy663: + YYDEBUG(663, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy668; + if (yych == 'I') goto yy664; if (yych != 'i') goto yy150; -yy668: - YYDEBUG(668, *YYCURSOR); +yy664: + YYDEBUG(664, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy669; + if (yych == 'O') goto yy665; if (yych != 'o') goto yy150; -yy669: - YYDEBUG(669, *YYCURSOR); +yy665: + YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy670; + if (yych == 'N') goto yy666; if (yych != 'n') goto yy150; -yy670: - YYDEBUG(670, *YYCURSOR); +yy666: + YYDEBUG(666, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(671, *YYCURSOR); + YYDEBUG(667, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1133 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FUNCTION); } -#line 6309 "Zend/zend_language_scanner.c" -yy672: - YYDEBUG(672, *YYCURSOR); +#line 6266 "Zend/zend_language_scanner.c" +yy668: + YYDEBUG(668, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy673; + if (yych <= '/') goto yy669; if (yych <= '9') goto yy149; } else { - if (yych == 'E') goto yy674; + if (yych == 'E') goto yy670; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'd') { if (yych != '`') goto yy149; } else { - if (yych <= 'e') goto yy674; + if (yych <= 'e') goto yy670; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy673: - YYDEBUG(673, *YYCURSOR); +yy669: + YYDEBUG(669, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1198 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FOR); } -#line 6337 "Zend/zend_language_scanner.c" -yy674: - YYDEBUG(674, *YYCURSOR); +#line 6294 "Zend/zend_language_scanner.c" +yy670: + YYDEBUG(670, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy675; + if (yych == 'A') goto yy671; if (yych != 'a') goto yy150; -yy675: - YYDEBUG(675, *YYCURSOR); +yy671: + YYDEBUG(671, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy676; + if (yych == 'C') goto yy672; if (yych != 'c') goto yy150; -yy676: - YYDEBUG(676, *YYCURSOR); +yy672: + YYDEBUG(672, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy677; + if (yych == 'H') goto yy673; if (yych != 'h') goto yy150; -yy677: - YYDEBUG(677, *YYCURSOR); +yy673: + YYDEBUG(673, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(678, *YYCURSOR); + YYDEBUG(674, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1206 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FOREACH); } -#line 6365 "Zend/zend_language_scanner.c" -yy679: - YYDEBUG(679, *YYCURSOR); +#line 6322 "Zend/zend_language_scanner.c" +yy675: + YYDEBUG(675, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy680; + if (yych == 'A') goto yy676; if (yych != 'a') goto yy150; -yy680: - YYDEBUG(680, *YYCURSOR); +yy676: + YYDEBUG(676, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy681; + if (yych == 'L') goto yy677; if (yych != 'l') goto yy150; -yy681: - YYDEBUG(681, *YYCURSOR); +yy677: + YYDEBUG(677, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy682; + if (yych <= '/') goto yy678; if (yych <= '9') goto yy149; } else { - if (yych == 'L') goto yy683; + if (yych == 'L') goto yy679; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'k') { if (yych != '`') goto yy149; } else { - if (yych <= 'l') goto yy683; + if (yych <= 'l') goto yy679; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy682: - YYDEBUG(682, *YYCURSOR); +yy678: + YYDEBUG(678, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1424 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FINAL); } -#line 6403 "Zend/zend_language_scanner.c" -yy683: - YYDEBUG(683, *YYCURSOR); +#line 6360 "Zend/zend_language_scanner.c" +yy679: + YYDEBUG(679, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy684; + if (yych == 'Y') goto yy680; if (yych != 'y') goto yy150; -yy684: - YYDEBUG(684, *YYCURSOR); +yy680: + YYDEBUG(680, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(685, *YYCURSOR); + YYDEBUG(681, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1162 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FINALLY); } -#line 6421 "Zend/zend_language_scanner.c" -yy686: - YYDEBUG(686, *YYCURSOR); +#line 6378 "Zend/zend_language_scanner.c" +yy682: + YYDEBUG(682, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'F') { - if (yych == 'C') goto yy692; + if (yych == 'C') goto yy688; if (yych <= 'E') goto yy150; - goto yy693; + goto yy689; } else { if (yych <= 'c') { if (yych <= 'b') goto yy150; - goto yy692; + goto yy688; } else { - if (yych == 'f') goto yy693; + if (yych == 'f') goto yy689; goto yy150; } } -yy687: - YYDEBUG(687, *YYCURSOR); +yy683: + YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy690; - if (yych == 'e') goto yy690; + if (yych == 'E') goto yy686; + if (yych == 'e') goto yy686; goto yy150; -yy688: - YYDEBUG(688, *YYCURSOR); +yy684: + YYDEBUG(684, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(689, *YYCURSOR); + YYDEBUG(685, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1194 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_DO); } -#line 6456 "Zend/zend_language_scanner.c" -yy690: - YYDEBUG(690, *YYCURSOR); +#line 6413 "Zend/zend_language_scanner.c" +yy686: + YYDEBUG(686, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(691, *YYCURSOR); + YYDEBUG(687, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1129 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EXIT); } -#line 6469 "Zend/zend_language_scanner.c" -yy692: - YYDEBUG(692, *YYCURSOR); +#line 6426 "Zend/zend_language_scanner.c" +yy688: + YYDEBUG(688, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy699; - if (yych == 'l') goto yy699; + if (yych == 'L') goto yy695; + if (yych == 'l') goto yy695; goto yy150; -yy693: - YYDEBUG(693, *YYCURSOR); +yy689: + YYDEBUG(689, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy694; + if (yych == 'A') goto yy690; if (yych != 'a') goto yy150; -yy694: - YYDEBUG(694, *YYCURSOR); +yy690: + YYDEBUG(690, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy695; + if (yych == 'U') goto yy691; if (yych != 'u') goto yy150; -yy695: - YYDEBUG(695, *YYCURSOR); +yy691: + YYDEBUG(691, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy696; + if (yych == 'L') goto yy692; if (yych != 'l') goto yy150; -yy696: - YYDEBUG(696, *YYCURSOR); +yy692: + YYDEBUG(692, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy697; + if (yych == 'T') goto yy693; if (yych != 't') goto yy150; -yy697: - YYDEBUG(697, *YYCURSOR); +yy693: + YYDEBUG(693, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(698, *YYCURSOR); + YYDEBUG(694, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1242 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_DEFAULT); } -#line 6508 "Zend/zend_language_scanner.c" -yy699: - YYDEBUG(699, *YYCURSOR); +#line 6465 "Zend/zend_language_scanner.c" +yy695: + YYDEBUG(695, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy700; + if (yych == 'A') goto yy696; if (yych != 'a') goto yy150; -yy700: - YYDEBUG(700, *YYCURSOR); +yy696: + YYDEBUG(696, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy701; + if (yych == 'R') goto yy697; if (yych != 'r') goto yy150; -yy701: - YYDEBUG(701, *YYCURSOR); +yy697: + YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy702; + if (yych == 'E') goto yy698; if (yych != 'e') goto yy150; -yy702: - YYDEBUG(702, *YYCURSOR); +yy698: + YYDEBUG(698, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(703, *YYCURSOR); + YYDEBUG(699, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1214 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_DECLARE); } -#line 6536 "Zend/zend_language_scanner.c" -yy704: - YYDEBUG(704, *YYCURSOR); +#line 6493 "Zend/zend_language_scanner.c" +yy700: + YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy766; - if (yych == 'h') goto yy766; + if (yych == 'H') goto yy762; + if (yych == 'h') goto yy762; goto yy150; -yy705: - YYDEBUG(705, *YYCURSOR); +yy701: + YYDEBUG(701, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy760; - if (yych == 's') goto yy760; + if (yych == 'S') goto yy756; + if (yych == 's') goto yy756; goto yy150; -yy706: - YYDEBUG(706, *YYCURSOR); +yy702: + YYDEBUG(702, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy756; - if (yych == 'p') goto yy756; + if (yych == 'P') goto yy752; + if (yych == 'p') goto yy752; goto yy150; -yy707: - YYDEBUG(707, *YYCURSOR); +yy703: + YYDEBUG(703, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy722; - if (yych == 'd') goto yy722; + if (yych == 'D') goto yy718; + if (yych == 'd') goto yy718; goto yy150; -yy708: - YYDEBUG(708, *YYCURSOR); +yy704: + YYDEBUG(704, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy719; - if (yych == 'a') goto yy719; + if (yych == 'A') goto yy715; + if (yych == 'a') goto yy715; goto yy150; -yy709: - YYDEBUG(709, *YYCURSOR); +yy705: + YYDEBUG(705, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { - if (yych == 'I') goto yy710; + if (yych == 'I') goto yy706; if (yych <= 'S') goto yy150; - goto yy711; + goto yy707; } else { if (yych <= 'i') { if (yych <= 'h') goto yy150; } else { - if (yych == 't') goto yy711; + if (yych == 't') goto yy707; goto yy150; } } -yy710: - YYDEBUG(710, *YYCURSOR); +yy706: + YYDEBUG(706, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy717; - if (yych == 't') goto yy717; + if (yych == 'T') goto yy713; + if (yych == 't') goto yy713; goto yy150; -yy711: - YYDEBUG(711, *YYCURSOR); +yy707: + YYDEBUG(707, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy712; + if (yych == 'E') goto yy708; if (yych != 'e') goto yy150; -yy712: - YYDEBUG(712, *YYCURSOR); +yy708: + YYDEBUG(708, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy713; + if (yych == 'N') goto yy709; if (yych != 'n') goto yy150; -yy713: - YYDEBUG(713, *YYCURSOR); +yy709: + YYDEBUG(709, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy714; + if (yych == 'D') goto yy710; if (yych != 'd') goto yy150; -yy714: - YYDEBUG(714, *YYCURSOR); +yy710: + YYDEBUG(710, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy715; + if (yych == 'S') goto yy711; if (yych != 's') goto yy150; -yy715: - YYDEBUG(715, *YYCURSOR); +yy711: + YYDEBUG(711, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(716, *YYCURSOR); + YYDEBUG(712, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1278 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EXTENDS); } -#line 6620 "Zend/zend_language_scanner.c" -yy717: - YYDEBUG(717, *YYCURSOR); +#line 6577 "Zend/zend_language_scanner.c" +yy713: + YYDEBUG(713, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(718, *YYCURSOR); + YYDEBUG(714, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1125 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EXIT); } -#line 6633 "Zend/zend_language_scanner.c" -yy719: - YYDEBUG(719, *YYCURSOR); +#line 6590 "Zend/zend_language_scanner.c" +yy715: + YYDEBUG(715, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy720; + if (yych == 'L') goto yy716; if (yych != 'l') goto yy150; -yy720: - YYDEBUG(720, *YYCURSOR); +yy716: + YYDEBUG(716, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(721, *YYCURSOR); + YYDEBUG(717, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1368 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EVAL); } -#line 6651 "Zend/zend_language_scanner.c" -yy722: - YYDEBUG(722, *YYCURSOR); +#line 6608 "Zend/zend_language_scanner.c" +yy718: + YYDEBUG(718, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch (yych) { case 'D': - case 'd': goto yy723; + case 'd': goto yy719; case 'F': - case 'f': goto yy724; + case 'f': goto yy720; case 'I': - case 'i': goto yy725; + case 'i': goto yy721; case 'S': - case 's': goto yy726; + case 's': goto yy722; case 'W': - case 'w': goto yy727; + case 'w': goto yy723; default: goto yy150; } -yy723: - YYDEBUG(723, *YYCURSOR); +yy719: + YYDEBUG(719, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy749; - if (yych == 'e') goto yy749; + if (yych == 'E') goto yy745; + if (yych == 'e') goto yy745; goto yy150; -yy724: - YYDEBUG(724, *YYCURSOR); +yy720: + YYDEBUG(720, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy741; - if (yych == 'o') goto yy741; + if (yych == 'O') goto yy737; + if (yych == 'o') goto yy737; goto yy150; -yy725: - YYDEBUG(725, *YYCURSOR); +yy721: + YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy739; - if (yych == 'f') goto yy739; + if (yych == 'F') goto yy735; + if (yych == 'f') goto yy735; goto yy150; -yy726: - YYDEBUG(726, *YYCURSOR); +yy722: + YYDEBUG(722, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'W') goto yy733; - if (yych == 'w') goto yy733; + if (yych == 'W') goto yy729; + if (yych == 'w') goto yy729; goto yy150; -yy727: - YYDEBUG(727, *YYCURSOR); +yy723: + YYDEBUG(723, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy728; + if (yych == 'H') goto yy724; if (yych != 'h') goto yy150; -yy728: - YYDEBUG(728, *YYCURSOR); +yy724: + YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy729; + if (yych == 'I') goto yy725; if (yych != 'i') goto yy150; -yy729: - YYDEBUG(729, *YYCURSOR); +yy725: + YYDEBUG(725, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy730; + if (yych == 'L') goto yy726; if (yych != 'l') goto yy150; -yy730: - YYDEBUG(730, *YYCURSOR); +yy726: + YYDEBUG(726, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy731; + if (yych == 'E') goto yy727; if (yych != 'e') goto yy150; -yy731: - YYDEBUG(731, *YYCURSOR); +yy727: + YYDEBUG(727, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(732, *YYCURSOR); + YYDEBUG(728, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1190 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDWHILE); } -#line 6725 "Zend/zend_language_scanner.c" -yy733: - YYDEBUG(733, *YYCURSOR); +#line 6682 "Zend/zend_language_scanner.c" +yy729: + YYDEBUG(729, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy734; + if (yych == 'I') goto yy730; if (yych != 'i') goto yy150; -yy734: - YYDEBUG(734, *YYCURSOR); +yy730: + YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy735; + if (yych == 'T') goto yy731; if (yych != 't') goto yy150; -yy735: - YYDEBUG(735, *YYCURSOR); +yy731: + YYDEBUG(731, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy736; + if (yych == 'C') goto yy732; if (yych != 'c') goto yy150; -yy736: - YYDEBUG(736, *YYCURSOR); +yy732: + YYDEBUG(732, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy737; + if (yych == 'H') goto yy733; if (yych != 'h') goto yy150; -yy737: - YYDEBUG(737, *YYCURSOR); +yy733: + YYDEBUG(733, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(738, *YYCURSOR); + YYDEBUG(734, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1234 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDSWITCH); } -#line 6758 "Zend/zend_language_scanner.c" -yy739: - YYDEBUG(739, *YYCURSOR); +#line 6715 "Zend/zend_language_scanner.c" +yy735: + YYDEBUG(735, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(740, *YYCURSOR); + YYDEBUG(736, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1178 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDIF); } -#line 6771 "Zend/zend_language_scanner.c" -yy741: - YYDEBUG(741, *YYCURSOR); +#line 6728 "Zend/zend_language_scanner.c" +yy737: + YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy742; + if (yych == 'R') goto yy738; if (yych != 'r') goto yy150; -yy742: - YYDEBUG(742, *YYCURSOR); +yy738: + YYDEBUG(738, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy743; + if (yych <= '/') goto yy739; if (yych <= '9') goto yy149; } else { - if (yych == 'E') goto yy744; + if (yych == 'E') goto yy740; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'd') { if (yych != '`') goto yy149; } else { - if (yych <= 'e') goto yy744; + if (yych <= 'e') goto yy740; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy743: - YYDEBUG(743, *YYCURSOR); +yy739: + YYDEBUG(739, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1202 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDFOR); } -#line 6804 "Zend/zend_language_scanner.c" -yy744: - YYDEBUG(744, *YYCURSOR); +#line 6761 "Zend/zend_language_scanner.c" +yy740: + YYDEBUG(740, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy745; + if (yych == 'A') goto yy741; if (yych != 'a') goto yy150; -yy745: - YYDEBUG(745, *YYCURSOR); +yy741: + YYDEBUG(741, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy746; + if (yych == 'C') goto yy742; if (yych != 'c') goto yy150; -yy746: - YYDEBUG(746, *YYCURSOR); +yy742: + YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy747; + if (yych == 'H') goto yy743; if (yych != 'h') goto yy150; -yy747: - YYDEBUG(747, *YYCURSOR); +yy743: + YYDEBUG(743, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(748, *YYCURSOR); + YYDEBUG(744, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1210 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDFOREACH); } -#line 6832 "Zend/zend_language_scanner.c" -yy749: - YYDEBUG(749, *YYCURSOR); +#line 6789 "Zend/zend_language_scanner.c" +yy745: + YYDEBUG(745, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy750; + if (yych == 'C') goto yy746; if (yych != 'c') goto yy150; -yy750: - YYDEBUG(750, *YYCURSOR); +yy746: + YYDEBUG(746, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy751; + if (yych == 'L') goto yy747; if (yych != 'l') goto yy150; -yy751: - YYDEBUG(751, *YYCURSOR); +yy747: + YYDEBUG(747, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy752; + if (yych == 'A') goto yy748; if (yych != 'a') goto yy150; -yy752: - YYDEBUG(752, *YYCURSOR); +yy748: + YYDEBUG(748, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy753; + if (yych == 'R') goto yy749; if (yych != 'r') goto yy150; -yy753: - YYDEBUG(753, *YYCURSOR); +yy749: + YYDEBUG(749, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy754; + if (yych == 'E') goto yy750; if (yych != 'e') goto yy150; -yy754: - YYDEBUG(754, *YYCURSOR); +yy750: + YYDEBUG(750, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(755, *YYCURSOR); + YYDEBUG(751, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1218 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDDECLARE); } -#line 6870 "Zend/zend_language_scanner.c" -yy756: - YYDEBUG(756, *YYCURSOR); +#line 6827 "Zend/zend_language_scanner.c" +yy752: + YYDEBUG(752, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy757; + if (yych == 'T') goto yy753; if (yych != 't') goto yy150; -yy757: - YYDEBUG(757, *YYCURSOR); +yy753: + YYDEBUG(753, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy758; + if (yych == 'Y') goto yy754; if (yych != 'y') goto yy150; -yy758: - YYDEBUG(758, *YYCURSOR); +yy754: + YYDEBUG(754, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(759, *YYCURSOR); + YYDEBUG(755, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1408 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EMPTY); } -#line 6893 "Zend/zend_language_scanner.c" -yy760: - YYDEBUG(760, *YYCURSOR); +#line 6850 "Zend/zend_language_scanner.c" +yy756: + YYDEBUG(756, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy761; + if (yych == 'E') goto yy757; if (yych != 'e') goto yy150; -yy761: - YYDEBUG(761, *YYCURSOR); +yy757: + YYDEBUG(757, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy762; + if (yych <= '/') goto yy758; if (yych <= '9') goto yy149; } else { - if (yych == 'I') goto yy763; + if (yych == 'I') goto yy759; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'h') { if (yych != '`') goto yy149; } else { - if (yych <= 'i') goto yy763; + if (yych <= 'i') goto yy759; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy762: - YYDEBUG(762, *YYCURSOR); +yy758: + YYDEBUG(758, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1182 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ELSE); } -#line 6926 "Zend/zend_language_scanner.c" -yy763: - YYDEBUG(763, *YYCURSOR); +#line 6883 "Zend/zend_language_scanner.c" +yy759: + YYDEBUG(759, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy764; + if (yych == 'F') goto yy760; if (yych != 'f') goto yy150; -yy764: - YYDEBUG(764, *YYCURSOR); +yy760: + YYDEBUG(760, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(765, *YYCURSOR); + YYDEBUG(761, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1174 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ELSEIF); } -#line 6944 "Zend/zend_language_scanner.c" -yy766: - YYDEBUG(766, *YYCURSOR); +#line 6901 "Zend/zend_language_scanner.c" +yy762: + YYDEBUG(762, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy767; + if (yych == 'O') goto yy763; if (yych != 'o') goto yy150; -yy767: - YYDEBUG(767, *YYCURSOR); +yy763: + YYDEBUG(763, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(768, *YYCURSOR); + YYDEBUG(764, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1258 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ECHO); } -#line 6962 "Zend/zend_language_scanner.c" +#line 6919 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -6997,52 +6954,52 @@ int start_line = CG(zend_lineno); 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, }; - YYDEBUG(769, *YYCURSOR); + YYDEBUG(765, *YYCURSOR); YYFILL(2); yych = *YYCURSOR; if (yych <= '-') { if (yych <= '\r') { - if (yych <= 0x08) goto yy777; - if (yych <= '\n') goto yy771; - if (yych <= '\f') goto yy777; + if (yych <= 0x08) goto yy773; + if (yych <= '\n') goto yy767; + if (yych <= '\f') goto yy773; } else { - if (yych == ' ') goto yy771; - if (yych <= ',') goto yy777; - goto yy773; + if (yych == ' ') goto yy767; + if (yych <= ',') goto yy773; + goto yy769; } } else { if (yych <= '_') { - if (yych <= '@') goto yy777; - if (yych <= 'Z') goto yy775; - if (yych <= '^') goto yy777; - goto yy775; + if (yych <= '@') goto yy773; + if (yych <= 'Z') goto yy771; + if (yych <= '^') goto yy773; + goto yy771; } else { - if (yych <= '`') goto yy777; - if (yych <= 'z') goto yy775; - if (yych <= 0x7F) goto yy777; - goto yy775; + if (yych <= '`') goto yy773; + if (yych <= 'z') goto yy771; + if (yych <= 0x7F) goto yy773; + goto yy771; } } -yy771: - YYDEBUG(771, *YYCURSOR); +yy767: + YYDEBUG(767, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy783; -yy772: - YYDEBUG(772, *YYCURSOR); + goto yy779; +yy768: + YYDEBUG(768, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1291 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); RETURN_TOKEN(T_WHITESPACE); } -#line 7040 "Zend/zend_language_scanner.c" -yy773: - YYDEBUG(773, *YYCURSOR); +#line 6997 "Zend/zend_language_scanner.c" +yy769: + YYDEBUG(769, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) == '>') goto yy780; -yy774: - YYDEBUG(774, *YYCURSOR); + if ((yych = *YYCURSOR) == '>') goto yy776; +yy770: + YYDEBUG(770, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1306 "Zend/zend_language_scanner.l" { @@ -7050,14 +7007,14 @@ int start_line = CG(zend_lineno); yy_pop_state(); goto restart; } -#line 7054 "Zend/zend_language_scanner.c" -yy775: - YYDEBUG(775, *YYCURSOR); +#line 7011 "Zend/zend_language_scanner.c" +yy771: + YYDEBUG(771, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy779; -yy776: - YYDEBUG(776, *YYCURSOR); + goto yy775; +yy772: + YYDEBUG(772, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1300 "Zend/zend_language_scanner.l" { @@ -7065,43 +7022,43 @@ int start_line = CG(zend_lineno); zend_copy_value(zendlval, yytext, yyleng); RETURN_TOKEN(T_STRING); } -#line 7069 "Zend/zend_language_scanner.c" -yy777: - YYDEBUG(777, *YYCURSOR); +#line 7026 "Zend/zend_language_scanner.c" +yy773: + YYDEBUG(773, *YYCURSOR); yych = *++YYCURSOR; - goto yy774; -yy778: - YYDEBUG(778, *YYCURSOR); + goto yy770; +yy774: + YYDEBUG(774, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy779: - YYDEBUG(779, *YYCURSOR); +yy775: + YYDEBUG(775, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy778; + goto yy774; } - goto yy776; -yy780: - YYDEBUG(780, *YYCURSOR); + goto yy772; +yy776: + YYDEBUG(776, *YYCURSOR); ++YYCURSOR; - YYDEBUG(781, *YYCURSOR); + YYDEBUG(777, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1296 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_OBJECT_OPERATOR); } -#line 7094 "Zend/zend_language_scanner.c" -yy782: - YYDEBUG(782, *YYCURSOR); +#line 7051 "Zend/zend_language_scanner.c" +yy778: + YYDEBUG(778, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy783: - YYDEBUG(783, *YYCURSOR); +yy779: + YYDEBUG(779, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy782; + goto yy778; } - goto yy772; + goto yy768; } /* *********************************** */ yyc_ST_LOOKING_FOR_VARNAME: @@ -7140,41 +7097,41 @@ int start_line = CG(zend_lineno); 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; - YYDEBUG(784, *YYCURSOR); + YYDEBUG(780, *YYCURSOR); YYFILL(2); yych = *YYCURSOR; if (yych <= '_') { - if (yych <= '@') goto yy788; - if (yych <= 'Z') goto yy786; - if (yych <= '^') goto yy788; + if (yych <= '@') goto yy784; + if (yych <= 'Z') goto yy782; + if (yych <= '^') goto yy784; } else { - if (yych <= '`') goto yy788; - if (yych <= 'z') goto yy786; - if (yych <= 0x7F) goto yy788; + if (yych <= '`') goto yy784; + if (yych <= 'z') goto yy782; + if (yych <= 0x7F) goto yy784; } -yy786: - YYDEBUG(786, *YYCURSOR); +yy782: + YYDEBUG(782, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '_') { if (yych <= '@') { - if (yych <= '/') goto yy787; - if (yych <= '9') goto yy790; + if (yych <= '/') goto yy783; + if (yych <= '9') goto yy786; } else { - if (yych <= '[') goto yy790; - if (yych >= '_') goto yy790; + if (yych <= '[') goto yy786; + if (yych >= '_') goto yy786; } } else { if (yych <= '|') { - if (yych <= '`') goto yy787; - if (yych <= 'z') goto yy790; + if (yych <= '`') goto yy783; + if (yych <= 'z') goto yy786; } else { - if (yych <= '}') goto yy790; - if (yych >= 0x80) goto yy790; + if (yych <= '}') goto yy786; + if (yych >= 0x80) goto yy786; } } -yy787: - YYDEBUG(787, *YYCURSOR); +yy783: + YYDEBUG(783, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1611 "Zend/zend_language_scanner.l" { @@ -7183,30 +7140,30 @@ int start_line = CG(zend_lineno); yy_push_state(ST_IN_SCRIPTING); goto restart; } -#line 7187 "Zend/zend_language_scanner.c" -yy788: - YYDEBUG(788, *YYCURSOR); +#line 7144 "Zend/zend_language_scanner.c" +yy784: + YYDEBUG(784, *YYCURSOR); yych = *++YYCURSOR; - goto yy787; -yy789: - YYDEBUG(789, *YYCURSOR); + goto yy783; +yy785: + YYDEBUG(785, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy790: - YYDEBUG(790, *YYCURSOR); +yy786: + YYDEBUG(786, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy789; + goto yy785; } - if (yych == '[') goto yy792; - if (yych == '}') goto yy792; - YYDEBUG(791, *YYCURSOR); + if (yych == '[') goto yy788; + if (yych == '}') goto yy788; + YYDEBUG(787, *YYCURSOR); YYCURSOR = YYMARKER; - goto yy787; -yy792: - YYDEBUG(792, *YYCURSOR); + goto yy783; +yy788: + YYDEBUG(788, *YYCURSOR); ++YYCURSOR; - YYDEBUG(793, *YYCURSOR); + YYDEBUG(789, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1602 "Zend/zend_language_scanner.l" { @@ -7216,18 +7173,18 @@ int start_line = CG(zend_lineno); yy_push_state(ST_IN_SCRIPTING); RETURN_TOKEN(T_STRING_VARNAME); } -#line 7220 "Zend/zend_language_scanner.c" +#line 7177 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: - YYDEBUG(794, *YYCURSOR); + YYDEBUG(790, *YYCURSOR); YYFILL(1); yych = *YYCURSOR; - YYDEBUG(796, *YYCURSOR); + YYDEBUG(792, *YYCURSOR); ++YYCURSOR; - YYDEBUG(797, *YYCURSOR); + YYDEBUG(793, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2330 "Zend/zend_language_scanner.l" +#line 2327 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7283,7 +7240,7 @@ int start_line = CG(zend_lineno); HANDLE_NEWLINES(yytext, yyleng - newline); RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE); } -#line 7287 "Zend/zend_language_scanner.c" +#line 7244 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7321,72 +7278,72 @@ int start_line = CG(zend_lineno); 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, }; - YYDEBUG(798, *YYCURSOR); + YYDEBUG(794, *YYCURSOR); YYFILL(3); yych = *YYCURSOR; if (yych <= '0') { if (yych <= ' ') { if (yych <= '\f') { - if (yych <= 0x08) goto yy812; - if (yych <= '\n') goto yy808; - goto yy812; - } else { - if (yych <= '\r') goto yy808; - if (yych <= 0x1F) goto yy812; + if (yych <= 0x08) goto yy808; + if (yych <= '\n') goto yy804; goto yy808; + } else { + if (yych <= '\r') goto yy804; + if (yych <= 0x1F) goto yy808; + goto yy804; } } else { if (yych <= '$') { - if (yych <= '"') goto yy807; - if (yych <= '#') goto yy808; - goto yy803; + if (yych <= '"') goto yy803; + if (yych <= '#') goto yy804; + goto yy799; } else { - if (yych == '\'') goto yy808; - if (yych <= '/') goto yy807; + if (yych == '\'') goto yy804; + if (yych <= '/') goto yy803; } } } else { if (yych <= ']') { if (yych <= 'Z') { - if (yych <= '9') goto yy802; - if (yych <= '@') goto yy807; - goto yy810; + if (yych <= '9') goto yy798; + if (yych <= '@') goto yy803; + goto yy806; } else { - if (yych <= '[') goto yy807; - if (yych <= '\\') goto yy808; - goto yy805; + if (yych <= '[') goto yy803; + if (yych <= '\\') goto yy804; + goto yy801; } } else { if (yych <= '`') { - if (yych == '_') goto yy810; - goto yy807; + if (yych == '_') goto yy806; + goto yy803; } else { - if (yych <= 'z') goto yy810; - if (yych <= '~') goto yy807; - if (yych <= 0x7F) goto yy812; - goto yy810; + if (yych <= 'z') goto yy806; + if (yych <= '~') goto yy803; + if (yych <= 0x7F) goto yy808; + goto yy806; } } } - YYDEBUG(800, *YYCURSOR); + YYDEBUG(796, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= '9') { - if (yych >= '0') goto yy824; + if (yych >= '0') goto yy820; } else { - if (yych == 'B') goto yy821; + if (yych == 'B') goto yy817; } } else { if (yych <= 'b') { - if (yych <= 'X') goto yy823; - if (yych >= 'b') goto yy821; + if (yych <= 'X') goto yy819; + if (yych >= 'b') goto yy817; } else { - if (yych == 'x') goto yy823; + if (yych == 'x') goto yy819; } } -yy801: - YYDEBUG(801, *YYCURSOR); +yy797: + YYDEBUG(797, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1719 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ @@ -7404,51 +7361,51 @@ int start_line = CG(zend_lineno); } RETURN_TOKEN(T_NUM_STRING); } -#line 7408 "Zend/zend_language_scanner.c" -yy802: - YYDEBUG(802, *YYCURSOR); +#line 7365 "Zend/zend_language_scanner.c" +yy798: + YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; - goto yy820; -yy803: - YYDEBUG(803, *YYCURSOR); + goto yy816; +yy799: + YYDEBUG(799, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '_') { - if (yych <= '@') goto yy804; - if (yych <= 'Z') goto yy816; - if (yych >= '_') goto yy816; + if (yych <= '@') goto yy800; + if (yych <= 'Z') goto yy812; + if (yych >= '_') goto yy812; } else { - if (yych <= '`') goto yy804; - if (yych <= 'z') goto yy816; - if (yych >= 0x80) goto yy816; + if (yych <= '`') goto yy800; + if (yych <= 'z') goto yy812; + if (yych >= 0x80) goto yy812; } -yy804: - YYDEBUG(804, *YYCURSOR); +yy800: + YYDEBUG(800, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1879 "Zend/zend_language_scanner.l" { /* Only '[' or '-' can be valid, but returning other tokens will allow a more explicit parse error */ RETURN_TOKEN(yytext[0]); } -#line 7433 "Zend/zend_language_scanner.c" -yy805: - YYDEBUG(805, *YYCURSOR); +#line 7390 "Zend/zend_language_scanner.c" +yy801: + YYDEBUG(801, *YYCURSOR); ++YYCURSOR; - YYDEBUG(806, *YYCURSOR); + YYDEBUG(802, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1874 "Zend/zend_language_scanner.l" { yy_pop_state(); RETURN_TOKEN(']'); } -#line 7444 "Zend/zend_language_scanner.c" -yy807: - YYDEBUG(807, *YYCURSOR); +#line 7401 "Zend/zend_language_scanner.c" +yy803: + YYDEBUG(803, *YYCURSOR); yych = *++YYCURSOR; - goto yy804; -yy808: - YYDEBUG(808, *YYCURSOR); + goto yy800; +yy804: + YYDEBUG(804, *YYCURSOR); ++YYCURSOR; - YYDEBUG(809, *YYCURSOR); + YYDEBUG(805, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1884 "Zend/zend_language_scanner.l" { @@ -7458,27 +7415,27 @@ int start_line = CG(zend_lineno); ZVAL_NULL(zendlval); RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE); } -#line 7462 "Zend/zend_language_scanner.c" -yy810: - YYDEBUG(810, *YYCURSOR); +#line 7419 "Zend/zend_language_scanner.c" +yy806: + YYDEBUG(806, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy815; -yy811: - YYDEBUG(811, *YYCURSOR); + goto yy811; +yy807: + YYDEBUG(807, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1892 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); RETURN_TOKEN(T_STRING); } -#line 7476 "Zend/zend_language_scanner.c" -yy812: - YYDEBUG(812, *YYCURSOR); +#line 7433 "Zend/zend_language_scanner.c" +yy808: + YYDEBUG(808, *YYCURSOR); ++YYCURSOR; - YYDEBUG(813, *YYCURSOR); + YYDEBUG(809, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2387 "Zend/zend_language_scanner.l" +#line 2384 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { RETURN_TOKEN(END); @@ -7487,115 +7444,115 @@ int start_line = CG(zend_lineno); zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7491 "Zend/zend_language_scanner.c" -yy814: - YYDEBUG(814, *YYCURSOR); +#line 7448 "Zend/zend_language_scanner.c" +yy810: + YYDEBUG(810, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy815: - YYDEBUG(815, *YYCURSOR); +yy811: + YYDEBUG(811, *YYCURSOR); if (yybm[0+yych] & 16) { - goto yy814; + goto yy810; } - goto yy811; -yy816: - YYDEBUG(816, *YYCURSOR); + goto yy807; +yy812: + YYDEBUG(812, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(817, *YYCURSOR); + YYDEBUG(813, *YYCURSOR); if (yych <= '^') { if (yych <= '9') { - if (yych >= '0') goto yy816; + if (yych >= '0') goto yy812; } else { - if (yych <= '@') goto yy818; - if (yych <= 'Z') goto yy816; + if (yych <= '@') goto yy814; + if (yych <= 'Z') goto yy812; } } else { if (yych <= '`') { - if (yych <= '_') goto yy816; + if (yych <= '_') goto yy812; } else { - if (yych <= 'z') goto yy816; - if (yych >= 0x80) goto yy816; + if (yych <= 'z') goto yy812; + if (yych >= 0x80) goto yy812; } } -yy818: - YYDEBUG(818, *YYCURSOR); +yy814: + YYDEBUG(814, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1869 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); RETURN_TOKEN(T_VARIABLE); } -#line 7532 "Zend/zend_language_scanner.c" -yy819: - YYDEBUG(819, *YYCURSOR); +#line 7489 "Zend/zend_language_scanner.c" +yy815: + YYDEBUG(815, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy820: - YYDEBUG(820, *YYCURSOR); +yy816: + YYDEBUG(816, *YYCURSOR); if (yybm[0+yych] & 32) { - goto yy819; + goto yy815; } - goto yy801; -yy821: - YYDEBUG(821, *YYCURSOR); + goto yy797; +yy817: + YYDEBUG(817, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 128) { - goto yy829; + goto yy825; } -yy822: - YYDEBUG(822, *YYCURSOR); +yy818: + YYDEBUG(818, *YYCURSOR); YYCURSOR = YYMARKER; - goto yy801; -yy823: - YYDEBUG(823, *YYCURSOR); + goto yy797; +yy819: + YYDEBUG(819, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 64) { - goto yy827; + goto yy823; } - goto yy822; -yy824: - YYDEBUG(824, *YYCURSOR); + goto yy818; +yy820: + YYDEBUG(820, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(825, *YYCURSOR); - if (yych <= '/') goto yy826; - if (yych <= '9') goto yy824; -yy826: - YYDEBUG(826, *YYCURSOR); + YYDEBUG(821, *YYCURSOR); + if (yych <= '/') goto yy822; + if (yych <= '9') goto yy820; +yy822: + YYDEBUG(822, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1735 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ ZVAL_STRINGL(zendlval, yytext, yyleng); RETURN_TOKEN(T_NUM_STRING); } -#line 7577 "Zend/zend_language_scanner.c" -yy827: - YYDEBUG(827, *YYCURSOR); +#line 7534 "Zend/zend_language_scanner.c" +yy823: + YYDEBUG(823, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(828, *YYCURSOR); + YYDEBUG(824, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy827; + goto yy823; } - goto yy826; -yy829: - YYDEBUG(829, *YYCURSOR); + goto yy822; +yy825: + YYDEBUG(825, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(830, *YYCURSOR); + YYDEBUG(826, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy829; + goto yy825; } - goto yy826; + goto yy822; } } -#line 2396 "Zend/zend_language_scanner.l" +#line 2393 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 546470c1b63e8..0aaecf9fb8171 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1963,10 +1963,9 @@ inline_char_handler: } -<ST_IN_SCRIPTING>b?['] { +<ST_IN_SCRIPTING>['] { register char *s, *t; char *end; - int bprefix = (yytext[0] != '\'') ? 1 : 0; while (1) { if (YYCURSOR < YYLIMIT) { @@ -1989,7 +1988,7 @@ inline_char_handler: } } - ZVAL_STRINGL(zendlval, yytext+bprefix+1, yyleng-bprefix-2); + ZVAL_STRINGL(zendlval, yytext+1, yyleng-2); /* convert escape sequences */ s = t = Z_STRVAL_P(zendlval); @@ -2032,14 +2031,13 @@ inline_char_handler: } -<ST_IN_SCRIPTING>b?["] { - int bprefix = (yytext[0] != '"') ? 1 : 0; +<ST_IN_SCRIPTING>["] { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { case '"': yyleng = YYCURSOR - SCNG(yy_text); - zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"'); + zend_scan_escape_string(zendlval, yytext+1, yyleng-2, '"'); RETURN_TOKEN(T_CONSTANT_ENCAPSED_STRING); case '$': if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') { @@ -2074,14 +2072,13 @@ inline_char_handler: } -<ST_IN_SCRIPTING>b?"<<<"{TABS_AND_SPACES}({LABEL}|([']{LABEL}['])|(["]{LABEL}["])){NEWLINE} { +<ST_IN_SCRIPTING>"<<<"{TABS_AND_SPACES}({LABEL}|([']{LABEL}['])|(["]{LABEL}["])){NEWLINE} { char *s; - int bprefix = (yytext[0] != '<') ? 1 : 0; zend_heredoc_label *heredoc_label = emalloc(sizeof(zend_heredoc_label)); CG(zend_lineno)++; - heredoc_label->length = yyleng-bprefix-3-1-(yytext[yyleng-2]=='\r'?1:0); - s = yytext+bprefix+3; + heredoc_label->length = yyleng-3-1-(yytext[yyleng-2]=='\r'?1:0); + s = yytext+3; while ((*s == ' ') || (*s == '\t')) { s++; heredoc_label->length--; From a22e013702686670c7dac318d0b9da70e03b5d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= <mail@pmmaga.net> Date: Sun, 6 Nov 2016 23:20:33 +0100 Subject: [PATCH 8/8] Remove the binary cast from the language scanner --- Zend/zend_language_scanner.c | 2700 +++++++++++++++++----------------- Zend/zend_language_scanner.l | 2 +- 2 files changed, 1335 insertions(+), 1367 deletions(-) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 3221d3e1f4372..210ee2afa2a1c 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -2159,17 +2159,17 @@ int start_line = CG(zend_lineno); YYDEBUG(-1, yych); switch ((yych = *YYCURSOR)) { case 'C': - case 'c': goto yy700; + case 'c': goto yy696; case 'L': - case 'l': goto yy701; + case 'l': goto yy697; case 'M': - case 'm': goto yy702; + case 'm': goto yy698; case 'N': - case 'n': goto yy703; + case 'n': goto yy699; case 'V': - case 'v': goto yy704; + case 'v': goto yy700; case 'X': - case 'x': goto yy705; + case 'x': goto yy701; default: goto yy150; } yy87: @@ -2186,20 +2186,20 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'H') { - if (yych == 'E') goto yy682; + if (yych == 'E') goto yy678; goto yy150; } else { - if (yych <= 'I') goto yy683; + if (yych <= 'I') goto yy679; if (yych <= 'N') goto yy150; - goto yy684; + goto yy680; } } else { if (yych <= 'h') { - if (yych == 'e') goto yy682; + if (yych == 'e') goto yy678; goto yy150; } else { - if (yych <= 'i') goto yy683; - if (yych == 'o') goto yy684; + if (yych <= 'i') goto yy679; + if (yych == 'o') goto yy680; goto yy150; } } @@ -2208,20 +2208,20 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'N') { - if (yych == 'I') goto yy658; + if (yych == 'I') goto yy654; goto yy150; } else { - if (yych <= 'O') goto yy659; + if (yych <= 'O') goto yy655; if (yych <= 'T') goto yy150; - goto yy660; + goto yy656; } } else { if (yych <= 'n') { - if (yych == 'i') goto yy658; + if (yych == 'i') goto yy654; goto yy150; } else { - if (yych <= 'o') goto yy659; - if (yych == 'u') goto yy660; + if (yych <= 'o') goto yy655; + if (yych == 'u') goto yy656; goto yy150; } } @@ -2230,48 +2230,48 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'K') { - if (yych == 'A') goto yy623; + if (yych == 'A') goto yy619; goto yy150; } else { - if (yych <= 'L') goto yy624; + if (yych <= 'L') goto yy620; if (yych <= 'N') goto yy150; - goto yy625; + goto yy621; } } else { if (yych <= 'k') { - if (yych == 'a') goto yy623; + if (yych == 'a') goto yy619; goto yy150; } else { - if (yych <= 'l') goto yy624; - if (yych == 'o') goto yy625; + if (yych <= 'l') goto yy620; + if (yych == 'o') goto yy621; goto yy150; } } yy91: YYDEBUG(91, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy605; - if (yych == 'e') goto yy605; + if (yych == 'E') goto yy601; + if (yych == 'e') goto yy601; goto yy150; yy92: YYDEBUG(92, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy593; - if (yych == 'i') goto yy593; + if (yych == 'I') goto yy589; + if (yych == 'i') goto yy589; goto yy150; yy93: YYDEBUG(93, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { - if (yych == 'H') goto yy581; + if (yych == 'H') goto yy577; if (yych <= 'Q') goto yy150; - goto yy582; + goto yy578; } else { if (yych <= 'h') { if (yych <= 'g') goto yy150; - goto yy581; + goto yy577; } else { - if (yych == 'r') goto yy582; + if (yych == 'r') goto yy578; goto yy150; } } @@ -2280,53 +2280,53 @@ int start_line = CG(zend_lineno); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'L') { - if (yych == 'F') goto yy528; + if (yych == 'F') goto yy524; goto yy150; } else { - if (yych <= 'M') goto yy530; - if (yych <= 'N') goto yy531; + if (yych <= 'M') goto yy526; + if (yych <= 'N') goto yy527; if (yych <= 'R') goto yy150; - goto yy532; + goto yy528; } } else { if (yych <= 'm') { - if (yych == 'f') goto yy528; + if (yych == 'f') goto yy524; if (yych <= 'l') goto yy150; - goto yy530; + goto yy526; } else { - if (yych <= 'n') goto yy531; - if (yych == 's') goto yy532; + if (yych <= 'n') goto yy527; + if (yych == 's') goto yy528; goto yy150; } } yy95: YYDEBUG(95, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy523; - if (yych == 'h') goto yy523; + if (yych == 'H') goto yy519; + if (yych == 'h') goto yy519; goto yy150; yy96: YYDEBUG(96, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'M') { - if (yych == 'B') goto yy505; + if (yych == 'B') goto yy501; goto yy150; } else { - if (yych <= 'N') goto yy506; + if (yych <= 'N') goto yy502; if (yych <= 'Q') goto yy150; - if (yych <= 'R') goto yy507; - goto yy508; + if (yych <= 'R') goto yy503; + goto yy504; } } else { if (yych <= 'n') { - if (yych == 'b') goto yy505; + if (yych == 'b') goto yy501; if (yych <= 'm') goto yy150; - goto yy506; + goto yy502; } else { if (yych <= 'q') goto yy150; - if (yych <= 'r') goto yy507; - if (yych <= 's') goto yy508; + if (yych <= 'r') goto yy503; + if (yych <= 's') goto yy504; goto yy150; } } @@ -2334,37 +2334,37 @@ int start_line = CG(zend_lineno); YYDEBUG(97, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'W') { - if (yych == 'T') goto yy493; + if (yych == 'T') goto yy489; if (yych <= 'V') goto yy150; - goto yy494; + goto yy490; } else { if (yych <= 't') { if (yych <= 's') goto yy150; - goto yy493; + goto yy489; } else { - if (yych == 'w') goto yy494; + if (yych == 'w') goto yy490; goto yy150; } } yy98: YYDEBUG(98, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy488; - if (yych == 'r') goto yy488; + if (yych == 'R') goto yy484; + if (yych == 'r') goto yy484; goto yy150; yy99: YYDEBUG(99, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { - if (yych == 'L') goto yy478; + if (yych == 'L') goto yy474; if (yych <= 'N') goto yy150; - goto yy479; + goto yy475; } else { if (yych <= 'l') { if (yych <= 'k') goto yy150; - goto yy478; + goto yy474; } else { - if (yych == 'o') goto yy479; + if (yych == 'o') goto yy475; goto yy150; } } @@ -2372,15 +2372,15 @@ int start_line = CG(zend_lineno); YYDEBUG(100, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'R') goto yy454; + if (yych == 'R') goto yy450; if (yych <= 'T') goto yy150; - goto yy455; + goto yy451; } else { if (yych <= 'r') { if (yych <= 'q') goto yy150; - goto yy454; + goto yy450; } else { - if (yych == 'u') goto yy455; + if (yych == 'u') goto yy451; goto yy150; } } @@ -2388,10 +2388,10 @@ int start_line = CG(zend_lineno); YYDEBUG(101, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '<') { - if (yych == '-') goto yy450; + if (yych == '-') goto yy446; } else { - if (yych <= '=') goto yy448; - if (yych <= '>') goto yy452; + if (yych <= '=') goto yy444; + if (yych <= '>') goto yy448; } yy102: YYDEBUG(102, *YYCURSOR); @@ -2405,7 +2405,7 @@ int start_line = CG(zend_lineno); YYDEBUG(103, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy447; + goto yy443; yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@ -2418,7 +2418,7 @@ int start_line = CG(zend_lineno); yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; - if (yych == ':') goto yy444; + if (yych == ':') goto yy440; goto yy102; yy106: YYDEBUG(106, *YYCURSOR); @@ -2435,41 +2435,41 @@ int start_line = CG(zend_lineno); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy441; + if (yych == '.') goto yy437; goto yy102; } else { - if (yych <= '9') goto yy437; - if (yych == '=') goto yy439; + if (yych <= '9') goto yy433; + if (yych == '=') goto yy435; goto yy102; } yy109: YYDEBUG(109, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '=') goto yy102; - if (yych <= '>') goto yy431; - if (yych <= '?') goto yy433; + if (yych <= '>') goto yy427; + if (yych <= '?') goto yy429; goto yy102; yy110: YYDEBUG(110, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { - if (yych == 'A') goto yy419; + if (yych == 'A') goto yy415; if (yych <= 'D') goto yy150; - goto yy420; + goto yy416; } else { if (yych <= 'a') { if (yych <= '`') goto yy150; - goto yy419; + goto yy415; } else { - if (yych == 'e') goto yy420; + if (yych == 'e') goto yy416; goto yy150; } } yy111: YYDEBUG(111, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy416; - if (yych == 'a') goto yy416; + if (yych == 'A') goto yy412; + if (yych == 'a') goto yy412; goto yy150; yy112: YYDEBUG(112, *YYCURSOR); @@ -3038,7 +3038,7 @@ int start_line = CG(zend_lineno); goto yy210; } } else { - goto yy597; + goto yy593; } } yy158: @@ -4294,25 +4294,15 @@ int start_line = CG(zend_lineno); yy342: YYDEBUG(342, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy409; - if (yych == 'n') goto yy409; + if (yych == 'N') goto yy405; + if (yych == 'n') goto yy405; goto yy157; yy343: YYDEBUG(343, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= 'O') { - if (yych == 'I') goto yy396; - if (yych <= 'N') goto yy157; - goto yy397; - } else { - if (yych <= 'i') { - if (yych <= 'h') goto yy157; - goto yy396; - } else { - if (yych == 'o') goto yy397; - goto yy157; - } - } + if (yych == 'O') goto yy396; + if (yych == 'o') goto yy396; + goto yy157; yy344: YYDEBUG(344, *YYCURSOR); yych = *++YYCURSOR; @@ -4392,7 +4382,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_INT_CAST); } -#line 4396 "Zend/zend_language_scanner.c" +#line 4386 "Zend/zend_language_scanner.c" yy358: YYDEBUG(358, *YYCURSOR); yych = *++YYCURSOR; @@ -4440,7 +4430,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_DOUBLE_CAST); } -#line 4444 "Zend/zend_language_scanner.c" +#line 4434 "Zend/zend_language_scanner.c" yy367: YYDEBUG(367, *YYCURSOR); yych = *++YYCURSOR; @@ -4514,7 +4504,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_STRING_CAST); } -#line 4518 "Zend/zend_language_scanner.c" +#line 4508 "Zend/zend_language_scanner.c" yy381: YYDEBUG(381, *YYCURSOR); yych = *++YYCURSOR; @@ -4551,7 +4541,7 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_ARRAY_CAST); } -#line 4555 "Zend/zend_language_scanner.c" +#line 4545 "Zend/zend_language_scanner.c" yy388: YYDEBUG(388, *YYCURSOR); yych = *++YYCURSOR; @@ -4593,2329 +4583,2307 @@ int start_line = CG(zend_lineno); { RETURN_TOKEN(T_OBJECT_CAST); } -#line 4597 "Zend/zend_language_scanner.c" +#line 4587 "Zend/zend_language_scanner.c" yy396: YYDEBUG(396, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy406; - if (yych == 'n') goto yy406; - goto yy157; + if (yych == 'O') goto yy397; + if (yych != 'o') goto yy157; yy397: YYDEBUG(397, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy398; - if (yych != 'o') goto yy157; + if (yych == 'L') goto yy398; + if (yych != 'l') goto yy157; yy398: YYDEBUG(398, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy399; - if (yych != 'l') goto yy157; + if (yych == 'E') goto yy403; + if (yych == 'e') goto yy403; + goto yy400; yy399: YYDEBUG(399, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy404; - if (yych == 'e') goto yy404; - goto yy401; -yy400: - YYDEBUG(400, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy401: - YYDEBUG(401, *YYCURSOR); +yy400: + YYDEBUG(400, *YYCURSOR); if (yych <= 0x1F) { - if (yych == '\t') goto yy400; + if (yych == '\t') goto yy399; goto yy157; } else { - if (yych <= ' ') goto yy400; + if (yych <= ' ') goto yy399; if (yych != ')') goto yy157; } - YYDEBUG(402, *YYCURSOR); + YYDEBUG(401, *YYCURSOR); ++YYCURSOR; - YYDEBUG(403, *YYCURSOR); + YYDEBUG(402, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1360 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_BOOL_CAST); } -#line 4642 "Zend/zend_language_scanner.c" +#line 4626 "Zend/zend_language_scanner.c" +yy403: + YYDEBUG(403, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy404; + if (yych != 'a') goto yy157; yy404: YYDEBUG(404, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy405; - if (yych != 'a') goto yy157; + if (yych == 'N') goto yy399; + if (yych == 'n') goto yy399; + goto yy157; yy405: YYDEBUG(405, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy400; - if (yych == 'n') goto yy400; - goto yy157; + if (yych == 'S') goto yy406; + if (yych != 's') goto yy157; yy406: YYDEBUG(406, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy407; - if (yych != 'a') goto yy157; + if (yych == 'E') goto yy407; + if (yych != 'e') goto yy157; yy407: YYDEBUG(407, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy408; - if (yych != 'r') goto yy157; + if (yych == 'T') goto yy408; + if (yych != 't') goto yy157; yy408: YYDEBUG(408, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'Y') goto yy377; - if (yych == 'y') goto yy377; - goto yy157; -yy409: - YYDEBUG(409, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'S') goto yy410; - if (yych != 's') goto yy157; -yy410: - YYDEBUG(410, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy411; - if (yych != 'e') goto yy157; -yy411: - YYDEBUG(411, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'T') goto yy412; - if (yych != 't') goto yy157; -yy412: - YYDEBUG(412, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(413, *YYCURSOR); + YYDEBUG(409, *YYCURSOR); if (yych <= 0x1F) { - if (yych == '\t') goto yy412; + if (yych == '\t') goto yy408; goto yy157; } else { - if (yych <= ' ') goto yy412; + if (yych <= ' ') goto yy408; if (yych != ')') goto yy157; } - YYDEBUG(414, *YYCURSOR); + YYDEBUG(410, *YYCURSOR); ++YYCURSOR; - YYDEBUG(415, *YYCURSOR); + YYDEBUG(411, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1364 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_UNSET_CAST); } -#line 4706 "Zend/zend_language_scanner.c" -yy416: - YYDEBUG(416, *YYCURSOR); +#line 4674 "Zend/zend_language_scanner.c" +yy412: + YYDEBUG(412, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy417; + if (yych == 'R') goto yy413; if (yych != 'r') goto yy150; -yy417: - YYDEBUG(417, *YYCURSOR); +yy413: + YYDEBUG(413, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(418, *YYCURSOR); + YYDEBUG(414, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1336 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_VAR); } -#line 4724 "Zend/zend_language_scanner.c" -yy419: - YYDEBUG(419, *YYCURSOR); +#line 4692 "Zend/zend_language_scanner.c" +yy415: + YYDEBUG(415, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy423; - if (yych == 'm') goto yy423; + if (yych == 'M') goto yy419; + if (yych == 'm') goto yy419; goto yy150; -yy420: - YYDEBUG(420, *YYCURSOR); +yy416: + YYDEBUG(416, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'W') goto yy421; + if (yych == 'W') goto yy417; if (yych != 'w') goto yy150; -yy421: - YYDEBUG(421, *YYCURSOR); +yy417: + YYDEBUG(417, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(422, *YYCURSOR); + YYDEBUG(418, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1328 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_NEW); } -#line 4748 "Zend/zend_language_scanner.c" -yy423: - YYDEBUG(423, *YYCURSOR); +#line 4716 "Zend/zend_language_scanner.c" +yy419: + YYDEBUG(419, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy424; + if (yych == 'E') goto yy420; if (yych != 'e') goto yy150; -yy424: - YYDEBUG(424, *YYCURSOR); +yy420: + YYDEBUG(420, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy425; + if (yych == 'S') goto yy421; if (yych != 's') goto yy150; -yy425: - YYDEBUG(425, *YYCURSOR); +yy421: + YYDEBUG(421, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy426; + if (yych == 'P') goto yy422; if (yych != 'p') goto yy150; -yy426: - YYDEBUG(426, *YYCURSOR); +yy422: + YYDEBUG(422, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy427; + if (yych == 'A') goto yy423; if (yych != 'a') goto yy150; -yy427: - YYDEBUG(427, *YYCURSOR); +yy423: + YYDEBUG(423, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy428; + if (yych == 'C') goto yy424; if (yych != 'c') goto yy150; -yy428: - YYDEBUG(428, *YYCURSOR); +yy424: + YYDEBUG(424, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy429; + if (yych == 'E') goto yy425; if (yych != 'e') goto yy150; -yy429: - YYDEBUG(429, *YYCURSOR); +yy425: + YYDEBUG(425, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(430, *YYCURSOR); + YYDEBUG(426, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1388 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_NAMESPACE); } -#line 4791 "Zend/zend_language_scanner.c" -yy431: - YYDEBUG(431, *YYCURSOR); +#line 4759 "Zend/zend_language_scanner.c" +yy427: + YYDEBUG(427, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) == '\n') goto yy435; - if (yych == '\r') goto yy436; -yy432: - YYDEBUG(432, *YYCURSOR); + if ((yych = *YYCURSOR) == '\n') goto yy431; + if (yych == '\r') goto yy432; +yy428: + YYDEBUG(428, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1960 "Zend/zend_language_scanner.l" { BEGIN(INITIAL); RETURN_TOKEN(T_CLOSE_TAG); /* implicit ';' at php-end tag */ } -#line 4805 "Zend/zend_language_scanner.c" -yy433: - YYDEBUG(433, *YYCURSOR); +#line 4773 "Zend/zend_language_scanner.c" +yy429: + YYDEBUG(429, *YYCURSOR); ++YYCURSOR; - YYDEBUG(434, *YYCURSOR); + YYDEBUG(430, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1324 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_COALESCE); } -#line 4815 "Zend/zend_language_scanner.c" -yy435: - YYDEBUG(435, *YYCURSOR); +#line 4783 "Zend/zend_language_scanner.c" +yy431: + YYDEBUG(431, *YYCURSOR); yych = *++YYCURSOR; - goto yy432; -yy436: - YYDEBUG(436, *YYCURSOR); + goto yy428; +yy432: + YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy435; - goto yy432; -yy437: - YYDEBUG(437, *YYCURSOR); + if (yych == '\n') goto yy431; + goto yy428; +yy433: + YYDEBUG(433, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(3); yych = *YYCURSOR; - YYDEBUG(438, *YYCURSOR); + YYDEBUG(434, *YYCURSOR); if (yych <= 'D') { if (yych <= '/') goto yy153; - if (yych <= '9') goto yy437; + if (yych <= '9') goto yy433; goto yy153; } else { if (yych <= 'E') goto yy156; if (yych == 'e') goto yy156; goto yy153; } -yy439: - YYDEBUG(439, *YYCURSOR); +yy435: + YYDEBUG(435, *YYCURSOR); ++YYCURSOR; - YYDEBUG(440, *YYCURSOR); + YYDEBUG(436, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1520 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CONCAT_EQUAL); } -#line 4850 "Zend/zend_language_scanner.c" -yy441: - YYDEBUG(441, *YYCURSOR); +#line 4818 "Zend/zend_language_scanner.c" +yy437: + YYDEBUG(437, *YYCURSOR); yych = *++YYCURSOR; if (yych != '.') goto yy157; - YYDEBUG(442, *YYCURSOR); + YYDEBUG(438, *YYCURSOR); ++YYCURSOR; - YYDEBUG(443, *YYCURSOR); + YYDEBUG(439, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1320 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ELLIPSIS); } -#line 4863 "Zend/zend_language_scanner.c" -yy444: - YYDEBUG(444, *YYCURSOR); +#line 4831 "Zend/zend_language_scanner.c" +yy440: + YYDEBUG(440, *YYCURSOR); ++YYCURSOR; - YYDEBUG(445, *YYCURSOR); + YYDEBUG(441, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1312 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM); } -#line 4873 "Zend/zend_language_scanner.c" -yy446: - YYDEBUG(446, *YYCURSOR); +#line 4841 "Zend/zend_language_scanner.c" +yy442: + YYDEBUG(442, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy447: - YYDEBUG(447, *YYCURSOR); +yy443: + YYDEBUG(443, *YYCURSOR); if (yych <= '\f') { if (yych <= 0x08) goto yy104; - if (yych <= '\n') goto yy446; + if (yych <= '\n') goto yy442; goto yy104; } else { - if (yych <= '\r') goto yy446; - if (yych == ' ') goto yy446; + if (yych <= '\r') goto yy442; + if (yych == ' ') goto yy442; goto yy104; } -yy448: - YYDEBUG(448, *YYCURSOR); +yy444: + YYDEBUG(444, *YYCURSOR); ++YYCURSOR; - YYDEBUG(449, *YYCURSOR); + YYDEBUG(445, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1500 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_MINUS_EQUAL); } -#line 4899 "Zend/zend_language_scanner.c" -yy450: - YYDEBUG(450, *YYCURSOR); +#line 4867 "Zend/zend_language_scanner.c" +yy446: + YYDEBUG(446, *YYCURSOR); ++YYCURSOR; - YYDEBUG(451, *YYCURSOR); + YYDEBUG(447, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1464 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_DEC); } -#line 4909 "Zend/zend_language_scanner.c" -yy452: - YYDEBUG(452, *YYCURSOR); +#line 4877 "Zend/zend_language_scanner.c" +yy448: + YYDEBUG(448, *YYCURSOR); ++YYCURSOR; - YYDEBUG(453, *YYCURSOR); + YYDEBUG(449, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1286 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_PROPERTY); RETURN_TOKEN(T_OBJECT_OPERATOR); } -#line 4920 "Zend/zend_language_scanner.c" -yy454: - YYDEBUG(454, *YYCURSOR); +#line 4888 "Zend/zend_language_scanner.c" +yy450: + YYDEBUG(450, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { - if (yych == 'I') goto yy461; + if (yych == 'I') goto yy457; if (yych <= 'N') goto yy150; - goto yy462; + goto yy458; } else { if (yych <= 'i') { if (yych <= 'h') goto yy150; - goto yy461; + goto yy457; } else { - if (yych == 'o') goto yy462; + if (yych == 'o') goto yy458; goto yy150; } } -yy455: - YYDEBUG(455, *YYCURSOR); +yy451: + YYDEBUG(451, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy456; + if (yych == 'B') goto yy452; if (yych != 'b') goto yy150; -yy456: - YYDEBUG(456, *YYCURSOR); +yy452: + YYDEBUG(452, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy457; + if (yych == 'L') goto yy453; if (yych != 'l') goto yy150; -yy457: - YYDEBUG(457, *YYCURSOR); +yy453: + YYDEBUG(453, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy458; + if (yych == 'I') goto yy454; if (yych != 'i') goto yy150; -yy458: - YYDEBUG(458, *YYCURSOR); +yy454: + YYDEBUG(454, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy459; + if (yych == 'C') goto yy455; if (yych != 'c') goto yy150; -yy459: - YYDEBUG(459, *YYCURSOR); +yy455: + YYDEBUG(455, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(460, *YYCURSOR); + YYDEBUG(456, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1436 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_PUBLIC); } -#line 4969 "Zend/zend_language_scanner.c" -yy461: - YYDEBUG(461, *YYCURSOR); +#line 4937 "Zend/zend_language_scanner.c" +yy457: + YYDEBUG(457, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'V') { - if (yych == 'N') goto yy470; + if (yych == 'N') goto yy466; if (yych <= 'U') goto yy150; - goto yy471; + goto yy467; } else { if (yych <= 'n') { if (yych <= 'm') goto yy150; - goto yy470; + goto yy466; } else { - if (yych == 'v') goto yy471; + if (yych == 'v') goto yy467; goto yy150; } } -yy462: - YYDEBUG(462, *YYCURSOR); +yy458: + YYDEBUG(458, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy463; + if (yych == 'T') goto yy459; if (yych != 't') goto yy150; -yy463: - YYDEBUG(463, *YYCURSOR); +yy459: + YYDEBUG(459, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy464; + if (yych == 'E') goto yy460; if (yych != 'e') goto yy150; -yy464: - YYDEBUG(464, *YYCURSOR); +yy460: + YYDEBUG(460, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy465; + if (yych == 'C') goto yy461; if (yych != 'c') goto yy150; -yy465: - YYDEBUG(465, *YYCURSOR); +yy461: + YYDEBUG(461, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy466; + if (yych == 'T') goto yy462; if (yych != 't') goto yy150; -yy466: - YYDEBUG(466, *YYCURSOR); +yy462: + YYDEBUG(462, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy467; + if (yych == 'E') goto yy463; if (yych != 'e') goto yy150; -yy467: - YYDEBUG(467, *YYCURSOR); +yy463: + YYDEBUG(463, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy468; + if (yych == 'D') goto yy464; if (yych != 'd') goto yy150; -yy468: - YYDEBUG(468, *YYCURSOR); +yy464: + YYDEBUG(464, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(469, *YYCURSOR); + YYDEBUG(465, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1432 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_PROTECTED); } -#line 5028 "Zend/zend_language_scanner.c" -yy470: - YYDEBUG(470, *YYCURSOR); +#line 4996 "Zend/zend_language_scanner.c" +yy466: + YYDEBUG(466, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy476; - if (yych == 't') goto yy476; + if (yych == 'T') goto yy472; + if (yych == 't') goto yy472; goto yy150; -yy471: - YYDEBUG(471, *YYCURSOR); +yy467: + YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy472; + if (yych == 'A') goto yy468; if (yych != 'a') goto yy150; -yy472: - YYDEBUG(472, *YYCURSOR); +yy468: + YYDEBUG(468, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy473; + if (yych == 'T') goto yy469; if (yych != 't') goto yy150; -yy473: - YYDEBUG(473, *YYCURSOR); +yy469: + YYDEBUG(469, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy474; + if (yych == 'E') goto yy470; if (yych != 'e') goto yy150; -yy474: - YYDEBUG(474, *YYCURSOR); +yy470: + YYDEBUG(470, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(475, *YYCURSOR); + YYDEBUG(471, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1428 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_PRIVATE); } -#line 5062 "Zend/zend_language_scanner.c" -yy476: - YYDEBUG(476, *YYCURSOR); +#line 5030 "Zend/zend_language_scanner.c" +yy472: + YYDEBUG(472, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(477, *YYCURSOR); + YYDEBUG(473, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1262 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_PRINT); } -#line 5075 "Zend/zend_language_scanner.c" -yy478: - YYDEBUG(478, *YYCURSOR); +#line 5043 "Zend/zend_language_scanner.c" +yy474: + YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy483; - if (yych == 'o') goto yy483; + if (yych == 'O') goto yy479; + if (yych == 'o') goto yy479; goto yy150; -yy479: - YYDEBUG(479, *YYCURSOR); +yy475: + YYDEBUG(475, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy480; + if (yych == 'T') goto yy476; if (yych != 't') goto yy150; -yy480: - YYDEBUG(480, *YYCURSOR); +yy476: + YYDEBUG(476, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy481; + if (yych == 'O') goto yy477; if (yych != 'o') goto yy150; -yy481: - YYDEBUG(481, *YYCURSOR); +yy477: + YYDEBUG(477, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(482, *YYCURSOR); + YYDEBUG(478, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1254 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_GOTO); } -#line 5104 "Zend/zend_language_scanner.c" -yy483: - YYDEBUG(483, *YYCURSOR); +#line 5072 "Zend/zend_language_scanner.c" +yy479: + YYDEBUG(479, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy484; + if (yych == 'B') goto yy480; if (yych != 'b') goto yy150; -yy484: - YYDEBUG(484, *YYCURSOR); +yy480: + YYDEBUG(480, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy485; + if (yych == 'A') goto yy481; if (yych != 'a') goto yy150; -yy485: - YYDEBUG(485, *YYCURSOR); +yy481: + YYDEBUG(481, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy486; + if (yych == 'L') goto yy482; if (yych != 'l') goto yy150; -yy486: - YYDEBUG(486, *YYCURSOR); +yy482: + YYDEBUG(482, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(487, *YYCURSOR); + YYDEBUG(483, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1400 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_GLOBAL); } -#line 5132 "Zend/zend_language_scanner.c" -yy488: - YYDEBUG(488, *YYCURSOR); +#line 5100 "Zend/zend_language_scanner.c" +yy484: + YYDEBUG(484, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy489; + if (yych == 'E') goto yy485; if (yych != 'e') goto yy150; -yy489: - YYDEBUG(489, *YYCURSOR); +yy485: + YYDEBUG(485, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy490; + if (yych == 'A') goto yy486; if (yych != 'a') goto yy150; -yy490: - YYDEBUG(490, *YYCURSOR); +yy486: + YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'K') goto yy491; + if (yych == 'K') goto yy487; if (yych != 'k') goto yy150; -yy491: - YYDEBUG(491, *YYCURSOR); +yy487: + YYDEBUG(487, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(492, *YYCURSOR); + YYDEBUG(488, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1246 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_BREAK); } -#line 5160 "Zend/zend_language_scanner.c" -yy493: - YYDEBUG(493, *YYCURSOR); +#line 5128 "Zend/zend_language_scanner.c" +yy489: + YYDEBUG(489, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy500; - if (yych == 'a') goto yy500; + if (yych == 'A') goto yy496; + if (yych == 'a') goto yy496; goto yy150; -yy494: - YYDEBUG(494, *YYCURSOR); +yy490: + YYDEBUG(490, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy495; + if (yych == 'I') goto yy491; if (yych != 'i') goto yy150; -yy495: - YYDEBUG(495, *YYCURSOR); +yy491: + YYDEBUG(491, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy496; + if (yych == 'T') goto yy492; if (yych != 't') goto yy150; -yy496: - YYDEBUG(496, *YYCURSOR); +yy492: + YYDEBUG(492, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy497; + if (yych == 'C') goto yy493; if (yych != 'c') goto yy150; -yy497: - YYDEBUG(497, *YYCURSOR); +yy493: + YYDEBUG(493, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy498; + if (yych == 'H') goto yy494; if (yych != 'h') goto yy150; -yy498: - YYDEBUG(498, *YYCURSOR); +yy494: + YYDEBUG(494, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(499, *YYCURSOR); + YYDEBUG(495, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1230 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_SWITCH); } -#line 5199 "Zend/zend_language_scanner.c" -yy500: - YYDEBUG(500, *YYCURSOR); +#line 5167 "Zend/zend_language_scanner.c" +yy496: + YYDEBUG(496, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy501; + if (yych == 'T') goto yy497; if (yych != 't') goto yy150; -yy501: - YYDEBUG(501, *YYCURSOR); +yy497: + YYDEBUG(497, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy502; + if (yych == 'I') goto yy498; if (yych != 'i') goto yy150; -yy502: - YYDEBUG(502, *YYCURSOR); +yy498: + YYDEBUG(498, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy503; + if (yych == 'C') goto yy499; if (yych != 'c') goto yy150; -yy503: - YYDEBUG(503, *YYCURSOR); +yy499: + YYDEBUG(499, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(504, *YYCURSOR); + YYDEBUG(500, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1416 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_STATIC); } -#line 5227 "Zend/zend_language_scanner.c" -yy505: - YYDEBUG(505, *YYCURSOR); +#line 5195 "Zend/zend_language_scanner.c" +yy501: + YYDEBUG(501, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy516; - if (yych == 's') goto yy516; + if (yych == 'S') goto yy512; + if (yych == 's') goto yy512; goto yy150; -yy506: - YYDEBUG(506, *YYCURSOR); +yy502: + YYDEBUG(502, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy514; - if (yych == 'd') goto yy514; + if (yych == 'D') goto yy510; + if (yych == 'd') goto yy510; goto yy150; -yy507: - YYDEBUG(507, *YYCURSOR); +yy503: + YYDEBUG(503, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy510; - if (yych == 'r') goto yy510; + if (yych == 'R') goto yy506; + if (yych == 'r') goto yy506; goto yy150; -yy508: - YYDEBUG(508, *YYCURSOR); +yy504: + YYDEBUG(504, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(509, *YYCURSOR); + YYDEBUG(505, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1226 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_AS); } -#line 5258 "Zend/zend_language_scanner.c" -yy510: - YYDEBUG(510, *YYCURSOR); +#line 5226 "Zend/zend_language_scanner.c" +yy506: + YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy511; + if (yych == 'A') goto yy507; if (yych != 'a') goto yy150; -yy511: - YYDEBUG(511, *YYCURSOR); +yy507: + YYDEBUG(507, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy512; + if (yych == 'Y') goto yy508; if (yych != 'y') goto yy150; -yy512: - YYDEBUG(512, *YYCURSOR); +yy508: + YYDEBUG(508, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(513, *YYCURSOR); + YYDEBUG(509, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1452 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ARRAY); } -#line 5281 "Zend/zend_language_scanner.c" -yy514: - YYDEBUG(514, *YYCURSOR); +#line 5249 "Zend/zend_language_scanner.c" +yy510: + YYDEBUG(510, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(515, *YYCURSOR); + YYDEBUG(511, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1560 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_LOGICAL_AND); } -#line 5294 "Zend/zend_language_scanner.c" -yy516: - YYDEBUG(516, *YYCURSOR); +#line 5262 "Zend/zend_language_scanner.c" +yy512: + YYDEBUG(512, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy517; + if (yych == 'T') goto yy513; if (yych != 't') goto yy150; -yy517: - YYDEBUG(517, *YYCURSOR); +yy513: + YYDEBUG(513, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy518; + if (yych == 'R') goto yy514; if (yych != 'r') goto yy150; -yy518: - YYDEBUG(518, *YYCURSOR); +yy514: + YYDEBUG(514, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy519; + if (yych == 'A') goto yy515; if (yych != 'a') goto yy150; -yy519: - YYDEBUG(519, *YYCURSOR); +yy515: + YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy520; + if (yych == 'C') goto yy516; if (yych != 'c') goto yy150; -yy520: - YYDEBUG(520, *YYCURSOR); +yy516: + YYDEBUG(516, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy521; + if (yych == 'T') goto yy517; if (yych != 't') goto yy150; -yy521: - YYDEBUG(521, *YYCURSOR); +yy517: + YYDEBUG(517, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(522, *YYCURSOR); + YYDEBUG(518, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1420 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ABSTRACT); } -#line 5332 "Zend/zend_language_scanner.c" -yy523: - YYDEBUG(523, *YYCURSOR); +#line 5300 "Zend/zend_language_scanner.c" +yy519: + YYDEBUG(519, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy524; + if (yych == 'I') goto yy520; if (yych != 'i') goto yy150; -yy524: - YYDEBUG(524, *YYCURSOR); +yy520: + YYDEBUG(520, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy525; + if (yych == 'L') goto yy521; if (yych != 'l') goto yy150; -yy525: - YYDEBUG(525, *YYCURSOR); +yy521: + YYDEBUG(521, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy526; + if (yych == 'E') goto yy522; if (yych != 'e') goto yy150; -yy526: - YYDEBUG(526, *YYCURSOR); +yy522: + YYDEBUG(522, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(527, *YYCURSOR); + YYDEBUG(523, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1186 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_WHILE); } -#line 5360 "Zend/zend_language_scanner.c" -yy528: - YYDEBUG(528, *YYCURSOR); +#line 5328 "Zend/zend_language_scanner.c" +yy524: + YYDEBUG(524, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(529, *YYCURSOR); + YYDEBUG(525, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1170 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_IF); } -#line 5373 "Zend/zend_language_scanner.c" -yy530: - YYDEBUG(530, *YYCURSOR); +#line 5341 "Zend/zend_language_scanner.c" +yy526: + YYDEBUG(526, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy572; - if (yych == 'p') goto yy572; + if (yych == 'P') goto yy568; + if (yych == 'p') goto yy568; goto yy150; -yy531: - YYDEBUG(531, *YYCURSOR); +yy527: + YYDEBUG(527, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'C') { if (yych <= 'B') goto yy150; - goto yy539; + goto yy535; } else { if (yych <= 'R') goto yy150; - if (yych <= 'S') goto yy537; - goto yy538; + if (yych <= 'S') goto yy533; + goto yy534; } } else { if (yych <= 'r') { - if (yych == 'c') goto yy539; + if (yych == 'c') goto yy535; goto yy150; } else { - if (yych <= 's') goto yy537; - if (yych <= 't') goto yy538; + if (yych <= 's') goto yy533; + if (yych <= 't') goto yy534; goto yy150; } } -yy532: - YYDEBUG(532, *YYCURSOR); +yy528: + YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy533; + if (yych == 'S') goto yy529; if (yych != 's') goto yy150; -yy533: - YYDEBUG(533, *YYCURSOR); +yy529: + YYDEBUG(529, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy534; + if (yych == 'E') goto yy530; if (yych != 'e') goto yy150; -yy534: - YYDEBUG(534, *YYCURSOR); +yy530: + YYDEBUG(530, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy535; + if (yych == 'T') goto yy531; if (yych != 't') goto yy150; -yy535: - YYDEBUG(535, *YYCURSOR); +yy531: + YYDEBUG(531, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(536, *YYCURSOR); + YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1404 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ISSET); } -#line 5429 "Zend/zend_language_scanner.c" -yy537: - YYDEBUG(537, *YYCURSOR); +#line 5397 "Zend/zend_language_scanner.c" +yy533: + YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy558; - if (yych == 't') goto yy558; + if (yych == 'T') goto yy554; + if (yych == 't') goto yy554; goto yy150; -yy538: - YYDEBUG(538, *YYCURSOR); +yy534: + YYDEBUG(534, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy551; - if (yych == 'e') goto yy551; + if (yych == 'E') goto yy547; + if (yych == 'e') goto yy547; goto yy150; -yy539: - YYDEBUG(539, *YYCURSOR); +yy535: + YYDEBUG(535, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy540; + if (yych == 'L') goto yy536; if (yych != 'l') goto yy150; -yy540: - YYDEBUG(540, *YYCURSOR); +yy536: + YYDEBUG(536, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy541; + if (yych == 'U') goto yy537; if (yych != 'u') goto yy150; -yy541: - YYDEBUG(541, *YYCURSOR); +yy537: + YYDEBUG(537, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy542; + if (yych == 'D') goto yy538; if (yych != 'd') goto yy150; -yy542: - YYDEBUG(542, *YYCURSOR); +yy538: + YYDEBUG(538, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy543; + if (yych == 'E') goto yy539; if (yych != 'e') goto yy150; -yy543: - YYDEBUG(543, *YYCURSOR); +yy539: + YYDEBUG(539, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '9') { if (yych >= '0') goto yy149; } else { - if (yych <= '@') goto yy544; + if (yych <= '@') goto yy540; if (yych <= 'Z') goto yy149; } } else { if (yych <= '`') { - if (yych <= '_') goto yy545; + if (yych <= '_') goto yy541; } else { if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy544: - YYDEBUG(544, *YYCURSOR); +yy540: + YYDEBUG(540, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1372 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INCLUDE); } -#line 5487 "Zend/zend_language_scanner.c" -yy545: - YYDEBUG(545, *YYCURSOR); +#line 5455 "Zend/zend_language_scanner.c" +yy541: + YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy546; + if (yych == 'O') goto yy542; if (yych != 'o') goto yy150; -yy546: - YYDEBUG(546, *YYCURSOR); +yy542: + YYDEBUG(542, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy547; + if (yych == 'N') goto yy543; if (yych != 'n') goto yy150; -yy547: - YYDEBUG(547, *YYCURSOR); +yy543: + YYDEBUG(543, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy548; + if (yych == 'C') goto yy544; if (yych != 'c') goto yy150; -yy548: - YYDEBUG(548, *YYCURSOR); +yy544: + YYDEBUG(544, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy549; + if (yych == 'E') goto yy545; if (yych != 'e') goto yy150; -yy549: - YYDEBUG(549, *YYCURSOR); +yy545: + YYDEBUG(545, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(550, *YYCURSOR); + YYDEBUG(546, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1376 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INCLUDE_ONCE); } -#line 5520 "Zend/zend_language_scanner.c" -yy551: - YYDEBUG(551, *YYCURSOR); +#line 5488 "Zend/zend_language_scanner.c" +yy547: + YYDEBUG(547, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy552; + if (yych == 'R') goto yy548; if (yych != 'r') goto yy150; -yy552: - YYDEBUG(552, *YYCURSOR); +yy548: + YYDEBUG(548, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy553; + if (yych == 'F') goto yy549; if (yych != 'f') goto yy150; -yy553: - YYDEBUG(553, *YYCURSOR); +yy549: + YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy554; + if (yych == 'A') goto yy550; if (yych != 'a') goto yy150; -yy554: - YYDEBUG(554, *YYCURSOR); +yy550: + YYDEBUG(550, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy555; + if (yych == 'C') goto yy551; if (yych != 'c') goto yy150; -yy555: - YYDEBUG(555, *YYCURSOR); +yy551: + YYDEBUG(551, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy556; + if (yych == 'E') goto yy552; if (yych != 'e') goto yy150; -yy556: - YYDEBUG(556, *YYCURSOR); +yy552: + YYDEBUG(552, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(557, *YYCURSOR); + YYDEBUG(553, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1270 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INTERFACE); } -#line 5558 "Zend/zend_language_scanner.c" -yy558: - YYDEBUG(558, *YYCURSOR); +#line 5526 "Zend/zend_language_scanner.c" +yy554: + YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { - if (yych == 'A') goto yy559; + if (yych == 'A') goto yy555; if (yych <= 'D') goto yy150; - goto yy560; + goto yy556; } else { if (yych <= 'a') { if (yych <= '`') goto yy150; } else { - if (yych == 'e') goto yy560; + if (yych == 'e') goto yy556; goto yy150; } } -yy559: - YYDEBUG(559, *YYCURSOR); +yy555: + YYDEBUG(555, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy566; - if (yych == 'n') goto yy566; + if (yych == 'N') goto yy562; + if (yych == 'n') goto yy562; goto yy150; -yy560: - YYDEBUG(560, *YYCURSOR); +yy556: + YYDEBUG(556, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy561; + if (yych == 'A') goto yy557; if (yych != 'a') goto yy150; -yy561: - YYDEBUG(561, *YYCURSOR); +yy557: + YYDEBUG(557, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy562; + if (yych == 'D') goto yy558; if (yych != 'd') goto yy150; -yy562: - YYDEBUG(562, *YYCURSOR); +yy558: + YYDEBUG(558, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy563; + if (yych == 'O') goto yy559; if (yych != 'o') goto yy150; -yy563: - YYDEBUG(563, *YYCURSOR); +yy559: + YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy564; + if (yych == 'F') goto yy560; if (yych != 'f') goto yy150; -yy564: - YYDEBUG(564, *YYCURSOR); +yy560: + YYDEBUG(560, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(565, *YYCURSOR); + YYDEBUG(561, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1396 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INSTEADOF); } -#line 5612 "Zend/zend_language_scanner.c" -yy566: - YYDEBUG(566, *YYCURSOR); +#line 5580 "Zend/zend_language_scanner.c" +yy562: + YYDEBUG(562, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy567; + if (yych == 'C') goto yy563; if (yych != 'c') goto yy150; -yy567: - YYDEBUG(567, *YYCURSOR); +yy563: + YYDEBUG(563, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy568; + if (yych == 'E') goto yy564; if (yych != 'e') goto yy150; -yy568: - YYDEBUG(568, *YYCURSOR); +yy564: + YYDEBUG(564, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy569; + if (yych == 'O') goto yy565; if (yych != 'o') goto yy150; -yy569: - YYDEBUG(569, *YYCURSOR); +yy565: + YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy570; + if (yych == 'F') goto yy566; if (yych != 'f') goto yy150; -yy570: - YYDEBUG(570, *YYCURSOR); +yy566: + YYDEBUG(566, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(571, *YYCURSOR); + YYDEBUG(567, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1222 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_INSTANCEOF); } -#line 5645 "Zend/zend_language_scanner.c" -yy572: - YYDEBUG(572, *YYCURSOR); +#line 5613 "Zend/zend_language_scanner.c" +yy568: + YYDEBUG(568, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy573; + if (yych == 'L') goto yy569; if (yych != 'l') goto yy150; -yy573: - YYDEBUG(573, *YYCURSOR); +yy569: + YYDEBUG(569, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy574; + if (yych == 'E') goto yy570; if (yych != 'e') goto yy150; -yy574: - YYDEBUG(574, *YYCURSOR); +yy570: + YYDEBUG(570, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy575; + if (yych == 'M') goto yy571; if (yych != 'm') goto yy150; -yy575: - YYDEBUG(575, *YYCURSOR); +yy571: + YYDEBUG(571, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy576; + if (yych == 'E') goto yy572; if (yych != 'e') goto yy150; -yy576: - YYDEBUG(576, *YYCURSOR); +yy572: + YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy577; + if (yych == 'N') goto yy573; if (yych != 'n') goto yy150; -yy577: - YYDEBUG(577, *YYCURSOR); +yy573: + YYDEBUG(573, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy578; + if (yych == 'T') goto yy574; if (yych != 't') goto yy150; -yy578: - YYDEBUG(578, *YYCURSOR); +yy574: + YYDEBUG(574, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy579; + if (yych == 'S') goto yy575; if (yych != 's') goto yy150; -yy579: - YYDEBUG(579, *YYCURSOR); +yy575: + YYDEBUG(575, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(580, *YYCURSOR); + YYDEBUG(576, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1282 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_IMPLEMENTS); } -#line 5693 "Zend/zend_language_scanner.c" -yy581: - YYDEBUG(581, *YYCURSOR); +#line 5661 "Zend/zend_language_scanner.c" +yy577: + YYDEBUG(577, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy589; - if (yych == 'r') goto yy589; + if (yych == 'R') goto yy585; + if (yych == 'r') goto yy585; goto yy150; -yy582: - YYDEBUG(582, *YYCURSOR); +yy578: + YYDEBUG(578, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'A') goto yy585; + if (yych == 'A') goto yy581; if (yych <= 'X') goto yy150; } else { if (yych <= 'a') { if (yych <= '`') goto yy150; - goto yy585; + goto yy581; } else { if (yych != 'y') goto yy150; } } - YYDEBUG(583, *YYCURSOR); + YYDEBUG(579, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(584, *YYCURSOR); + YYDEBUG(580, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1154 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_TRY); } -#line 5725 "Zend/zend_language_scanner.c" -yy585: - YYDEBUG(585, *YYCURSOR); +#line 5693 "Zend/zend_language_scanner.c" +yy581: + YYDEBUG(581, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy586; + if (yych == 'I') goto yy582; if (yych != 'i') goto yy150; -yy586: - YYDEBUG(586, *YYCURSOR); +yy582: + YYDEBUG(582, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy587; + if (yych == 'T') goto yy583; if (yych != 't') goto yy150; -yy587: - YYDEBUG(587, *YYCURSOR); +yy583: + YYDEBUG(583, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(588, *YYCURSOR); + YYDEBUG(584, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1274 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_TRAIT); } -#line 5748 "Zend/zend_language_scanner.c" -yy589: - YYDEBUG(589, *YYCURSOR); +#line 5716 "Zend/zend_language_scanner.c" +yy585: + YYDEBUG(585, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy590; + if (yych == 'O') goto yy586; if (yych != 'o') goto yy150; -yy590: - YYDEBUG(590, *YYCURSOR); +yy586: + YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'W') goto yy591; + if (yych == 'W') goto yy587; if (yych != 'w') goto yy150; -yy591: - YYDEBUG(591, *YYCURSOR); +yy587: + YYDEBUG(587, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(592, *YYCURSOR); + YYDEBUG(588, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1166 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_THROW); } -#line 5771 "Zend/zend_language_scanner.c" -yy593: - YYDEBUG(593, *YYCURSOR); +#line 5739 "Zend/zend_language_scanner.c" +yy589: + YYDEBUG(589, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy594; + if (yych == 'E') goto yy590; if (yych != 'e') goto yy150; -yy594: - YYDEBUG(594, *YYCURSOR); +yy590: + YYDEBUG(590, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy595; + if (yych == 'L') goto yy591; if (yych != 'l') goto yy150; -yy595: - YYDEBUG(595, *YYCURSOR); +yy591: + YYDEBUG(591, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy596; + if (yych == 'D') goto yy592; if (yych != 'd') goto yy150; -yy596: - YYDEBUG(596, *YYCURSOR); +yy592: + YYDEBUG(592, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 4) { goto yy149; } if (yych <= '\f') { - if (yych <= 0x08) goto yy597; - if (yych <= '\n') goto yy598; + if (yych <= 0x08) goto yy593; + if (yych <= '\n') goto yy594; } else { - if (yych <= '\r') goto yy598; - if (yych == ' ') goto yy598; + if (yych <= '\r') goto yy594; + if (yych == ' ') goto yy594; } -yy597: - YYDEBUG(597, *YYCURSOR); +yy593: + YYDEBUG(593, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1150 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_YIELD); } -#line 5808 "Zend/zend_language_scanner.c" -yy598: - YYDEBUG(598, *YYCURSOR); +#line 5776 "Zend/zend_language_scanner.c" +yy594: + YYDEBUG(594, *YYCURSOR); ++YYCURSOR; YYFILL(4); yych = *YYCURSOR; - YYDEBUG(599, *YYCURSOR); + YYDEBUG(595, *YYCURSOR); if (yych <= 0x1F) { if (yych <= '\n') { if (yych <= 0x08) goto yy157; - goto yy598; + goto yy594; } else { - if (yych == '\r') goto yy598; + if (yych == '\r') goto yy594; goto yy157; } } else { if (yych <= 'F') { - if (yych <= ' ') goto yy598; + if (yych <= ' ') goto yy594; if (yych <= 'E') goto yy157; } else { if (yych != 'f') goto yy157; } } - YYDEBUG(600, *YYCURSOR); + YYDEBUG(596, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy601; + if (yych == 'R') goto yy597; if (yych != 'r') goto yy157; -yy601: - YYDEBUG(601, *YYCURSOR); +yy597: + YYDEBUG(597, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy602; + if (yych == 'O') goto yy598; if (yych != 'o') goto yy157; -yy602: - YYDEBUG(602, *YYCURSOR); +yy598: + YYDEBUG(598, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy603; + if (yych == 'M') goto yy599; if (yych != 'm') goto yy157; -yy603: - YYDEBUG(603, *YYCURSOR); +yy599: + YYDEBUG(599, *YYCURSOR); ++YYCURSOR; - YYDEBUG(604, *YYCURSOR); + YYDEBUG(600, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1145 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); RETURN_TOKEN(T_YIELD_FROM); } -#line 5855 "Zend/zend_language_scanner.c" -yy605: - YYDEBUG(605, *YYCURSOR); +#line 5823 "Zend/zend_language_scanner.c" +yy601: + YYDEBUG(601, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { - if (yych == 'Q') goto yy607; + if (yych == 'Q') goto yy603; if (yych <= 'S') goto yy150; } else { if (yych <= 'q') { if (yych <= 'p') goto yy150; - goto yy607; + goto yy603; } else { if (yych != 't') goto yy150; } } - YYDEBUG(606, *YYCURSOR); + YYDEBUG(602, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy619; - if (yych == 'u') goto yy619; + if (yych == 'U') goto yy615; + if (yych == 'u') goto yy615; goto yy150; -yy607: - YYDEBUG(607, *YYCURSOR); +yy603: + YYDEBUG(603, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy608; + if (yych == 'U') goto yy604; if (yych != 'u') goto yy150; -yy608: - YYDEBUG(608, *YYCURSOR); +yy604: + YYDEBUG(604, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy609; + if (yych == 'I') goto yy605; if (yych != 'i') goto yy150; -yy609: - YYDEBUG(609, *YYCURSOR); +yy605: + YYDEBUG(605, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy610; + if (yych == 'R') goto yy606; if (yych != 'r') goto yy150; -yy610: - YYDEBUG(610, *YYCURSOR); +yy606: + YYDEBUG(606, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy611; + if (yych == 'E') goto yy607; if (yych != 'e') goto yy150; -yy611: - YYDEBUG(611, *YYCURSOR); +yy607: + YYDEBUG(607, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '9') { if (yych >= '0') goto yy149; } else { - if (yych <= '@') goto yy612; + if (yych <= '@') goto yy608; if (yych <= 'Z') goto yy149; } } else { if (yych <= '`') { - if (yych <= '_') goto yy613; + if (yych <= '_') goto yy609; } else { if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy612: - YYDEBUG(612, *YYCURSOR); +yy608: + YYDEBUG(608, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1380 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_REQUIRE); } -#line 5920 "Zend/zend_language_scanner.c" -yy613: - YYDEBUG(613, *YYCURSOR); +#line 5888 "Zend/zend_language_scanner.c" +yy609: + YYDEBUG(609, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy614; + if (yych == 'O') goto yy610; if (yych != 'o') goto yy150; -yy614: - YYDEBUG(614, *YYCURSOR); +yy610: + YYDEBUG(610, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy615; + if (yych == 'N') goto yy611; if (yych != 'n') goto yy150; -yy615: - YYDEBUG(615, *YYCURSOR); +yy611: + YYDEBUG(611, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy616; + if (yych == 'C') goto yy612; if (yych != 'c') goto yy150; -yy616: - YYDEBUG(616, *YYCURSOR); +yy612: + YYDEBUG(612, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy617; + if (yych == 'E') goto yy613; if (yych != 'e') goto yy150; -yy617: - YYDEBUG(617, *YYCURSOR); +yy613: + YYDEBUG(613, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(618, *YYCURSOR); + YYDEBUG(614, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1384 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_REQUIRE_ONCE); } -#line 5953 "Zend/zend_language_scanner.c" -yy619: - YYDEBUG(619, *YYCURSOR); +#line 5921 "Zend/zend_language_scanner.c" +yy615: + YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy620; + if (yych == 'R') goto yy616; if (yych != 'r') goto yy150; -yy620: - YYDEBUG(620, *YYCURSOR); +yy616: + YYDEBUG(616, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy621; + if (yych == 'N') goto yy617; if (yych != 'n') goto yy150; -yy621: - YYDEBUG(621, *YYCURSOR); +yy617: + YYDEBUG(617, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(622, *YYCURSOR); + YYDEBUG(618, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1141 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_RETURN); } -#line 5976 "Zend/zend_language_scanner.c" -yy623: - YYDEBUG(623, *YYCURSOR); +#line 5944 "Zend/zend_language_scanner.c" +yy619: + YYDEBUG(619, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'L') { if (yych <= 'K') goto yy150; - goto yy646; + goto yy642; } else { if (yych <= 'R') goto yy150; - if (yych <= 'S') goto yy645; - goto yy644; + if (yych <= 'S') goto yy641; + goto yy640; } } else { if (yych <= 'r') { - if (yych == 'l') goto yy646; + if (yych == 'l') goto yy642; goto yy150; } else { - if (yych <= 's') goto yy645; - if (yych <= 't') goto yy644; + if (yych <= 's') goto yy641; + if (yych <= 't') goto yy640; goto yy150; } } -yy624: - YYDEBUG(624, *YYCURSOR); +yy620: + YYDEBUG(620, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { - if (yych == 'A') goto yy636; + if (yych == 'A') goto yy632; if (yych <= 'N') goto yy150; - goto yy637; + goto yy633; } else { if (yych <= 'a') { if (yych <= '`') goto yy150; - goto yy636; + goto yy632; } else { - if (yych == 'o') goto yy637; + if (yych == 'o') goto yy633; goto yy150; } } -yy625: - YYDEBUG(625, *YYCURSOR); +yy621: + YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy626; + if (yych == 'N') goto yy622; if (yych != 'n') goto yy150; -yy626: - YYDEBUG(626, *YYCURSOR); +yy622: + YYDEBUG(622, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'R') goto yy150; - if (yych >= 'T') goto yy628; + if (yych >= 'T') goto yy624; } else { if (yych <= 'r') goto yy150; - if (yych <= 's') goto yy627; - if (yych <= 't') goto yy628; + if (yych <= 's') goto yy623; + if (yych <= 't') goto yy624; goto yy150; } -yy627: - YYDEBUG(627, *YYCURSOR); +yy623: + YYDEBUG(623, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy634; - if (yych == 't') goto yy634; + if (yych == 'T') goto yy630; + if (yych == 't') goto yy630; goto yy150; -yy628: - YYDEBUG(628, *YYCURSOR); +yy624: + YYDEBUG(624, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy629; + if (yych == 'I') goto yy625; if (yych != 'i') goto yy150; -yy629: - YYDEBUG(629, *YYCURSOR); +yy625: + YYDEBUG(625, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy630; + if (yych == 'N') goto yy626; if (yych != 'n') goto yy150; -yy630: - YYDEBUG(630, *YYCURSOR); +yy626: + YYDEBUG(626, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy631; + if (yych == 'U') goto yy627; if (yych != 'u') goto yy150; -yy631: - YYDEBUG(631, *YYCURSOR); +yy627: + YYDEBUG(627, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy632; + if (yych == 'E') goto yy628; if (yych != 'e') goto yy150; -yy632: - YYDEBUG(632, *YYCURSOR); +yy628: + YYDEBUG(628, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(633, *YYCURSOR); + YYDEBUG(629, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1250 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CONTINUE); } -#line 6070 "Zend/zend_language_scanner.c" -yy634: - YYDEBUG(634, *YYCURSOR); +#line 6038 "Zend/zend_language_scanner.c" +yy630: + YYDEBUG(630, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(635, *YYCURSOR); + YYDEBUG(631, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1137 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CONST); } -#line 6083 "Zend/zend_language_scanner.c" -yy636: - YYDEBUG(636, *YYCURSOR); +#line 6051 "Zend/zend_language_scanner.c" +yy632: + YYDEBUG(632, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy641; - if (yych == 's') goto yy641; + if (yych == 'S') goto yy637; + if (yych == 's') goto yy637; goto yy150; -yy637: - YYDEBUG(637, *YYCURSOR); +yy633: + YYDEBUG(633, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy638; + if (yych == 'N') goto yy634; if (yych != 'n') goto yy150; -yy638: - YYDEBUG(638, *YYCURSOR); +yy634: + YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy639; + if (yych == 'E') goto yy635; if (yych != 'e') goto yy150; -yy639: - YYDEBUG(639, *YYCURSOR); +yy635: + YYDEBUG(635, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(640, *YYCURSOR); + YYDEBUG(636, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1332 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CLONE); } -#line 6112 "Zend/zend_language_scanner.c" -yy641: - YYDEBUG(641, *YYCURSOR); +#line 6080 "Zend/zend_language_scanner.c" +yy637: + YYDEBUG(637, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy642; + if (yych == 'S') goto yy638; if (yych != 's') goto yy150; -yy642: - YYDEBUG(642, *YYCURSOR); +yy638: + YYDEBUG(638, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(643, *YYCURSOR); + YYDEBUG(639, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1266 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CLASS); } -#line 6130 "Zend/zend_language_scanner.c" -yy644: - YYDEBUG(644, *YYCURSOR); +#line 6098 "Zend/zend_language_scanner.c" +yy640: + YYDEBUG(640, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy655; - if (yych == 'c') goto yy655; + if (yych == 'C') goto yy651; + if (yych == 'c') goto yy651; goto yy150; -yy645: - YYDEBUG(645, *YYCURSOR); +yy641: + YYDEBUG(641, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy653; - if (yych == 'e') goto yy653; + if (yych == 'E') goto yy649; + if (yych == 'e') goto yy649; goto yy150; -yy646: - YYDEBUG(646, *YYCURSOR); +yy642: + YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy647; + if (yych == 'L') goto yy643; if (yych != 'l') goto yy150; -yy647: - YYDEBUG(647, *YYCURSOR); +yy643: + YYDEBUG(643, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy648; + if (yych == 'A') goto yy644; if (yych != 'a') goto yy150; -yy648: - YYDEBUG(648, *YYCURSOR); +yy644: + YYDEBUG(644, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy649; + if (yych == 'B') goto yy645; if (yych != 'b') goto yy150; -yy649: - YYDEBUG(649, *YYCURSOR); +yy645: + YYDEBUG(645, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy650; + if (yych == 'L') goto yy646; if (yych != 'l') goto yy150; -yy650: - YYDEBUG(650, *YYCURSOR); +yy646: + YYDEBUG(646, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy651; + if (yych == 'E') goto yy647; if (yych != 'e') goto yy150; -yy651: - YYDEBUG(651, *YYCURSOR); +yy647: + YYDEBUG(647, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(652, *YYCURSOR); + YYDEBUG(648, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1456 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CALLABLE); } -#line 6180 "Zend/zend_language_scanner.c" -yy653: - YYDEBUG(653, *YYCURSOR); +#line 6148 "Zend/zend_language_scanner.c" +yy649: + YYDEBUG(649, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(654, *YYCURSOR); + YYDEBUG(650, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1238 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CASE); } -#line 6193 "Zend/zend_language_scanner.c" -yy655: - YYDEBUG(655, *YYCURSOR); +#line 6161 "Zend/zend_language_scanner.c" +yy651: + YYDEBUG(651, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy656; + if (yych == 'H') goto yy652; if (yych != 'h') goto yy150; -yy656: - YYDEBUG(656, *YYCURSOR); +yy652: + YYDEBUG(652, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(657, *YYCURSOR); + YYDEBUG(653, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1158 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_CATCH); } -#line 6211 "Zend/zend_language_scanner.c" -yy658: - YYDEBUG(658, *YYCURSOR); +#line 6179 "Zend/zend_language_scanner.c" +yy654: + YYDEBUG(654, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy675; - if (yych == 'n') goto yy675; + if (yych == 'N') goto yy671; + if (yych == 'n') goto yy671; goto yy150; -yy659: - YYDEBUG(659, *YYCURSOR); +yy655: + YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy668; - if (yych == 'r') goto yy668; + if (yych == 'R') goto yy664; + if (yych == 'r') goto yy664; goto yy150; -yy660: - YYDEBUG(660, *YYCURSOR); +yy656: + YYDEBUG(656, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy661; + if (yych == 'N') goto yy657; if (yych != 'n') goto yy150; -yy661: - YYDEBUG(661, *YYCURSOR); +yy657: + YYDEBUG(657, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy662; + if (yych == 'C') goto yy658; if (yych != 'c') goto yy150; -yy662: - YYDEBUG(662, *YYCURSOR); +yy658: + YYDEBUG(658, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy663; + if (yych == 'T') goto yy659; if (yych != 't') goto yy150; -yy663: - YYDEBUG(663, *YYCURSOR); +yy659: + YYDEBUG(659, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy664; + if (yych == 'I') goto yy660; if (yych != 'i') goto yy150; -yy664: - YYDEBUG(664, *YYCURSOR); +yy660: + YYDEBUG(660, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy665; + if (yych == 'O') goto yy661; if (yych != 'o') goto yy150; -yy665: - YYDEBUG(665, *YYCURSOR); +yy661: + YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy666; + if (yych == 'N') goto yy662; if (yych != 'n') goto yy150; -yy666: - YYDEBUG(666, *YYCURSOR); +yy662: + YYDEBUG(662, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(667, *YYCURSOR); + YYDEBUG(663, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1133 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FUNCTION); } -#line 6266 "Zend/zend_language_scanner.c" -yy668: - YYDEBUG(668, *YYCURSOR); +#line 6234 "Zend/zend_language_scanner.c" +yy664: + YYDEBUG(664, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy669; + if (yych <= '/') goto yy665; if (yych <= '9') goto yy149; } else { - if (yych == 'E') goto yy670; + if (yych == 'E') goto yy666; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'd') { if (yych != '`') goto yy149; } else { - if (yych <= 'e') goto yy670; + if (yych <= 'e') goto yy666; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy669: - YYDEBUG(669, *YYCURSOR); +yy665: + YYDEBUG(665, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1198 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FOR); } -#line 6294 "Zend/zend_language_scanner.c" -yy670: - YYDEBUG(670, *YYCURSOR); +#line 6262 "Zend/zend_language_scanner.c" +yy666: + YYDEBUG(666, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy671; + if (yych == 'A') goto yy667; if (yych != 'a') goto yy150; -yy671: - YYDEBUG(671, *YYCURSOR); +yy667: + YYDEBUG(667, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy672; + if (yych == 'C') goto yy668; if (yych != 'c') goto yy150; -yy672: - YYDEBUG(672, *YYCURSOR); +yy668: + YYDEBUG(668, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy673; + if (yych == 'H') goto yy669; if (yych != 'h') goto yy150; -yy673: - YYDEBUG(673, *YYCURSOR); +yy669: + YYDEBUG(669, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(674, *YYCURSOR); + YYDEBUG(670, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1206 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FOREACH); } -#line 6322 "Zend/zend_language_scanner.c" -yy675: - YYDEBUG(675, *YYCURSOR); +#line 6290 "Zend/zend_language_scanner.c" +yy671: + YYDEBUG(671, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy676; + if (yych == 'A') goto yy672; if (yych != 'a') goto yy150; -yy676: - YYDEBUG(676, *YYCURSOR); +yy672: + YYDEBUG(672, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy677; + if (yych == 'L') goto yy673; if (yych != 'l') goto yy150; -yy677: - YYDEBUG(677, *YYCURSOR); +yy673: + YYDEBUG(673, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy678; + if (yych <= '/') goto yy674; if (yych <= '9') goto yy149; } else { - if (yych == 'L') goto yy679; + if (yych == 'L') goto yy675; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'k') { if (yych != '`') goto yy149; } else { - if (yych <= 'l') goto yy679; + if (yych <= 'l') goto yy675; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy678: - YYDEBUG(678, *YYCURSOR); +yy674: + YYDEBUG(674, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1424 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FINAL); } -#line 6360 "Zend/zend_language_scanner.c" -yy679: - YYDEBUG(679, *YYCURSOR); +#line 6328 "Zend/zend_language_scanner.c" +yy675: + YYDEBUG(675, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy680; + if (yych == 'Y') goto yy676; if (yych != 'y') goto yy150; -yy680: - YYDEBUG(680, *YYCURSOR); +yy676: + YYDEBUG(676, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(681, *YYCURSOR); + YYDEBUG(677, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1162 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_FINALLY); } -#line 6378 "Zend/zend_language_scanner.c" -yy682: - YYDEBUG(682, *YYCURSOR); +#line 6346 "Zend/zend_language_scanner.c" +yy678: + YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'F') { - if (yych == 'C') goto yy688; + if (yych == 'C') goto yy684; if (yych <= 'E') goto yy150; - goto yy689; + goto yy685; } else { if (yych <= 'c') { if (yych <= 'b') goto yy150; - goto yy688; + goto yy684; } else { - if (yych == 'f') goto yy689; + if (yych == 'f') goto yy685; goto yy150; } } -yy683: - YYDEBUG(683, *YYCURSOR); +yy679: + YYDEBUG(679, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy686; - if (yych == 'e') goto yy686; + if (yych == 'E') goto yy682; + if (yych == 'e') goto yy682; goto yy150; -yy684: - YYDEBUG(684, *YYCURSOR); +yy680: + YYDEBUG(680, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(685, *YYCURSOR); + YYDEBUG(681, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1194 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_DO); } -#line 6413 "Zend/zend_language_scanner.c" -yy686: - YYDEBUG(686, *YYCURSOR); +#line 6381 "Zend/zend_language_scanner.c" +yy682: + YYDEBUG(682, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(687, *YYCURSOR); + YYDEBUG(683, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1129 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EXIT); } -#line 6426 "Zend/zend_language_scanner.c" -yy688: - YYDEBUG(688, *YYCURSOR); +#line 6394 "Zend/zend_language_scanner.c" +yy684: + YYDEBUG(684, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy695; - if (yych == 'l') goto yy695; + if (yych == 'L') goto yy691; + if (yych == 'l') goto yy691; goto yy150; -yy689: - YYDEBUG(689, *YYCURSOR); +yy685: + YYDEBUG(685, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy690; + if (yych == 'A') goto yy686; if (yych != 'a') goto yy150; -yy690: - YYDEBUG(690, *YYCURSOR); +yy686: + YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy691; + if (yych == 'U') goto yy687; if (yych != 'u') goto yy150; -yy691: - YYDEBUG(691, *YYCURSOR); +yy687: + YYDEBUG(687, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy692; + if (yych == 'L') goto yy688; if (yych != 'l') goto yy150; -yy692: - YYDEBUG(692, *YYCURSOR); +yy688: + YYDEBUG(688, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy693; + if (yych == 'T') goto yy689; if (yych != 't') goto yy150; -yy693: - YYDEBUG(693, *YYCURSOR); +yy689: + YYDEBUG(689, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(694, *YYCURSOR); + YYDEBUG(690, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1242 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_DEFAULT); } -#line 6465 "Zend/zend_language_scanner.c" -yy695: - YYDEBUG(695, *YYCURSOR); +#line 6433 "Zend/zend_language_scanner.c" +yy691: + YYDEBUG(691, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy696; + if (yych == 'A') goto yy692; if (yych != 'a') goto yy150; -yy696: - YYDEBUG(696, *YYCURSOR); +yy692: + YYDEBUG(692, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy697; + if (yych == 'R') goto yy693; if (yych != 'r') goto yy150; -yy697: - YYDEBUG(697, *YYCURSOR); +yy693: + YYDEBUG(693, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy698; + if (yych == 'E') goto yy694; if (yych != 'e') goto yy150; -yy698: - YYDEBUG(698, *YYCURSOR); +yy694: + YYDEBUG(694, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(699, *YYCURSOR); + YYDEBUG(695, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1214 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_DECLARE); } -#line 6493 "Zend/zend_language_scanner.c" -yy700: - YYDEBUG(700, *YYCURSOR); +#line 6461 "Zend/zend_language_scanner.c" +yy696: + YYDEBUG(696, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy762; - if (yych == 'h') goto yy762; + if (yych == 'H') goto yy758; + if (yych == 'h') goto yy758; goto yy150; -yy701: - YYDEBUG(701, *YYCURSOR); +yy697: + YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy756; - if (yych == 's') goto yy756; + if (yych == 'S') goto yy752; + if (yych == 's') goto yy752; goto yy150; -yy702: - YYDEBUG(702, *YYCURSOR); +yy698: + YYDEBUG(698, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy752; - if (yych == 'p') goto yy752; + if (yych == 'P') goto yy748; + if (yych == 'p') goto yy748; goto yy150; -yy703: - YYDEBUG(703, *YYCURSOR); +yy699: + YYDEBUG(699, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy718; - if (yych == 'd') goto yy718; + if (yych == 'D') goto yy714; + if (yych == 'd') goto yy714; goto yy150; -yy704: - YYDEBUG(704, *YYCURSOR); +yy700: + YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy715; - if (yych == 'a') goto yy715; + if (yych == 'A') goto yy711; + if (yych == 'a') goto yy711; goto yy150; -yy705: - YYDEBUG(705, *YYCURSOR); +yy701: + YYDEBUG(701, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { - if (yych == 'I') goto yy706; + if (yych == 'I') goto yy702; if (yych <= 'S') goto yy150; - goto yy707; + goto yy703; } else { if (yych <= 'i') { if (yych <= 'h') goto yy150; } else { - if (yych == 't') goto yy707; + if (yych == 't') goto yy703; goto yy150; } } -yy706: - YYDEBUG(706, *YYCURSOR); +yy702: + YYDEBUG(702, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy713; - if (yych == 't') goto yy713; + if (yych == 'T') goto yy709; + if (yych == 't') goto yy709; goto yy150; -yy707: - YYDEBUG(707, *YYCURSOR); +yy703: + YYDEBUG(703, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy708; + if (yych == 'E') goto yy704; if (yych != 'e') goto yy150; -yy708: - YYDEBUG(708, *YYCURSOR); +yy704: + YYDEBUG(704, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy709; + if (yych == 'N') goto yy705; if (yych != 'n') goto yy150; -yy709: - YYDEBUG(709, *YYCURSOR); +yy705: + YYDEBUG(705, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy710; + if (yych == 'D') goto yy706; if (yych != 'd') goto yy150; -yy710: - YYDEBUG(710, *YYCURSOR); +yy706: + YYDEBUG(706, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy711; + if (yych == 'S') goto yy707; if (yych != 's') goto yy150; -yy711: - YYDEBUG(711, *YYCURSOR); +yy707: + YYDEBUG(707, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(712, *YYCURSOR); + YYDEBUG(708, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1278 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EXTENDS); } -#line 6577 "Zend/zend_language_scanner.c" -yy713: - YYDEBUG(713, *YYCURSOR); +#line 6545 "Zend/zend_language_scanner.c" +yy709: + YYDEBUG(709, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(714, *YYCURSOR); + YYDEBUG(710, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1125 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EXIT); } -#line 6590 "Zend/zend_language_scanner.c" -yy715: - YYDEBUG(715, *YYCURSOR); +#line 6558 "Zend/zend_language_scanner.c" +yy711: + YYDEBUG(711, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy716; + if (yych == 'L') goto yy712; if (yych != 'l') goto yy150; -yy716: - YYDEBUG(716, *YYCURSOR); +yy712: + YYDEBUG(712, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(717, *YYCURSOR); + YYDEBUG(713, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1368 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EVAL); } -#line 6608 "Zend/zend_language_scanner.c" -yy718: - YYDEBUG(718, *YYCURSOR); +#line 6576 "Zend/zend_language_scanner.c" +yy714: + YYDEBUG(714, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch (yych) { case 'D': - case 'd': goto yy719; + case 'd': goto yy715; case 'F': - case 'f': goto yy720; + case 'f': goto yy716; case 'I': - case 'i': goto yy721; + case 'i': goto yy717; case 'S': - case 's': goto yy722; + case 's': goto yy718; case 'W': - case 'w': goto yy723; + case 'w': goto yy719; default: goto yy150; } -yy719: - YYDEBUG(719, *YYCURSOR); +yy715: + YYDEBUG(715, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy745; - if (yych == 'e') goto yy745; + if (yych == 'E') goto yy741; + if (yych == 'e') goto yy741; goto yy150; -yy720: - YYDEBUG(720, *YYCURSOR); +yy716: + YYDEBUG(716, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy737; - if (yych == 'o') goto yy737; + if (yych == 'O') goto yy733; + if (yych == 'o') goto yy733; goto yy150; -yy721: - YYDEBUG(721, *YYCURSOR); +yy717: + YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy735; - if (yych == 'f') goto yy735; + if (yych == 'F') goto yy731; + if (yych == 'f') goto yy731; goto yy150; -yy722: - YYDEBUG(722, *YYCURSOR); +yy718: + YYDEBUG(718, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'W') goto yy729; - if (yych == 'w') goto yy729; + if (yych == 'W') goto yy725; + if (yych == 'w') goto yy725; goto yy150; -yy723: - YYDEBUG(723, *YYCURSOR); +yy719: + YYDEBUG(719, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy724; + if (yych == 'H') goto yy720; if (yych != 'h') goto yy150; -yy724: - YYDEBUG(724, *YYCURSOR); +yy720: + YYDEBUG(720, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy725; + if (yych == 'I') goto yy721; if (yych != 'i') goto yy150; -yy725: - YYDEBUG(725, *YYCURSOR); +yy721: + YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy726; + if (yych == 'L') goto yy722; if (yych != 'l') goto yy150; -yy726: - YYDEBUG(726, *YYCURSOR); +yy722: + YYDEBUG(722, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy727; + if (yych == 'E') goto yy723; if (yych != 'e') goto yy150; -yy727: - YYDEBUG(727, *YYCURSOR); +yy723: + YYDEBUG(723, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(728, *YYCURSOR); + YYDEBUG(724, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1190 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDWHILE); } -#line 6682 "Zend/zend_language_scanner.c" -yy729: - YYDEBUG(729, *YYCURSOR); +#line 6650 "Zend/zend_language_scanner.c" +yy725: + YYDEBUG(725, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy730; + if (yych == 'I') goto yy726; if (yych != 'i') goto yy150; -yy730: - YYDEBUG(730, *YYCURSOR); +yy726: + YYDEBUG(726, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy731; + if (yych == 'T') goto yy727; if (yych != 't') goto yy150; -yy731: - YYDEBUG(731, *YYCURSOR); +yy727: + YYDEBUG(727, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy732; + if (yych == 'C') goto yy728; if (yych != 'c') goto yy150; -yy732: - YYDEBUG(732, *YYCURSOR); +yy728: + YYDEBUG(728, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy733; + if (yych == 'H') goto yy729; if (yych != 'h') goto yy150; -yy733: - YYDEBUG(733, *YYCURSOR); +yy729: + YYDEBUG(729, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(734, *YYCURSOR); + YYDEBUG(730, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1234 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDSWITCH); } -#line 6715 "Zend/zend_language_scanner.c" -yy735: - YYDEBUG(735, *YYCURSOR); +#line 6683 "Zend/zend_language_scanner.c" +yy731: + YYDEBUG(731, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(736, *YYCURSOR); + YYDEBUG(732, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1178 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDIF); } -#line 6728 "Zend/zend_language_scanner.c" -yy737: - YYDEBUG(737, *YYCURSOR); +#line 6696 "Zend/zend_language_scanner.c" +yy733: + YYDEBUG(733, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy738; + if (yych == 'R') goto yy734; if (yych != 'r') goto yy150; -yy738: - YYDEBUG(738, *YYCURSOR); +yy734: + YYDEBUG(734, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy739; + if (yych <= '/') goto yy735; if (yych <= '9') goto yy149; } else { - if (yych == 'E') goto yy740; + if (yych == 'E') goto yy736; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'd') { if (yych != '`') goto yy149; } else { - if (yych <= 'e') goto yy740; + if (yych <= 'e') goto yy736; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy739: - YYDEBUG(739, *YYCURSOR); +yy735: + YYDEBUG(735, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1202 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDFOR); } -#line 6761 "Zend/zend_language_scanner.c" -yy740: - YYDEBUG(740, *YYCURSOR); +#line 6729 "Zend/zend_language_scanner.c" +yy736: + YYDEBUG(736, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy741; + if (yych == 'A') goto yy737; if (yych != 'a') goto yy150; -yy741: - YYDEBUG(741, *YYCURSOR); +yy737: + YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy742; + if (yych == 'C') goto yy738; if (yych != 'c') goto yy150; -yy742: - YYDEBUG(742, *YYCURSOR); +yy738: + YYDEBUG(738, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy743; + if (yych == 'H') goto yy739; if (yych != 'h') goto yy150; -yy743: - YYDEBUG(743, *YYCURSOR); +yy739: + YYDEBUG(739, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(744, *YYCURSOR); + YYDEBUG(740, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1210 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDFOREACH); } -#line 6789 "Zend/zend_language_scanner.c" -yy745: - YYDEBUG(745, *YYCURSOR); +#line 6757 "Zend/zend_language_scanner.c" +yy741: + YYDEBUG(741, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy746; + if (yych == 'C') goto yy742; if (yych != 'c') goto yy150; -yy746: - YYDEBUG(746, *YYCURSOR); +yy742: + YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy747; + if (yych == 'L') goto yy743; if (yych != 'l') goto yy150; -yy747: - YYDEBUG(747, *YYCURSOR); +yy743: + YYDEBUG(743, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy748; + if (yych == 'A') goto yy744; if (yych != 'a') goto yy150; -yy748: - YYDEBUG(748, *YYCURSOR); +yy744: + YYDEBUG(744, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy749; + if (yych == 'R') goto yy745; if (yych != 'r') goto yy150; -yy749: - YYDEBUG(749, *YYCURSOR); +yy745: + YYDEBUG(745, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy750; + if (yych == 'E') goto yy746; if (yych != 'e') goto yy150; -yy750: - YYDEBUG(750, *YYCURSOR); +yy746: + YYDEBUG(746, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(751, *YYCURSOR); + YYDEBUG(747, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1218 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ENDDECLARE); } -#line 6827 "Zend/zend_language_scanner.c" -yy752: - YYDEBUG(752, *YYCURSOR); +#line 6795 "Zend/zend_language_scanner.c" +yy748: + YYDEBUG(748, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy753; + if (yych == 'T') goto yy749; if (yych != 't') goto yy150; -yy753: - YYDEBUG(753, *YYCURSOR); +yy749: + YYDEBUG(749, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy754; + if (yych == 'Y') goto yy750; if (yych != 'y') goto yy150; -yy754: - YYDEBUG(754, *YYCURSOR); +yy750: + YYDEBUG(750, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(755, *YYCURSOR); + YYDEBUG(751, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1408 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_EMPTY); } -#line 6850 "Zend/zend_language_scanner.c" -yy756: - YYDEBUG(756, *YYCURSOR); +#line 6818 "Zend/zend_language_scanner.c" +yy752: + YYDEBUG(752, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy757; + if (yych == 'E') goto yy753; if (yych != 'e') goto yy150; -yy757: - YYDEBUG(757, *YYCURSOR); +yy753: + YYDEBUG(753, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '^') { if (yych <= '@') { - if (yych <= '/') goto yy758; + if (yych <= '/') goto yy754; if (yych <= '9') goto yy149; } else { - if (yych == 'I') goto yy759; + if (yych == 'I') goto yy755; if (yych <= 'Z') goto yy149; } } else { if (yych <= 'h') { if (yych != '`') goto yy149; } else { - if (yych <= 'i') goto yy759; + if (yych <= 'i') goto yy755; if (yych <= 'z') goto yy149; if (yych >= 0x80) goto yy149; } } -yy758: - YYDEBUG(758, *YYCURSOR); +yy754: + YYDEBUG(754, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1182 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ELSE); } -#line 6883 "Zend/zend_language_scanner.c" -yy759: - YYDEBUG(759, *YYCURSOR); +#line 6851 "Zend/zend_language_scanner.c" +yy755: + YYDEBUG(755, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy760; + if (yych == 'F') goto yy756; if (yych != 'f') goto yy150; -yy760: - YYDEBUG(760, *YYCURSOR); +yy756: + YYDEBUG(756, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(761, *YYCURSOR); + YYDEBUG(757, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1174 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ELSEIF); } -#line 6901 "Zend/zend_language_scanner.c" -yy762: - YYDEBUG(762, *YYCURSOR); +#line 6869 "Zend/zend_language_scanner.c" +yy758: + YYDEBUG(758, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy763; + if (yych == 'O') goto yy759; if (yych != 'o') goto yy150; -yy763: - YYDEBUG(763, *YYCURSOR); +yy759: + YYDEBUG(759, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy149; } - YYDEBUG(764, *YYCURSOR); + YYDEBUG(760, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1258 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_ECHO); } -#line 6919 "Zend/zend_language_scanner.c" +#line 6887 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -6954,52 +6922,52 @@ int start_line = CG(zend_lineno); 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, }; - YYDEBUG(765, *YYCURSOR); + YYDEBUG(761, *YYCURSOR); YYFILL(2); yych = *YYCURSOR; if (yych <= '-') { if (yych <= '\r') { - if (yych <= 0x08) goto yy773; - if (yych <= '\n') goto yy767; - if (yych <= '\f') goto yy773; + if (yych <= 0x08) goto yy769; + if (yych <= '\n') goto yy763; + if (yych <= '\f') goto yy769; } else { - if (yych == ' ') goto yy767; - if (yych <= ',') goto yy773; - goto yy769; + if (yych == ' ') goto yy763; + if (yych <= ',') goto yy769; + goto yy765; } } else { if (yych <= '_') { - if (yych <= '@') goto yy773; - if (yych <= 'Z') goto yy771; - if (yych <= '^') goto yy773; - goto yy771; + if (yych <= '@') goto yy769; + if (yych <= 'Z') goto yy767; + if (yych <= '^') goto yy769; + goto yy767; } else { - if (yych <= '`') goto yy773; - if (yych <= 'z') goto yy771; - if (yych <= 0x7F) goto yy773; - goto yy771; + if (yych <= '`') goto yy769; + if (yych <= 'z') goto yy767; + if (yych <= 0x7F) goto yy769; + goto yy767; } } -yy767: - YYDEBUG(767, *YYCURSOR); +yy763: + YYDEBUG(763, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy779; -yy768: - YYDEBUG(768, *YYCURSOR); + goto yy775; +yy764: + YYDEBUG(764, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1291 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); RETURN_TOKEN(T_WHITESPACE); } -#line 6997 "Zend/zend_language_scanner.c" -yy769: - YYDEBUG(769, *YYCURSOR); +#line 6965 "Zend/zend_language_scanner.c" +yy765: + YYDEBUG(765, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) == '>') goto yy776; -yy770: - YYDEBUG(770, *YYCURSOR); + if ((yych = *YYCURSOR) == '>') goto yy772; +yy766: + YYDEBUG(766, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1306 "Zend/zend_language_scanner.l" { @@ -7007,14 +6975,14 @@ int start_line = CG(zend_lineno); yy_pop_state(); goto restart; } -#line 7011 "Zend/zend_language_scanner.c" -yy771: - YYDEBUG(771, *YYCURSOR); +#line 6979 "Zend/zend_language_scanner.c" +yy767: + YYDEBUG(767, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy775; -yy772: - YYDEBUG(772, *YYCURSOR); + goto yy771; +yy768: + YYDEBUG(768, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1300 "Zend/zend_language_scanner.l" { @@ -7022,43 +6990,43 @@ int start_line = CG(zend_lineno); zend_copy_value(zendlval, yytext, yyleng); RETURN_TOKEN(T_STRING); } -#line 7026 "Zend/zend_language_scanner.c" -yy773: - YYDEBUG(773, *YYCURSOR); +#line 6994 "Zend/zend_language_scanner.c" +yy769: + YYDEBUG(769, *YYCURSOR); yych = *++YYCURSOR; - goto yy770; -yy774: - YYDEBUG(774, *YYCURSOR); + goto yy766; +yy770: + YYDEBUG(770, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy775: - YYDEBUG(775, *YYCURSOR); +yy771: + YYDEBUG(771, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy774; + goto yy770; } - goto yy772; -yy776: - YYDEBUG(776, *YYCURSOR); + goto yy768; +yy772: + YYDEBUG(772, *YYCURSOR); ++YYCURSOR; - YYDEBUG(777, *YYCURSOR); + YYDEBUG(773, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1296 "Zend/zend_language_scanner.l" { RETURN_TOKEN(T_OBJECT_OPERATOR); } -#line 7051 "Zend/zend_language_scanner.c" -yy778: - YYDEBUG(778, *YYCURSOR); +#line 7019 "Zend/zend_language_scanner.c" +yy774: + YYDEBUG(774, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy779: - YYDEBUG(779, *YYCURSOR); +yy775: + YYDEBUG(775, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy778; + goto yy774; } - goto yy768; + goto yy764; } /* *********************************** */ yyc_ST_LOOKING_FOR_VARNAME: @@ -7097,41 +7065,41 @@ int start_line = CG(zend_lineno); 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; - YYDEBUG(780, *YYCURSOR); + YYDEBUG(776, *YYCURSOR); YYFILL(2); yych = *YYCURSOR; if (yych <= '_') { - if (yych <= '@') goto yy784; - if (yych <= 'Z') goto yy782; - if (yych <= '^') goto yy784; + if (yych <= '@') goto yy780; + if (yych <= 'Z') goto yy778; + if (yych <= '^') goto yy780; } else { - if (yych <= '`') goto yy784; - if (yych <= 'z') goto yy782; - if (yych <= 0x7F) goto yy784; + if (yych <= '`') goto yy780; + if (yych <= 'z') goto yy778; + if (yych <= 0x7F) goto yy780; } -yy782: - YYDEBUG(782, *YYCURSOR); +yy778: + YYDEBUG(778, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '_') { if (yych <= '@') { - if (yych <= '/') goto yy783; - if (yych <= '9') goto yy786; + if (yych <= '/') goto yy779; + if (yych <= '9') goto yy782; } else { - if (yych <= '[') goto yy786; - if (yych >= '_') goto yy786; + if (yych <= '[') goto yy782; + if (yych >= '_') goto yy782; } } else { if (yych <= '|') { - if (yych <= '`') goto yy783; - if (yych <= 'z') goto yy786; + if (yych <= '`') goto yy779; + if (yych <= 'z') goto yy782; } else { - if (yych <= '}') goto yy786; - if (yych >= 0x80) goto yy786; + if (yych <= '}') goto yy782; + if (yych >= 0x80) goto yy782; } } -yy783: - YYDEBUG(783, *YYCURSOR); +yy779: + YYDEBUG(779, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1611 "Zend/zend_language_scanner.l" { @@ -7140,30 +7108,30 @@ int start_line = CG(zend_lineno); yy_push_state(ST_IN_SCRIPTING); goto restart; } -#line 7144 "Zend/zend_language_scanner.c" -yy784: - YYDEBUG(784, *YYCURSOR); +#line 7112 "Zend/zend_language_scanner.c" +yy780: + YYDEBUG(780, *YYCURSOR); yych = *++YYCURSOR; - goto yy783; -yy785: - YYDEBUG(785, *YYCURSOR); + goto yy779; +yy781: + YYDEBUG(781, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy786: - YYDEBUG(786, *YYCURSOR); +yy782: + YYDEBUG(782, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy785; + goto yy781; } - if (yych == '[') goto yy788; - if (yych == '}') goto yy788; - YYDEBUG(787, *YYCURSOR); + if (yych == '[') goto yy784; + if (yych == '}') goto yy784; + YYDEBUG(783, *YYCURSOR); YYCURSOR = YYMARKER; - goto yy783; -yy788: - YYDEBUG(788, *YYCURSOR); + goto yy779; +yy784: + YYDEBUG(784, *YYCURSOR); ++YYCURSOR; - YYDEBUG(789, *YYCURSOR); + YYDEBUG(785, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1602 "Zend/zend_language_scanner.l" { @@ -7173,16 +7141,16 @@ int start_line = CG(zend_lineno); yy_push_state(ST_IN_SCRIPTING); RETURN_TOKEN(T_STRING_VARNAME); } -#line 7177 "Zend/zend_language_scanner.c" +#line 7145 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: - YYDEBUG(790, *YYCURSOR); + YYDEBUG(786, *YYCURSOR); YYFILL(1); yych = *YYCURSOR; - YYDEBUG(792, *YYCURSOR); + YYDEBUG(788, *YYCURSOR); ++YYCURSOR; - YYDEBUG(793, *YYCURSOR); + YYDEBUG(789, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 2327 "Zend/zend_language_scanner.l" { @@ -7240,7 +7208,7 @@ int start_line = CG(zend_lineno); HANDLE_NEWLINES(yytext, yyleng - newline); RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE); } -#line 7244 "Zend/zend_language_scanner.c" +#line 7212 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7278,72 +7246,72 @@ int start_line = CG(zend_lineno); 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, }; - YYDEBUG(794, *YYCURSOR); + YYDEBUG(790, *YYCURSOR); YYFILL(3); yych = *YYCURSOR; if (yych <= '0') { if (yych <= ' ') { if (yych <= '\f') { - if (yych <= 0x08) goto yy808; - if (yych <= '\n') goto yy804; - goto yy808; - } else { - if (yych <= '\r') goto yy804; - if (yych <= 0x1F) goto yy808; + if (yych <= 0x08) goto yy804; + if (yych <= '\n') goto yy800; goto yy804; + } else { + if (yych <= '\r') goto yy800; + if (yych <= 0x1F) goto yy804; + goto yy800; } } else { if (yych <= '$') { - if (yych <= '"') goto yy803; - if (yych <= '#') goto yy804; - goto yy799; + if (yych <= '"') goto yy799; + if (yych <= '#') goto yy800; + goto yy795; } else { - if (yych == '\'') goto yy804; - if (yych <= '/') goto yy803; + if (yych == '\'') goto yy800; + if (yych <= '/') goto yy799; } } } else { if (yych <= ']') { if (yych <= 'Z') { - if (yych <= '9') goto yy798; - if (yych <= '@') goto yy803; - goto yy806; + if (yych <= '9') goto yy794; + if (yych <= '@') goto yy799; + goto yy802; } else { - if (yych <= '[') goto yy803; - if (yych <= '\\') goto yy804; - goto yy801; + if (yych <= '[') goto yy799; + if (yych <= '\\') goto yy800; + goto yy797; } } else { if (yych <= '`') { - if (yych == '_') goto yy806; - goto yy803; + if (yych == '_') goto yy802; + goto yy799; } else { - if (yych <= 'z') goto yy806; - if (yych <= '~') goto yy803; - if (yych <= 0x7F) goto yy808; - goto yy806; + if (yych <= 'z') goto yy802; + if (yych <= '~') goto yy799; + if (yych <= 0x7F) goto yy804; + goto yy802; } } } - YYDEBUG(796, *YYCURSOR); + YYDEBUG(792, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= '9') { - if (yych >= '0') goto yy820; + if (yych >= '0') goto yy816; } else { - if (yych == 'B') goto yy817; + if (yych == 'B') goto yy813; } } else { if (yych <= 'b') { - if (yych <= 'X') goto yy819; - if (yych >= 'b') goto yy817; + if (yych <= 'X') goto yy815; + if (yych >= 'b') goto yy813; } else { - if (yych == 'x') goto yy819; + if (yych == 'x') goto yy815; } } -yy797: - YYDEBUG(797, *YYCURSOR); +yy793: + YYDEBUG(793, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1719 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ @@ -7361,51 +7329,51 @@ int start_line = CG(zend_lineno); } RETURN_TOKEN(T_NUM_STRING); } -#line 7365 "Zend/zend_language_scanner.c" -yy798: - YYDEBUG(798, *YYCURSOR); +#line 7333 "Zend/zend_language_scanner.c" +yy794: + YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; - goto yy816; -yy799: - YYDEBUG(799, *YYCURSOR); + goto yy812; +yy795: + YYDEBUG(795, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '_') { - if (yych <= '@') goto yy800; - if (yych <= 'Z') goto yy812; - if (yych >= '_') goto yy812; + if (yych <= '@') goto yy796; + if (yych <= 'Z') goto yy808; + if (yych >= '_') goto yy808; } else { - if (yych <= '`') goto yy800; - if (yych <= 'z') goto yy812; - if (yych >= 0x80) goto yy812; + if (yych <= '`') goto yy796; + if (yych <= 'z') goto yy808; + if (yych >= 0x80) goto yy808; } -yy800: - YYDEBUG(800, *YYCURSOR); +yy796: + YYDEBUG(796, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1879 "Zend/zend_language_scanner.l" { /* Only '[' or '-' can be valid, but returning other tokens will allow a more explicit parse error */ RETURN_TOKEN(yytext[0]); } -#line 7390 "Zend/zend_language_scanner.c" -yy801: - YYDEBUG(801, *YYCURSOR); +#line 7358 "Zend/zend_language_scanner.c" +yy797: + YYDEBUG(797, *YYCURSOR); ++YYCURSOR; - YYDEBUG(802, *YYCURSOR); + YYDEBUG(798, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1874 "Zend/zend_language_scanner.l" { yy_pop_state(); RETURN_TOKEN(']'); } -#line 7401 "Zend/zend_language_scanner.c" -yy803: - YYDEBUG(803, *YYCURSOR); +#line 7369 "Zend/zend_language_scanner.c" +yy799: + YYDEBUG(799, *YYCURSOR); yych = *++YYCURSOR; - goto yy800; -yy804: - YYDEBUG(804, *YYCURSOR); + goto yy796; +yy800: + YYDEBUG(800, *YYCURSOR); ++YYCURSOR; - YYDEBUG(805, *YYCURSOR); + YYDEBUG(801, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1884 "Zend/zend_language_scanner.l" { @@ -7415,25 +7383,25 @@ int start_line = CG(zend_lineno); ZVAL_NULL(zendlval); RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE); } -#line 7419 "Zend/zend_language_scanner.c" -yy806: - YYDEBUG(806, *YYCURSOR); +#line 7387 "Zend/zend_language_scanner.c" +yy802: + YYDEBUG(802, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy811; -yy807: - YYDEBUG(807, *YYCURSOR); + goto yy807; +yy803: + YYDEBUG(803, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1892 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); RETURN_TOKEN(T_STRING); } -#line 7433 "Zend/zend_language_scanner.c" -yy808: - YYDEBUG(808, *YYCURSOR); +#line 7401 "Zend/zend_language_scanner.c" +yy804: + YYDEBUG(804, *YYCURSOR); ++YYCURSOR; - YYDEBUG(809, *YYCURSOR); + YYDEBUG(805, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 2384 "Zend/zend_language_scanner.l" { @@ -7444,113 +7412,113 @@ int start_line = CG(zend_lineno); zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7448 "Zend/zend_language_scanner.c" -yy810: - YYDEBUG(810, *YYCURSOR); +#line 7416 "Zend/zend_language_scanner.c" +yy806: + YYDEBUG(806, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy811: - YYDEBUG(811, *YYCURSOR); +yy807: + YYDEBUG(807, *YYCURSOR); if (yybm[0+yych] & 16) { - goto yy810; + goto yy806; } - goto yy807; -yy812: - YYDEBUG(812, *YYCURSOR); + goto yy803; +yy808: + YYDEBUG(808, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(813, *YYCURSOR); + YYDEBUG(809, *YYCURSOR); if (yych <= '^') { if (yych <= '9') { - if (yych >= '0') goto yy812; + if (yych >= '0') goto yy808; } else { - if (yych <= '@') goto yy814; - if (yych <= 'Z') goto yy812; + if (yych <= '@') goto yy810; + if (yych <= 'Z') goto yy808; } } else { if (yych <= '`') { - if (yych <= '_') goto yy812; + if (yych <= '_') goto yy808; } else { - if (yych <= 'z') goto yy812; - if (yych >= 0x80) goto yy812; + if (yych <= 'z') goto yy808; + if (yych >= 0x80) goto yy808; } } -yy814: - YYDEBUG(814, *YYCURSOR); +yy810: + YYDEBUG(810, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1869 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); RETURN_TOKEN(T_VARIABLE); } -#line 7489 "Zend/zend_language_scanner.c" -yy815: - YYDEBUG(815, *YYCURSOR); +#line 7457 "Zend/zend_language_scanner.c" +yy811: + YYDEBUG(811, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy816: - YYDEBUG(816, *YYCURSOR); +yy812: + YYDEBUG(812, *YYCURSOR); if (yybm[0+yych] & 32) { - goto yy815; + goto yy811; } - goto yy797; -yy817: - YYDEBUG(817, *YYCURSOR); + goto yy793; +yy813: + YYDEBUG(813, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 128) { - goto yy825; + goto yy821; } -yy818: - YYDEBUG(818, *YYCURSOR); +yy814: + YYDEBUG(814, *YYCURSOR); YYCURSOR = YYMARKER; - goto yy797; -yy819: - YYDEBUG(819, *YYCURSOR); + goto yy793; +yy815: + YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 64) { - goto yy823; + goto yy819; } - goto yy818; -yy820: - YYDEBUG(820, *YYCURSOR); + goto yy814; +yy816: + YYDEBUG(816, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(821, *YYCURSOR); - if (yych <= '/') goto yy822; - if (yych <= '9') goto yy820; -yy822: - YYDEBUG(822, *YYCURSOR); + YYDEBUG(817, *YYCURSOR); + if (yych <= '/') goto yy818; + if (yych <= '9') goto yy816; +yy818: + YYDEBUG(818, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 1735 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ ZVAL_STRINGL(zendlval, yytext, yyleng); RETURN_TOKEN(T_NUM_STRING); } -#line 7534 "Zend/zend_language_scanner.c" -yy823: - YYDEBUG(823, *YYCURSOR); +#line 7502 "Zend/zend_language_scanner.c" +yy819: + YYDEBUG(819, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(824, *YYCURSOR); + YYDEBUG(820, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy823; + goto yy819; } - goto yy822; -yy825: - YYDEBUG(825, *YYCURSOR); + goto yy818; +yy821: + YYDEBUG(821, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(826, *YYCURSOR); + YYDEBUG(822, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy825; + goto yy821; } - goto yy822; + goto yy818; } } #line 2393 "Zend/zend_language_scanner.l" diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 0aaecf9fb8171..4a4edf4d3224c 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1345,7 +1345,7 @@ NEWLINE ("\r"|"\n"|"\r\n") RETURN_TOKEN(T_DOUBLE_CAST); } -<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("string"|"binary"){TABS_AND_SPACES}")" { +<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("string"){TABS_AND_SPACES}")" { RETURN_TOKEN(T_STRING_CAST); }