From afdaa91170a1f7b0387cf577d957d4d6c015c136 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Thu, 16 Jan 2020 19:04:42 +0100 Subject: [PATCH] Fix #78880: Final spelling fixes --- .gitignore | 2 +- ext/bcmath/libbcmath/src/init.c | 2 +- ext/curl/tests/curl_multi_close_basic001.phpt | 2 +- ext/date/tests/date-time-modify-times.phpt | 2 +- .../tests/DOMComment_replaceData_error1.phpt | 4 ++-- .../tests/DOMComment_replaceData_error2.phpt | 4 ++-- ext/fileinfo/tests/finfo_open_basic.phpt | 2 +- ext/fileinfo/tests/magic | 6 +++--- ...2\211\343\202\214\343\201\276\343\201\231" | 2 +- ext/ftp/tests/ftp_fget_basic.phpt | 4 ++-- ext/ftp/tests/ftp_set_option_errors.phpt | 2 +- ext/gd/libgd/gd.h | 2 +- ext/gd/libgd/gd_gd.c | 2 +- ext/gd/libgd/gd_tga.c | 4 ++-- ext/gd/libgd/gdtest.c | 2 +- ext/gd/tests/imagecolordeallocate_error3.phpt | 2 +- ext/gd/tests/imagecolordeallocate_error4.phpt | 2 +- .../tests/imagepalettetotruecolor_basic.phpt | 2 +- ext/imap/tests/imap_include.inc | 4 ++-- ext/ldap/tests/ldap_option_reqcert_error.phpt | 2 +- .../libmbfl/filters/mbfilter_uuencode.c | 2 +- ext/mbstring/tests/mb_strtolower_basic.phpt | 2 +- ext/mbstring/tests/mb_strtoupper_basic.phpt | 2 +- ext/mysqli/mysqli_api.c | 2 +- ext/mysqli/tests/mysqli_stmt_errno.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_error.phpt | 2 +- ext/mysqlnd/mysqlnd_ps_codec.c | 2 +- ext/mysqlnd/mysqlnd_vio.c | 2 +- ext/oci8/tests/edition_2.phpt | 8 ++++---- ext/opcache/Optimizer/block_pass.c | 2 +- ext/opcache/Optimizer/escape_analysis.c | 4 ++-- ext/opcache/Optimizer/pass3.c | 2 +- ext/opcache/Optimizer/zend_cfg.h | 2 +- ext/opcache/Optimizer/zend_ssa.h | 2 +- ext/opcache/jit/dynasm/dynasm.lua | 2 +- ext/opcache/jit/dynasm/minilua.c | 6 +++--- ext/opcache/jit/zend_jit.h | 6 +++--- ext/opcache/jit/zend_jit_x86.dasc | 6 +++--- ext/opcache/tests/jit/reg_alloc_002.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_003.phpt | 2 +- ext/opcache/tests/opt/sccp_022.phpt | 2 +- ext/opcache/tests/ssa_bug_001.phpt | 2 +- .../tests/openssl_error_string_basic.phpt | 2 +- ext/pdo/pdo_stmt.c | 2 +- ext/pdo/tests/bug_69356.phpt | 6 +++--- ext/pdo/tests/bug_71447.phpt | 2 +- ext/pdo/tests/pdo_034.phpt | 2 +- ...do_mysql___construct_options_libmysql.phpt | 4 ++-- .../tests/pdo_oci_debugdumpparams.phpt | 6 +++--- ext/posix/tests/posix_getgrgid_basic.phpt | 4 ++-- .../tests/ReflectionZendExtension_error.phpt | 2 +- ext/soap/php_encoding.c | 2 +- ext/soap/tests/fault_warning.phpt | 2 +- .../Round4/GroupI/round4_groupI_xsd.wsdl | 2 +- ext/soap/tests/soap12/T46.phpt | 2 +- ext/sockets/tests/bug76839.phpt | 2 +- ext/sockets/tests/wsaprotocol_info_0.phpt | 2 +- ext/spl/tests/bug55701.phpt | 2 +- ext/spl/tests/heap_009.phpt | 8 ++++---- ext/spl/tests/unserialize.phpt | 2 +- ext/standard/dns.c | 2 +- ext/standard/php_math.h | 2 +- .../array_change_key_case_variation8.phpt | 2 +- .../tests/array/array_diff_variation8.phpt | 2 +- .../tests/array/array_walk_object1.phpt | 2 +- .../tests/general_functions/print_r.phpt | 6 +++--- .../general_functions/print_r_64bit.phpt | 6 +++--- .../tests/general_functions/var_dump.phpt | 6 +++--- .../general_functions/var_dump_64bit.phpt | 6 +++--- ext/standard/tests/image/iptcembed_002.phpt | 4 ++-- ext/standard/tests/mail/mail_include.inc | 4 ++-- .../tests/strings/addslashes_variation2.phpt | 2 +- ext/standard/tests/strings/strcasecmp.phpt | Bin 20646 -> 20646 bytes ext/standard/tests/strings/strcmp.phpt | Bin 18461 -> 18461 bytes .../tests/strings/stripos_variation4.phpt | 2 +- .../strings/stripslashes_variation2.phpt | Bin 9497 -> 9496 bytes ext/standard/tests/strings/strlen.phpt | Bin 5901 -> 5901 bytes .../tests/strings/strripos_variation4.phpt | 2 +- .../tests/strings/strrpos_variation4.phpt | 2 +- ext/standard/tests/strings/strstr.phpt | Bin 9540 -> 9540 bytes ext/standard/tests/url/bug47174.phpt | 2 +- ext/sysvmsg/tests/002.phpt | 2 +- ext/sysvmsg/tests/006.phpt | 2 +- ext/xmlrpc/libxmlrpc/xml_element.h | 2 +- ext/xmlrpc/xmlrpc-epi-php.c | 2 +- ext/xsl/tests/bug71540.phpt | 4 ++-- sapi/fpm/www.conf.in | 2 +- win32/build/confutils.js | 2 +- win32/sendmail.c | 2 +- 89 files changed, 121 insertions(+), 121 deletions(-) diff --git a/.gitignore b/.gitignore index dc63cce7d7..af807328f6 100644 --- a/.gitignore +++ b/.gitignore @@ -209,7 +209,7 @@ php # Generated by x64 compiler, includes Debug, Debug_TS, Release, Release_TS /x64/ -# Miscellaneous files generated by Windows build sytem +# Miscellaneous files generated by Windows build system /main/config.w32.h /win32/build/deplister.exe /win32/build/deplister.obj diff --git a/ext/bcmath/libbcmath/src/init.c b/ext/bcmath/libbcmath/src/init.c index a125947a3e..676076f89d 100644 --- a/ext/bcmath/libbcmath/src/init.c +++ b/ext/bcmath/libbcmath/src/init.c @@ -82,7 +82,7 @@ _bc_free_num_ex (num, persistent) } -/* Intitialize the number package! */ +/* Initialize the number package! */ void bc_init_numbers (void) diff --git a/ext/curl/tests/curl_multi_close_basic001.phpt b/ext/curl/tests/curl_multi_close_basic001.phpt index 50ed9f4ff3..42deaf78be 100644 --- a/ext/curl/tests/curl_multi_close_basic001.phpt +++ b/ext/curl/tests/curl_multi_close_basic001.phpt @@ -1,5 +1,5 @@ --TEST-- -curl_multi_close return false when suplied resorce not valid cURL multi handle +curl_multi_close return false when supplied resource not valid cURL multi handle --SKIPIF-- array( 'october 23:00', // October 23rd, with a broken time 'march 28, 00:15', - 'march 28, 01:15', // doesn't exist bcause of DST + 'march 28, 01:15', // doesn't exist because of DST 'march 28, 02:15', ), ); diff --git a/ext/dom/tests/DOMComment_replaceData_error1.phpt b/ext/dom/tests/DOMComment_replaceData_error1.phpt index 16ea993e34..331f482bdd 100644 --- a/ext/dom/tests/DOMComment_replaceData_error1.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error1.phpt @@ -15,10 +15,10 @@ try { $comment->replaceData(-1,4,'-inserted'); } catch (DOMException $e ) { if ($e->getMessage() == 'Index Size Error'){ - echo "Throws DOMException for -ve offest\n"; + echo "Throws DOMException for -ve offset\n"; } } ?> --EXPECT-- -Throws DOMException for -ve offest +Throws DOMException for -ve offset diff --git a/ext/dom/tests/DOMComment_replaceData_error2.phpt b/ext/dom/tests/DOMComment_replaceData_error2.phpt index fbf59d76dc..69407ba1c0 100644 --- a/ext/dom/tests/DOMComment_replaceData_error2.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error2.phpt @@ -15,10 +15,10 @@ try { $comment->replaceData(999,4,'-inserted'); } catch (DOMException $e ) { if ($e->getMessage() == 'Index Size Error'){ - echo "Throws DOMException for offest too large\n"; + echo "Throws DOMException for offset too large\n"; } } ?> --EXPECT-- -Throws DOMException for offest too large +Throws DOMException for offset too large diff --git a/ext/fileinfo/tests/finfo_open_basic.phpt b/ext/fileinfo/tests/finfo_open_basic.phpt index 176ad49c50..5fb254b274 100644 --- a/ext/fileinfo/tests/finfo_open_basic.phpt +++ b/ext/fileinfo/tests/finfo_open_basic.phpt @@ -24,7 +24,7 @@ var_dump( finfo_open( FILEINFO_CONTINUE, $magicFile ) ); var_dump( finfo_open( FILEINFO_PRESERVE_ATIME, $magicFile ) ); var_dump( finfo_open( FILEINFO_RAW, $magicFile ) ); -// OO inteface to finfo +// OO interface to finfo var_dump( new finfo( FILEINFO_MIME, $magicFile ) ); var_dump( new finfo() ); diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index c53d0fdd8d..cb9b03c099 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -10475,7 +10475,7 @@ # updated by Joerg Jenderek at Oct 2008 # variables according to grub-0.97/stage1/stage1.S or # https://www.gnu.org/software/grub/manual/grub.html#Embedded-data -# usual values are marked with comments to get only informations of strange GRUB loaders +# usual values are marked with comments to get only information of strange GRUB loaders >342 search/60 \0Geom\0 #>0 ulelong x %x=0x009048EB , 0x2a9048EB 0 >>0x41 ubyte <2 @@ -11280,7 +11280,7 @@ # In the second sector (+0x200) are variables according to grub-0.97/stage2/asm.S or # grub-1.94/kern/i386/pc/startup.S # https://www.gnu.org/software/grub/manual/grub.html#Embedded-data -# usual values are marked with comments to get only informations of strange GRUB loaders +# usual values are marked with comments to get only information of strange GRUB loaders 0x200 uleshort 0x70EA # found only version 3.{1,2} >0x206 ubeshort >0x0300 @@ -11342,7 +11342,7 @@ 0 ulelong&0x804000E9 0x000000E9 !:strength +60 # mtools-3.9.8/msdos.h -# usual values are marked with comments to get only informations of strange FAT systems +# usual values are marked with comments to get only information of strange FAT systems # valid sectorsize must be a power of 2 from 32 to 32768 >11 uleshort&0x001f 0 >>11 uleshort <32769 diff --git "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" index c53d0fdd8d..7ccafe869f 100644 --- "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" +++ "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" @@ -10475,7 +10475,7 @@ # updated by Joerg Jenderek at Oct 2008 # variables according to grub-0.97/stage1/stage1.S or # https://www.gnu.org/software/grub/manual/grub.html#Embedded-data -# usual values are marked with comments to get only informations of strange GRUB loaders +# usual values are marked with comments to get only information of strange GRUB loaders >342 search/60 \0Geom\0 #>0 ulelong x %x=0x009048EB , 0x2a9048EB 0 >>0x41 ubyte <2 diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt index 336594e316..62092f897d 100644 --- a/ext/ftp/tests/ftp_fget_basic.phpt +++ b/ext/ftp/tests/ftp_fget_basic.phpt @@ -21,10 +21,10 @@ var_dump(ftp_fget($ftp, $fp ,'a story.txt', FTP_ASCII)); fseek($fp, 0); echo fgets($fp); -$postition = ftell($fp); +$position = ftell($fp); //test binary data transfer var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY)); -fseek($fp, $postition); +fseek($fp, $position); var_dump(urlencode(fgets($fp))); //test non-existent file request diff --git a/ext/ftp/tests/ftp_set_option_errors.phpt b/ext/ftp/tests/ftp_set_option_errors.phpt index 1ad8a072c9..ad91be56e8 100644 --- a/ext/ftp/tests/ftp_set_option_errors.phpt +++ b/ext/ftp/tests/ftp_set_option_errors.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing ftp_set_option erros while setting up +Testing ftp_set_option errors while setting up --CREDITS-- Gabriel Caruso (carusogabriel34@gmail.com) --SKIPIF-- diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h index 461024f0f7..cddd6c1f7a 100644 --- a/ext/gd/libgd/gd.h +++ b/ext/gd/libgd/gd.h @@ -902,7 +902,7 @@ int gdTransformAffineBoundingBox(gdRectPtr src, const double affine[6], gdRectPt #define GD_CMP_IMAGE 1 /* Actual image IS different */ -#define GD_CMP_NUM_COLORS 2 /* Number of Colours in pallette differ */ +#define GD_CMP_NUM_COLORS 2 /* Number of Colours in palette differ */ #define GD_CMP_COLOR 4 /* Image colours differ */ #define GD_CMP_SIZE_X 8 /* Image width differs */ #define GD_CMP_SIZE_Y 16 /* Image heights differ */ diff --git a/ext/gd/libgd/gd_gd.c b/ext/gd/libgd/gd_gd.c index 81a957d414..d5fe16a9af 100644 --- a/ext/gd/libgd/gd_gd.c +++ b/ext/gd/libgd/gd_gd.c @@ -59,7 +59,7 @@ int _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag) } } - GD2_DBG(printf("Pallette had %d colours (T=%d)\n", im->colorsTotal, im->transparent)); + GD2_DBG(printf("Palette had %d colours (T=%d)\n", im->colorsTotal, im->transparent)); if (im->trueColor) { return TRUE; diff --git a/ext/gd/libgd/gd_tga.c b/ext/gd/libgd/gd_tga.c index 67e77f7b98..7328163f2c 100644 --- a/ext/gd/libgd/gd_tga.c +++ b/ext/gd/libgd/gd_tga.c @@ -141,7 +141,7 @@ gdImagePtr gdImageCreateFromTgaCtx(gdIOCtx* ctx) * Reads the header block from a binary TGA file populating the referenced TGA structure. * \param ctx Pointer to TGA binary file * \param tga Pointer to TGA structure - * \return int 1 on sucess, -1 on failure + * \return int 1 on success, -1 on failure */ int read_header_tga(gdIOCtx *ctx, oTga *tga) { @@ -201,7 +201,7 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) * Reads the image data block from a binary TGA file populating the referenced TGA structure. * \param ctx Pointer to TGA binary file * \param tga Pointer to TGA structure - * \return int 0 on sucess, -1 on failure + * \return int 0 on success, -1 on failure */ int read_image_tga( gdIOCtx *ctx, oTga *tga ) { diff --git a/ext/gd/libgd/gdtest.c b/ext/gd/libgd/gdtest.c index 24b7503864..ba036b83d9 100644 --- a/ext/gd/libgd/gdtest.c +++ b/ext/gd/libgd/gdtest.c @@ -384,7 +384,7 @@ CompareImages (char *msg, gdImagePtr im1, gdImagePtr im2) if (cmpRes & GD_CMP_NUM_COLORS) { - printf ("-%s: INFO number of pallette entries differ %d Vs. %d\n", msg, + printf ("-%s: INFO number of palette entries differ %d Vs. %d\n", msg, im1->colorsTotal, im2->colorsTotal); } diff --git a/ext/gd/tests/imagecolordeallocate_error3.phpt b/ext/gd/tests/imagecolordeallocate_error3.phpt index f81b52192a..e0748c44ba 100644 --- a/ext/gd/tests/imagecolordeallocate_error3.phpt +++ b/ext/gd/tests/imagecolordeallocate_error3.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing imagecolordeallocate() of GD library with Out of range intergers (Above) +Testing imagecolordeallocate() of GD library with Out of range integers (Above) --CREDITS-- Rafael Dohms #testfest PHPSP on 2009-06-20 diff --git a/ext/gd/tests/imagecolordeallocate_error4.phpt b/ext/gd/tests/imagecolordeallocate_error4.phpt index 4d3009dcae..e35c529879 100644 --- a/ext/gd/tests/imagecolordeallocate_error4.phpt +++ b/ext/gd/tests/imagecolordeallocate_error4.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing imagecolordeallocate() of GD library with Out of range intergers (Below) +Testing imagecolordeallocate() of GD library with Out of range integers (Below) --CREDITS-- Rafael Dohms #testfest PHPSP on 2009-06-20 diff --git a/ext/gd/tests/imagepalettetotruecolor_basic.phpt b/ext/gd/tests/imagepalettetotruecolor_basic.phpt index 89fb514a5f..4c4a261b92 100644 --- a/ext/gd/tests/imagepalettetotruecolor_basic.phpt +++ b/ext/gd/tests/imagepalettetotruecolor_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -does the imagepalettetotruecollor function realy converts the image palette? +does the imagepalettetotruecollor function really converts the image palette? --CREDITS-- Carlos André Ferrari --SKIPIF-- diff --git a/ext/imap/tests/imap_include.inc b/ext/imap/tests/imap_include.inc index 369a560a5f..47ac081c9f 100644 --- a/ext/imap/tests/imap_include.inc +++ b/ext/imap/tests/imap_include.inc @@ -77,7 +77,7 @@ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = nul echo "Create a temporary mailbox and add " . $message_count . " msgs\n"; $new_mailbox = create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type); if ($new_mailbox === false) { - echo "Cant create a temporary mailbox: " . imap_last_error(). "\n"; + echo "Can't create a temporary mailbox: " . imap_last_error(). "\n"; return false; } @@ -85,7 +85,7 @@ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = nul // reopen stream to new mailbox if (imap_reopen($imap_stream, $new_mailbox) === false) { - echo "cant re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n"; + echo "can't re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n"; return false; } diff --git a/ext/ldap/tests/ldap_option_reqcert_error.phpt b/ext/ldap/tests/ldap_option_reqcert_error.phpt index 9f45e7f604..50e542a080 100644 --- a/ext/ldap/tests/ldap_option_reqcert_error.phpt +++ b/ext/ldap/tests/ldap_option_reqcert_error.phpt @@ -1,5 +1,5 @@ --TEST-- -ldap_option_reqcert_error() - A test to check if ldap cant connect to a LDAP server with a invalid certificate with certificate checking enabled +ldap_option_reqcert_error() - A test to check if ldap can't connect to a LDAP server with a invalid certificate with certificate checking enabled --CREDITS-- Edwin Hoksberg --SKIPIF-- diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index 590ecda997..0645ef68c6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -89,7 +89,7 @@ int mbfl_filt_conv_uudec(int c, mbfl_convert_filter * filter) } if (filter->cache == 5) { - /* thats good enough - wait for a newline */ + /* that's good enough - wait for a newline */ filter->status = uudec_state_until_newline; filter->cache = 0; } diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt index 4f727094b1..c1ed26d6a8 100644 --- a/ext/mbstring/tests/mb_strtolower_basic.phpt +++ b/ext/mbstring/tests/mb_strtolower_basic.phpt @@ -40,7 +40,7 @@ var_dump(base64_encode($mb)); if ($mb == $greek_lower) { echo "Correctly converted\n"; } else { - echo "Incorreclty converted\n"; + echo "Incorrectly converted\n"; } echo "Done"; diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt index 72601442fd..ddaea2040b 100644 --- a/ext/mbstring/tests/mb_strtoupper_basic.phpt +++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt @@ -41,7 +41,7 @@ var_dump(base64_encode($mb)); if ($mb == $greek_upper) { echo "Correctly converted\n"; } else { - echo "Incorreclty converted\n"; + echo "Incorrectly converted\n"; } echo "Done"; diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 4a5e7c992a..74dcc95ac9 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1515,7 +1515,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_method) if (!(mysql->mysql = mysql_init(NULL))) #else /* - We create always persistent, as if the user want to connecto + We create always persistent, as if the user want to connect to p:somehost, we can't convert the handle then */ if (!(mysql->mysql = mysqlnd_init(MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA, TRUE))) diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt index 39760e3003..7b20ea65c6 100644 --- a/ext/mysqli/tests/mysqli_stmt_errno.phpt +++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt @@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc'); // set after client error if (0 === ($tmp = mysqli_stmt_errno($stmt))) - printf("[010] Execting int/any non zero, got %s/%s\n", gettype($tmp), $tmp); + printf("[010] Expecting int/any non zero, got %s/%s\n", gettype($tmp), $tmp); mysqli_stmt_close($stmt); diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt index 49e03c8aee..2b7b59a21a 100644 --- a/ext/mysqli/tests/mysqli_stmt_error.phpt +++ b/ext/mysqli/tests/mysqli_stmt_error.phpt @@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc'); // set after client error if ('' === ($tmp = mysqli_stmt_error($stmt))) - printf("[010] Execting string/any non empty, got %s/%s\n", gettype($tmp), $tmp); + printf("[010] Expecting string/any non empty, got %s/%s\n", gettype($tmp), $tmp); mysqli_stmt_close($stmt); diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c index 279e7ba01e..c0b3d1d6ff 100644 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@ -96,7 +96,7 @@ ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, const u case 8:lval = (int64_t) sint8korr(*row);break; /* 7, 6 and 5 are not possible. - BIT is only unsigned, thus only uint5|6|7 macroses exist + BIT is only unsigned, thus only uint5|6|7 macros exist */ case 4:lval = (int64_t) sint4korr(*row);break; case 3:lval = (int64_t) sint3korr(*row);break; diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c index 2788c8cdde..bc59cbeed8 100644 --- a/ext/mysqlnd/mysqlnd_vio.c +++ b/ext/mysqlnd/mysqlnd_vio.c @@ -129,7 +129,7 @@ MYSQLND_METHOD(mysqlnd_vio, open_pipe)(MYSQLND_VIO * const vio, const MYSQLND_CS streams_options |= IGNORE_URL; net_stream = php_stream_open_wrapper(scheme.s + sizeof("pipe://") - 1, "r+", streams_options, NULL); if (!net_stream) { - SET_CLIENT_ERROR(error_info, CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE, "Unknown errror while connecting"); + SET_CLIENT_ERROR(error_info, CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE, "Unknown error while connecting"); DBG_RETURN(NULL); } /* diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt index 054e685943..1aebe1a03b 100644 --- a/ext/oci8/tests/edition_2.phpt +++ b/ext/oci8/tests/edition_2.phpt @@ -63,7 +63,7 @@ get_edit_attr($pc1); oci_close($pc1); -echo"\n\n**Test 1.3 change the value and verify with existing conenctions.*********\n"; +echo"\n\n**Test 1.3 change the value and verify with existing connections.*********\n"; set_edit_attr('MYEDITION1'); get_edit_attr($conn2); get_edit_attr($conn3); // Old value @@ -131,7 +131,7 @@ echo " Set the value back using oci-set_edition\n"; set_edit_attr('MYEDITION'); get_edit_attr($c2); -echo " Get the value with a new conenction\n"; +echo " Get the value with a new connection\n"; $c3 = get_conn(1); get_edit_attr($c3); @@ -178,7 +178,7 @@ The value of current EDITION is MYEDITION The value of current EDITION is MYEDITION -**Test 1.3 change the value and verify with existing conenctions.********* +**Test 1.3 change the value and verify with existing connections.********* The value of edition has been successfully set The value of current EDITION is MYEDITION The value of current EDITION is MYEDITION @@ -235,7 +235,7 @@ The value of current EDITION is MYEDITION Set the value back using oci-set_edition The value of edition has been successfully set The value of current EDITION is MYEDITION - Get the value with a new conenction + Get the value with a new connection Testing with oci_connect() The value of current EDITION is MYEDITION diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index b6af541eac..fa570c9301 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -1416,7 +1416,7 @@ static void zend_jmp_optimization(zend_basic_block *block, zend_op_array *op_arr /* should be used once on the branch path. */ /* */ /* The pattern works well only if jums processed in */ - /* direct order, otherwise it breakes JMPZ_EX */ + /* direct order, otherwise it breaks JMPZ_EX */ /* sequences too early. */ last_op->result.var = target->result.var; next = target_block->successors[0]; diff --git a/ext/opcache/Optimizer/escape_analysis.c b/ext/opcache/Optimizer/escape_analysis.c index a13f69cdf0..f50bc19b25 100644 --- a/ext/opcache/Optimizer/escape_analysis.c +++ b/ext/opcache/Optimizer/escape_analysis.c @@ -338,7 +338,7 @@ static int is_escape_use(zend_op_array *op_array, zend_ssa *ssa, int use, int va if (opline->op1_type != IS_CV || (OP1_INFO() & MAY_BE_REF) || (op->op1_def >= 0 && ssa->vars[op->op1_def].alias)) { - /* asignment into escaping structure */ + /* assignment into escaping structure */ return 1; } /* reference dependencies processed separately */ @@ -354,7 +354,7 @@ static int is_escape_use(zend_op_array *op_array, zend_ssa *ssa, int use, int va if (opline->op1_type != IS_CV || (OP1_INFO() & MAY_BE_REF) || (op->op1_def >= 0 && ssa->vars[op->op1_def].alias)) { - /* asignment into escaping variable */ + /* assignment into escaping variable */ return 1; } if (opline->op2_type == IS_CV || opline->result_type != IS_UNUSED) { diff --git a/ext/opcache/Optimizer/pass3.c b/ext/opcache/Optimizer/pass3.c index a4abe2f8d3..f98c41848c 100644 --- a/ext/opcache/Optimizer/pass3.c +++ b/ext/opcache/Optimizer/pass3.c @@ -262,7 +262,7 @@ void zend_optimizer_pass3(zend_op_array *op_array, zend_optimizer_ctx *ctx) /* should be used once on the branch path. */ /* */ /* The pattern works well only if jums processed in */ - /* direct order, otherwise it breakes JMPZ_EX */ + /* direct order, otherwise it breaks JMPZ_EX */ /* sequences too early. */ opline->result.var = target->result.var; target = target + 1; diff --git a/ext/opcache/Optimizer/zend_cfg.h b/ext/opcache/Optimizer/zend_cfg.h index ec7a10462c..51e2e63b4b 100644 --- a/ext/opcache/Optimizer/zend_cfg.h +++ b/ext/opcache/Optimizer/zend_cfg.h @@ -22,7 +22,7 @@ /* zend_basic_bloc.flags */ #define ZEND_BB_START (1<<0) /* fist block */ #define ZEND_BB_FOLLOW (1<<1) /* follows the next block */ -#define ZEND_BB_TARGET (1<<2) /* jump taget */ +#define ZEND_BB_TARGET (1<<2) /* jump target */ #define ZEND_BB_EXIT (1<<3) /* without successors */ #define ZEND_BB_ENTRY (1<<4) /* stackless entry */ #define ZEND_BB_TRY (1<<5) /* start of try block */ diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h index 935a3cd9aa..799af21532 100644 --- a/ext/opcache/Optimizer/zend_ssa.h +++ b/ext/opcache/Optimizer/zend_ssa.h @@ -113,7 +113,7 @@ typedef struct _zend_ssa_var { int use_chain; /* uses of this value, linked through opN_use_chain */ zend_ssa_phi *phi_use_chain; /* uses of this value in Phi, linked through use_chain */ zend_ssa_phi *sym_use_chain; /* uses of this value in Pi constraints */ - unsigned int no_val : 1; /* value doesn't mater (used as op1 in ZEND_ASSIGN) */ + unsigned int no_val : 1; /* value doesn't matter (used as op1 in ZEND_ASSIGN) */ unsigned int scc_entry : 1; unsigned int alias : 2; /* value may be changed indirectly */ unsigned int escape_state : 2; diff --git a/ext/opcache/jit/dynasm/dynasm.lua b/ext/opcache/jit/dynasm/dynasm.lua index 1e5899a4bf..b7ac453cbd 100644 --- a/ext/opcache/jit/dynasm/dynasm.lua +++ b/ext/opcache/jit/dynasm/dynasm.lua @@ -75,7 +75,7 @@ local function wline(line, needindent) g_synclineno = g_synclineno + 1 end --- Write assembler line as a comment, if requestd. +-- Write assembler line as a comment, if requested. local function wcomment(aline) if g_opt.comment then wline(g_opt.comment..aline..g_opt.endcomment, true) diff --git a/ext/opcache/jit/dynasm/minilua.c b/ext/opcache/jit/dynasm/minilua.c index 79150286cf..a8d7c305e1 100644 --- a/ext/opcache/jit/dynasm/minilua.c +++ b/ext/opcache/jit/dynasm/minilua.c @@ -6863,13 +6863,13 @@ return g_read(L,tofile(L),2); } static int io_readline(lua_State*L){ FILE*f=*(FILE**)lua_touserdata(L,lua_upvalueindex(1)); -int sucess; +int success; if(f==NULL) luaL_error(L,"file is already closed"); -sucess=read_line(L,f); +success=read_line(L,f); if(ferror(f)) return luaL_error(L,"%s",strerror(errno)); -if(sucess)return 1; +if(success)return 1; else{ if(lua_toboolean(L,lua_upvalueindex(2))){ lua_settop(L,0); diff --git a/ext/opcache/jit/zend_jit.h b/ext/opcache/jit/zend_jit.h index fa65ed7840..5234660398 100644 --- a/ext/opcache/jit/zend_jit.h +++ b/ext/opcache/jit/zend_jit.h @@ -24,13 +24,13 @@ #define ZEND_JIT_LEVEL_INLINE 2 /* selective inline threading */ #define ZEND_JIT_LEVEL_OPT_FUNC 3 /* optimized JIT based on Type-Inference */ #define ZEND_JIT_LEVEL_OPT_FUNCS 4 /* optimized JIT based on Type-Inference and call-tree */ -#define ZEND_JIT_LEVEL_OPT_SCRIPT 5 /* optimized JIT based on Type-Inference and inner-procedure analises */ +#define ZEND_JIT_LEVEL_OPT_SCRIPT 5 /* optimized JIT based on Type-Inference and inner-procedure analysis */ #define ZEND_JIT_LEVEL(n) ((n) % 10) #define ZEND_JIT_ON_SCRIPT_LOAD 0 #define ZEND_JIT_ON_FIRST_EXEC 1 -#define ZEND_JIT_ON_PROF_REQUEST 2 /* compile the most frequently caled on first requrest functions */ +#define ZEND_JIT_ON_PROF_REQUEST 2 /* compile the most frequently caled on first request functions */ #define ZEND_JIT_ON_HOT_COUNTERS 3 /* compile functions after N calls or loop iterations */ #define ZEND_JIT_ON_DOC_COMMENT 4 /* compile functions with "@jit" tag in doc-comments */ @@ -51,7 +51,7 @@ /* Makes profile based JIT (opcache.jit=2*) to generate code only for most - * offten called functions (above the threshold). + * often called functions (above the threshold). * TODO: this setting should be configurable */ #define ZEND_JIT_PROF_THRESHOLD 0.005 diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 2716434a04..345da92a24 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -7946,7 +7946,7 @@ static int zend_jit_free_compiled_variables(dasm_State **Dst, const zend_op *opl static int zend_jit_leave_func(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, zend_ssa *ssa) { - // Avoid multiple leave sequnces + // Avoid multiple leave sequences if (jit_return_label >= 0) { | jmp =>jit_return_label return 1; @@ -8847,7 +8847,7 @@ static uint32_t zend_get_known_property_offset(zend_class_entry *ce, zend_string if (ce->ce_flags & ZEND_ACC_INHERITED) { if (!ce->parent) { - /* property offests may be changed by inheritance */ + /* property offets may be changed by inheritance */ return ZEND_WRONG_PROPERTY_OFFSET; } else { zend_class_entry *parent = ce->parent; @@ -8858,7 +8858,7 @@ static uint32_t zend_get_known_property_offset(zend_class_entry *ce, zend_string } else if (parent->info.user.filename != filename) { /* some of parents class declarations might be changed infdependently */ /* TODO: this check may be not enough, because even - * in the same it's possible to conditionnaly define + * in the same it's possible to conditionally define * few classes with the same name, and "parent" may * change from request to request. */ diff --git a/ext/opcache/tests/jit/reg_alloc_002.phpt b/ext/opcache/tests/jit/reg_alloc_002.phpt index e93c4f3d5b..0a6d0a4bff 100644 --- a/ext/opcache/tests/jit/reg_alloc_002.phpt +++ b/ext/opcache/tests/jit/reg_alloc_002.phpt @@ -1,5 +1,5 @@ --TEST-- -Register Alloction 002: SEND_VAL_EX uses %r0 as a temporay register +Register Alloction 002: SEND_VAL_EX uses %r0 as a temporary register --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/opcache/tests/jit/reg_alloc_003.phpt b/ext/opcache/tests/jit/reg_alloc_003.phpt index 21a7779c79..f1a90dcec4 100644 --- a/ext/opcache/tests/jit/reg_alloc_003.phpt +++ b/ext/opcache/tests/jit/reg_alloc_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Register Alloction 003: Reuse temporay register +Register Alloction 003: Reuse temporary register --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/opcache/tests/opt/sccp_022.phpt b/ext/opcache/tests/opt/sccp_022.phpt index 03a8d565f2..40c9df5971 100644 --- a/ext/opcache/tests/opt/sccp_022.phpt +++ b/ext/opcache/tests/opt/sccp_022.phpt @@ -1,5 +1,5 @@ --TEST-- -SCCP 022: Invailid types +SCCP 022: Invalid types --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/opcache/tests/ssa_bug_001.phpt b/ext/opcache/tests/ssa_bug_001.phpt index 62613e6eee..06be60892c 100644 --- a/ext/opcache/tests/ssa_bug_001.phpt +++ b/ext/opcache/tests/ssa_bug_001.phpt @@ -1,5 +1,5 @@ --TEST-- -SSA constrution for CFG with unreachable basic blocks +SSA construction for CFG with unreachable basic blocks --SKIPIF-- --FILE-- diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt index cdf558e9a5..2d753e11be 100644 --- a/ext/openssl/tests/openssl_error_string_basic.phpt +++ b/ext/openssl/tests/openssl_error_string_basic.phpt @@ -52,7 +52,7 @@ function dump_openssl_errors($name) { $output_file = __DIR__ . "/openssl_error_string_basic_output.tmp"; // invalid file for read is something that does not exist in current directory $invalid_file_for_read = __DIR__ . "/invalid_file_for_read_operation.txt"; -// invalid file for is the test dir as writting file to existing dir should alway fail +// invalid file for is the test dir as writing file to existing dir should always fail $invalid_file_for_write = __DIR__; // crt file $crt_file = "file://" . __DIR__ . "/cert.crt"; diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 370ce646ee..84afe14b60 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -799,7 +799,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_ case PDO_FETCH_KEY_PAIR: if (stmt->column_count != 2) { - pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "PDO::FETCH_KEY_PAIR fetch mode requires the result set to contain extactly 2 columns."); + pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "PDO::FETCH_KEY_PAIR fetch mode requires the result set to contain exactly 2 columns."); return 0; } if (!return_all) { diff --git a/ext/pdo/tests/bug_69356.phpt b/ext/pdo/tests/bug_69356.phpt index 0885a8264f..2bd3b30973 100644 --- a/ext/pdo/tests/bug_69356.phpt +++ b/ext/pdo/tests/bug_69356.phpt @@ -18,7 +18,7 @@ $db = PDOTest::factory(); $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); $stmt = $db->query(" SELECT ' - Dumps the informations contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). + Dumps the information contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). This is a debug function, which dump directly the data on the normal output. Tip: As with anything that outputs its result directly to the browser, the output-control functions can be used to capture the output of this function, and save it in a string (for example). @@ -28,9 +28,9 @@ $stmt = $db->query(" var_dump($stmt->debugDumpParams()); ?> --EXPECT-- -SQL: [835] +SQL: [834] SELECT ' - Dumps the informations contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). + Dumps the information contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). This is a debug function, which dump directly the data on the normal output. Tip: As with anything that outputs its result directly to the browser, the output-control functions can be used to capture the output of this function, and save it in a string (for example). diff --git a/ext/pdo/tests/bug_71447.phpt b/ext/pdo/tests/bug_71447.phpt index 8705717df1..64bdc199fe 100644 --- a/ext/pdo/tests/bug_71447.phpt +++ b/ext/pdo/tests/bug_71447.phpt @@ -22,7 +22,7 @@ $db->exec('INSERT INTO test VALUES(1)'); // Comment without quotes or placeholders $stmt = $db->prepare(" - SELECT -- Thats all folks! + SELECT -- That's all folks! '\"abc\":8000' FROM test "); diff --git a/ext/pdo/tests/pdo_034.phpt b/ext/pdo/tests/pdo_034.phpt index dafcca1c71..4f66356729 100644 --- a/ext/pdo/tests/pdo_034.phpt +++ b/ext/pdo/tests/pdo_034.phpt @@ -44,7 +44,7 @@ array(5) { string(1) "4" } -Warning: PDOStatement::fetch(): SQLSTATE[HY000]: General error: PDO::FETCH_KEY_PAIR fetch mode requires the result set to contain extactly 2 columns. in %spdo_034.php on line %d +Warning: PDOStatement::fetch(): SQLSTATE[HY000]: General error: PDO::FETCH_KEY_PAIR fetch mode requires the result set to contain exactly 2 columns. in %spdo_034.php on line %d Warning: PDOStatement::fetch(): SQLSTATE[HY000]: General error%spdo_034.php on line %d bool(false) diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt index d01ef0a69a..3d7e1d4396 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt @@ -21,7 +21,7 @@ if (MySQLPDOTest::isPDOMySQLnd()) try { $db = new PDO($dsn, $user, $pass, array($option => $value)); if (!is_object($db) || (!$ignore_diff && ($value !== ($tmp = @$db->getAttribute($option))))) - printf("[%03d] Execting '%s'/%s got '%s'/%s' for options '%s'\n", + printf("[%03d] Expecting '%s'/%s got '%s'/%s' for options '%s'\n", $offset, $value, gettype($value), $tmp, gettype($tmp), @@ -79,5 +79,5 @@ if (MySQLPDOTest::isPDOMySQLnd()) ?> --EXPECT-- [001] Expecting default value for 'PDO::MYSQL_ATTR_INIT_COMMAND' of ''/string, getAttribute() reports setting ''/boolean -[026] Execting '1'/boolean got ''/boolean' for options 'PDO::MYSQL_ATTR_READ_DEFAULT_FILE' +[026] Expecting '1'/boolean got ''/boolean' for options 'PDO::MYSQL_ATTR_READ_DEFAULT_FILE' done! diff --git a/ext/pdo_oci/tests/pdo_oci_debugdumpparams.phpt b/ext/pdo_oci/tests/pdo_oci_debugdumpparams.phpt index 6f743c20d4..ad88b25ee0 100644 --- a/ext/pdo_oci/tests/pdo_oci_debugdumpparams.phpt +++ b/ext/pdo_oci/tests/pdo_oci_debugdumpparams.phpt @@ -14,7 +14,7 @@ $db = PDOTest::factory(); $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); $stmt = $db->query(" SELECT ' - Dumps the informations contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). + Dumps the information contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). This is a debug function, which dump directly the data on the normal output. Tip: As with anything that outputs its result directly to the browser, the output-control functions can be used to capture the output of this function, and save it in a string (for example). @@ -24,9 +24,9 @@ $stmt = $db->query(" var_dump($stmt->debugDumpParams()); ?> --EXPECT-- -SQL: [845] +SQL: [844] SELECT ' - Dumps the informations contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). + Dumps the information contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). This is a debug function, which dump directly the data on the normal output. Tip: As with anything that outputs its result directly to the browser, the output-control functions can be used to capture the output of this function, and save it in a string (for example). diff --git a/ext/posix/tests/posix_getgrgid_basic.phpt b/ext/posix/tests/posix_getgrgid_basic.phpt index 6327a75067..e630ea852e 100644 --- a/ext/posix/tests/posix_getgrgid_basic.phpt +++ b/ext/posix/tests/posix_getgrgid_basic.phpt @@ -6,7 +6,7 @@ Test posix_getgrgid() function : basic functionality ?> --FILE-- --EXPECTF-- -Basic test of POSIX getgid and getgrid fucntions +Basic test of POSIX getgid and getgrid functions Array ( [name] => %s diff --git a/ext/reflection/tests/ReflectionZendExtension_error.phpt b/ext/reflection/tests/ReflectionZendExtension_error.phpt index efce02640b..cd06b96465 100644 --- a/ext/reflection/tests/ReflectionZendExtension_error.phpt +++ b/ext/reflection/tests/ReflectionZendExtension_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ReflectionZendExtension class erros +Test ReflectionZendExtension class errors --CREDITS-- Gabriel Caruso (carusogabriel34@gmail.com) --SKIPIF-- diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 0faa6e9d57..4a7dc2ad80 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2717,7 +2717,7 @@ static zval *to_zval_map(zval *ret, encodeTypePtr type, xmlNodePtr data) } else if (Z_TYPE(key) == IS_LONG) { zend_hash_index_update(Z_ARRVAL_P(ret), Z_LVAL(key), &value); } else { - soap_error0(E_ERROR, "Encoding: Can't decode apache map, only Strings or Longs are allowd as keys"); + soap_error0(E_ERROR, "Encoding: Can't decode apache map, only Strings or Longs are allowed as keys"); } zval_ptr_dtor(&key); } diff --git a/ext/soap/tests/fault_warning.phpt b/ext/soap/tests/fault_warning.phpt index 2ee8bf58ee..f92cc81b2e 100644 --- a/ext/soap/tests/fault_warning.phpt +++ b/ext/soap/tests/fault_warning.phpt @@ -11,7 +11,7 @@ echo get_class($fault) . "\n"; $fault = new SoapFault(null, "message"); echo get_class($fault) . "\n"; $fault = new SoapFault(["more"], "message"); // two elements in array required -$fault = new SoapFault(["m", "more", "superflous"], "message"); // two required +$fault = new SoapFault(["m", "more", "superfluous"], "message"); // two required $fault = new SoapFault(["more-ns", "Sender"], "message"); // two given echo get_class($fault); ?> diff --git a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl index 454f879fd3..908a49789e 100644 --- a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl +++ b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl @@ -1102,7 +1102,7 @@ - These operations implement DOC/LIT SOAP operations, for interop testing. Please email johnko@microsoft.com with any questions/coments. + These operations implement DOC/LIT SOAP operations, for interop testing. Please email johnko@microsoft.com with any questions/comments. diff --git a/ext/soap/tests/soap12/T46.phpt b/ext/soap/tests/soap12/T46.phpt index 8098ef72e7..fe091323f1 100644 --- a/ext/soap/tests/soap12/T46.phpt +++ b/ext/soap/tests/soap12/T46.phpt @@ -10,7 +10,7 @@ $HTTP_RAW_POST_DATA = << - diff --git a/ext/sockets/tests/bug76839.phpt b/ext/sockets/tests/bug76839.phpt index d63370cc31..49aff731f7 100644 --- a/ext/sockets/tests/bug76839.phpt +++ b/ext/sockets/tests/bug76839.phpt @@ -12,7 +12,7 @@ if (!extension_loaded('sockets')) { insert( 1 ); testForException( $heap ); -// 3. SplMaxHeap emtpy +// 3. SplMaxHeap empty $heap = new SplMaxHeap; testForException( $heap ); -// 4. SplMaxHeap non-emtpy +// 4. SplMaxHeap non-empty $heap = new SplMaxHeap; $heap->insert( 1 ); testForException( $heap ); diff --git a/ext/spl/tests/unserialize.phpt b/ext/spl/tests/unserialize.phpt index ef2c8b17e1..81b0894990 100644 --- a/ext/spl/tests/unserialize.phpt +++ b/ext/spl/tests/unserialize.phpt @@ -8,7 +8,7 @@ $types = array('SplDoublyLinkedList', 'SplObjectStorage', 'ArrayObject'); foreach ($types as $type) { // serialize an empty new object $exp = serialize(new $type()); - // hack to instanciate an object without constructor + // hack to instantiate an object without constructor $str = sprintf('C:%d:"%s":0:{}', strlen($type), $type); $obj = unserialize($str); var_dump($obj); diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 70c2485689..7a7d11039d 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -864,7 +864,7 @@ PHP_FUNCTION(dns_get_record) * store_results is used to skip storing the results retrieved in step * NUMTYPES+1 when results were already fetched. * - In case of PHP_DNS_ANY we use the directly fetch DNS_T_ANY. (step NUMTYPES+1 ) - * - In case of raw mode, we query only the requestd type instead of looping type by type + * - In case of raw mode, we query only the requested type instead of looping type by type * before going with the additional info stuff. */ diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index e85fd120f2..cdc524f4a2 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -65,7 +65,7 @@ PHP_FUNCTION(rad2deg); PHP_FUNCTION(intdiv); /* - WARNING: these functions are expermental: they could change their names or + WARNING: these functions are experimental: they could change their names or disappear in the next version of PHP! */ PHP_FUNCTION(hypot); diff --git a/ext/standard/tests/array/array_change_key_case_variation8.phpt b/ext/standard/tests/array/array_change_key_case_variation8.phpt index e610ba0e98..493862ccd4 100644 --- a/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - Different strings as --FILE-- /00\7 ) -*** Testing print_r() on miscelleneous input arguments *** +*** Testing print_r() on miscellaneous input arguments *** -- Iteration 1 -- diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 71f2b5d64c..17b829231f 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -265,14 +265,14 @@ $variations = array ( non-scalar variables using print_r() */ check_printr($variations); -echo "\n*** Testing print_r() on miscelleneous input arguments ***\n"; +echo "\n*** Testing print_r() on miscellaneous input arguments ***\n"; $misc_values = array ( @$unset_var, NULL, // NULL argument @$undef_variable, //undefined variable null ); -/* calling check_printr() to display miscelleneous data using print_r() */ +/* calling check_printr() to display miscellaneous data using print_r() */ check_printr($misc_values); /* closing resource handle used */ @@ -1683,7 +1683,7 @@ Array [3] => /00\7 ) -*** Testing print_r() on miscelleneous input arguments *** +*** Testing print_r() on miscellaneous input arguments *** -- Iteration 1 -- diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index 336abbdf9f..08807191cb 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -260,14 +260,14 @@ $variations = array ( non-scalar variables using var_dump() */ check_vardump($variations); -echo "\n*** Testing var_dump() on miscelleneous input arguments ***\n"; +echo "\n*** Testing var_dump() on miscellaneous input arguments ***\n"; $misc_values = array ( @$unset_var, NULL, // NULL argument @$undef_variable, //undefined variable null ); -/* calling check_vardump() to display miscelleneous data using var_dump() */ +/* calling check_vardump() to display miscellaneous data using var_dump() */ check_vardump($misc_values); echo "\n*** Testing var_dump() on multiple arguments ***\n"; @@ -923,7 +923,7 @@ array(4) { string(5) "/00\7" } -*** Testing var_dump() on miscelleneous input arguments *** +*** Testing var_dump() on miscellaneous input arguments *** -- Iteration 1 -- NULL -- Iteration 2 -- diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index cd74d585bc..630b1ee8b3 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -260,14 +260,14 @@ $variations = array ( non-scalar variables using var_dump() */ check_vardump($variations); -echo "\n*** Testing var_dump() on miscelleneous input arguments ***\n"; +echo "\n*** Testing var_dump() on miscellaneous input arguments ***\n"; $misc_values = array ( @$unset_var, NULL, // NULL argument @$undef_variable, //undefined variable null ); -/* calling check_vardump() to display miscelleneous data using var_dump() */ +/* calling check_vardump() to display miscellaneous data using var_dump() */ check_vardump($misc_values); echo "\n*** Testing var_dump() on multiple arguments ***\n"; @@ -923,7 +923,7 @@ array(4) { string(5) "/00\7" } -*** Testing var_dump() on miscelleneous input arguments *** +*** Testing var_dump() on miscellaneous input arguments *** -- Iteration 1 -- NULL -- Iteration 2 -- diff --git a/ext/standard/tests/image/iptcembed_002.phpt b/ext/standard/tests/image/iptcembed_002.phpt index ad0446cf62..e0db48bcd5 100644 --- a/ext/standard/tests/image/iptcembed_002.phpt +++ b/ext/standard/tests/image/iptcembed_002.phpt @@ -39,7 +39,7 @@ $base64_1x1_jpeg="/9j/4AAQSkZJRgABAQEAYABgAAD//gA8Q1JFQVRPUjogZ2QtanBlZyB2MS4wIC #write file $fd=fopen($file,"wb"); if ($fd) { fputs($fd,base64_decode($base64_1x1_jpeg)); fclose($fd); } -else { echo "error cant write $file".PHP_EOL;exit(1); } +else { echo "error can't write $file".PHP_EOL;exit(1); } #check file md5 $md5=md5_file($file); if ($md5!="07dd8594450e8c18ab8a79d7cb4573c7") { echo "md5 error".PHP_EOL;exit(1); } @@ -70,7 +70,7 @@ $content = iptcembed($iptc, $file,0); if ($content === false) {echo "iptcembed error".PHP_EOL;exit(1); } $fd=fopen($file2,"wb"); if ($fd) { fputs($fd,$content); fclose($fd); } -else { echo "error cant write $file2".PHP_EOL;exit(1); } +else { echo "error can't write $file2".PHP_EOL;exit(1); } #check jpeg properties for new image with iptc tags diff --git a/ext/standard/tests/mail/mail_include.inc b/ext/standard/tests/mail/mail_include.inc index 8d7a8a9a1c..ba7ee121b5 100644 --- a/ext/standard/tests/mail/mail_include.inc +++ b/ext/standard/tests/mail/mail_include.inc @@ -31,7 +31,7 @@ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = nul echo "Create a temporary mailbox and add " . $message_count . " msgs\n"; $new_mailbox = create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type); if ($new_mailbox === false) { - echo "Cant create a temporary mailbox: " . imap_last_error(). "\n"; + echo "Can't create a temporary mailbox: " . imap_last_error(). "\n"; return false; } @@ -39,7 +39,7 @@ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = nul // reopen stream to new mailbox if (imap_reopen($imap_stream, $new_mailbox) === false) { - echo "cant re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n"; + echo "can't re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n"; return false; } diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt index 628980df27..4de6c75697 100644 --- a/ext/standard/tests/strings/addslashes_variation2.phpt +++ b/ext/standard/tests/strings/addslashes_variation2.phpt @@ -8,7 +8,7 @@ Test addslashes() function : usage variations - strings with characters to be ba */ /* - * Test addslashes() with various strings containing characters thats can be backslashed + * Test addslashes() with various strings containing characters that can be backslashed */ echo "*** Testing addslashes() : with various strings containing characters to be backslashed ***\n"; diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt index 4cca47ac96f519cf7d04a9b00c2bbdca72bdebe9..7c4fe920adc05145607c209d9e55c98f648e115a 100644 GIT binary patch delta 37 kcmZ3ska5{U#tr-|9J!gr$*DOxiJQe)^1KkdUO!1D007VpCjbBd delta 37 kcmZ3ska5{U#tr-|9KM;w$*DOxshh=F^1KkdUO!1D0Q@No?*IS* diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index 1e0f5d18a262abec1372681f11948390dc2be8ee..e18a8542448cb35cb9576c77e73758e7f27e57f3 100644 GIT binary patch delta 37 kcmbO`fpP8x#tr|OIdU_LlT&kY5;wE6e04($$Enw29rvp6|5Cns_9W!4G&2wt}6B1QoER1KQ| delta 35 icmeCx>($$Enw7&hvp6|5Cnt6DW!4G&2wt}6B1Qo9ybWUj diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index c9b1d0256d..4c8e6a44dc 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -8,7 +8,7 @@ Test strripos() function : usage variations - heredoc string containing special */ /* Test strripos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offsets */ echo "*** Testing strripos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index 1d9184d787..e885c7dfae 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -8,7 +8,7 @@ Test strrpos() function : usage variations - heredoc string containing special c */ /* Test strrpos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offsets */ echo "*** Testing strrpos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index 22fe2d0da93be4edd8bdf85d35bdf27c5e521a7f..afe065ff60028735a28396aef6ccf6768fb34c90 100644 GIT binary patch delta 35 jcmX@&b;N7KI#!O{%;MzKoSekX+gPuOAb3-xHgEv|5K0c0 delta 35 jcmX@&b;N7KI#v$f%;MzKoSf9n+gPuOAb3-xHgEv|3$hMh diff --git a/ext/standard/tests/url/bug47174.phpt b/ext/standard/tests/url/bug47174.phpt index 6d08063253..a47b0e9666 100644 --- a/ext/standard/tests/url/bug47174.phpt +++ b/ext/standard/tests/url/bug47174.phpt @@ -3,7 +3,7 @@ Bug #47174 (base64_decode() interprets pad char in mid string as terminator) --FILE-- + --FILE-- + --FILE--