From 8d86597d7368460383a33a4399ea7a8b244cd6fa Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Wed, 24 Jul 2013 00:55:43 +0100 Subject: [PATCH] non living code related typo fixes --- .../bugs/overridding-conflicting-methods.phpt | 2 +- Zend/zend_builtin_functions.c | 2 +- Zend/zend_compile.c | 6 +++--- Zend/zend_execute_API.c | 2 +- Zend/zend_globals.h | 2 +- Zend/zend_language_scanner.h | 2 +- configure.in | 2 +- ext/date/php_date.c | 2 +- ext/date/php_date.h | 2 +- ext/dom/tests/bug44648.phpt | 2 +- ext/fileinfo/tests/magic | 2 +- ext/ftp/ftp.c | 2 +- ext/mbstring/oniguruma/HISTORY | 2 +- ext/mbstring/tests/mb_http_output.phpt | 2 +- ext/mysql/php_mysql.c | 2 +- ext/mysqli/tests/mysqli_get_client_stats.phpt | 2 +- ext/mysqlnd/mysqlnd_net.c | 2 +- ext/pdo_pgsql/tests/bug_33876.phpt | 2 +- ext/posix/tests/posix_ctermid.phpt | 2 +- ext/reflection/php_reflection.c | 2 +- ext/session/tests/020.phpt | 2 +- ext/spl/internal/splobjectstorage.inc | 2 +- ext/spl/spl.php | 4 ++-- ..._priorityqeue_insert_two_params_error.phpt | 2 +- ext/sqlite3/libsqlite/sqlite3.c | 12 ++++++------ ext/standard/pack.c | 2 +- .../array/array_count_values_variation.phpt | 4 ++-- .../tests/file/chmod_basic-win32.phpt | 2 +- ext/standard/tests/file/chmod_basic.phpt | 2 +- ext/standard/tests/strings/lcfirst.phpt | Bin 6877 -> 6878 bytes ext/standard/tests/strings/str_replace.phpt | 2 +- .../tests/strings/str_replace_variation3.phpt | 2 +- ext/standard/tests/strings/strcasecmp.phpt | Bin 22268 -> 22269 bytes ext/standard/tests/strings/strcmp.phpt | Bin 20034 -> 20035 bytes ext/standard/tests/strings/strlen.phpt | Bin 7090 -> 7091 bytes ext/standard/tests/strings/strpos.phpt | Bin 9981 -> 9982 bytes ext/standard/tests/strings/strstr.phpt | Bin 10530 -> 10531 bytes ext/standard/tests/strings/ucfirst.phpt | Bin 6105 -> 6106 bytes ext/tidy/tidy.c | 2 +- ext/xmlrpc/libxmlrpc/xml_to_soap.c | 2 +- sapi/apache/config.m4 | 2 +- sapi/apache2filter/config.m4 | 2 +- sapi/apache2handler/config.m4 | 2 +- sapi/apache_hooks/config.m4 | 2 +- sapi/fpm/php-fpm.conf.in | 2 +- scripts/dev/generate-phpt.phar | Bin 52355 -> 52356 bytes .../generate-phpt/src/testcase/gtTestCase.php | 2 +- tests/classes/static_properties_004.phpt | 4 ++-- 48 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt index fc09a367bde..0bbea110055 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt @@ -1,5 +1,5 @@ --TEST-- -Overridding Conflicting Methods should not result in a notice/warning about collisions +Overriding Conflicting Methods should not result in a notice/warning about collisions --FILE-- u.op_array; - /* Pop the switch and foreach seperators */ + /* Pop the switch and foreach separators */ zend_stack_del_top(&CG(switch_cond_stack)); zend_stack_del_top(&CG(foreach_copy_stack)); } @@ -2584,7 +2584,7 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /* { zend_op *opline; - /* If we reach the seperator then stop applying the stack */ + /* If we reach the separator then stop applying the stack */ if (foreach_copy->result_type == IS_UNUSED && foreach_copy->op1_type == IS_UNUSED) { return 1; } diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 9bffe9eff80..6fa7e9bafb1 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1072,7 +1072,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, const zend_ } /* The compiler is not-reentrant. Make sure we __autoload() only during run-time - * (doesn't impact fuctionality of __autoload() + * (doesn't impact functionality of __autoload() */ if (!use_autoload || zend_is_compiling(TSRMLS_C)) { if (!key) { diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 58392c199bd..646e9c9a608 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -306,7 +306,7 @@ struct _zend_php_scanner_globals { unsigned char *script_filtered; size_t script_filtered_size; - /* input/ouput filters */ + /* input/output filters */ zend_encoding_filter input_filter; zend_encoding_filter output_filter; const zend_encoding *script_encoding; diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h index 826ad7aba65..704547825ab 100644 --- a/Zend/zend_language_scanner.h +++ b/Zend/zend_language_scanner.h @@ -44,7 +44,7 @@ typedef struct _zend_lex_state { unsigned char *script_filtered; size_t script_filtered_size; - /* input/ouput filters */ + /* input/output filters */ zend_encoding_filter input_filter; zend_encoding_filter output_filter; const zend_encoding *script_encoding; diff --git a/configure.in b/configure.in index 35e5c3e5888..3d707584268 100644 --- a/configure.in +++ b/configure.in @@ -1582,7 +1582,7 @@ cat < --FILE-- diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index 374734d57a4..aa75fb65bc1 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -11969,7 +11969,7 @@ #>65 string ZSYS (Pre-System 7 system file) #>65 string acf3 (Aldus FreeHand) #>65 string cdev (control panel) -#>65 string dfil (Desk Acessory suitcase) +#>65 string dfil (Desk Accessory suitcase) #>65 string libr (library) #>65 string nX^d (WriteNow word processor) #>65 string nX^w (WriteNow dictionary) diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index bde4792a14a..dd41f027042 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -39,7 +39,7 @@ #ifdef PHP_WIN32 #include #elif defined(NETWARE) -#ifdef USE_WINSOCK /* Modified to use Winsock (NOVSOCK2.H), atleast for now */ +#ifdef USE_WINSOCK /* Modified to use Winsock (NOVSOCK2.H), at least for now */ #include #else #include diff --git a/ext/mbstring/oniguruma/HISTORY b/ext/mbstring/oniguruma/HISTORY index 55c5572fa03..647a4609069 100644 --- a/ext/mbstring/oniguruma/HISTORY +++ b/ext/mbstring/oniguruma/HISTORY @@ -673,7 +673,7 @@ History 2004/10/18: [impl] (thanks Imai Yasumasa) enclose #include by #ifndef __BORLANDC__. 2004/10/18: [bug] (thanks Imai Yasumasa) - memory acess violation in select_opt_exact_info(). + memory access violation in select_opt_exact_info(). 2004/09/25: [dist] fix doc/API and doc/API.ja. 2004/09/25: [bug] fix OP_SEMI_END_BUF process in match_at() for the case USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt index 7fb3335fe22..6f149bfc9fe 100644 --- a/ext/mbstring/tests/mb_http_output.phpt +++ b/ext/mbstring/tests/mb_http_output.phpt @@ -4,7 +4,7 @@ mb_http_output() --FILE-- "" as string, which pgsql doesn't like if (!$res->execute(array(false))) { $err = $res->errorInfo(); - // Strip additional lines ouputted by recent PgSQL versions + // Strip additional lines outputted by recent PgSQL versions $err[2] = trim(current(explode("\n", $err[2]))); print_r($err); } else { diff --git a/ext/posix/tests/posix_ctermid.phpt b/ext/posix/tests/posix_ctermid.phpt index f77da00aabf..551ed7304e2 100644 --- a/ext/posix/tests/posix_ctermid.phpt +++ b/ext/posix/tests/posix_ctermid.phpt @@ -13,7 +13,7 @@ PHP Testfest Berlin 2009-05-10 } // needed because of #ifdef HAVE_CTERMID in posix.c if (!function_exists('posix_ctermid')) { - die('SKIP - Fuction posix_ctermid() not available'); + die('SKIP - Function posix_ctermid() not available'); } ?> --FILE-- diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 6c4d8062369..c4a7c554f00 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -5237,7 +5237,7 @@ ZEND_METHOD(reflection_extension, getVersion) /* }}} */ /* {{{ proto public ReflectionFunction[] ReflectionExtension::getFunctions() - Returns an array of this extension's fuctions */ + Returns an array of this extension's functions */ ZEND_METHOD(reflection_extension, getFunctions) { reflection_object *intern; diff --git a/ext/session/tests/020.phpt b/ext/session/tests/020.phpt index f43bac5d1fd..01411298201 100644 --- a/ext/session/tests/020.phpt +++ b/ext/session/tests/020.phpt @@ -1,5 +1,5 @@ --TEST-- -rewriter uses arg_seperator.output for modifying URLs +rewriter uses arg_separator.output for modifying URLs --SKIPIF-- --INI-- diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc index fa164066c70..ffc6c994889 100644 --- a/ext/spl/internal/splobjectstorage.inc +++ b/ext/spl/internal/splobjectstorage.inc @@ -16,7 +16,7 @@ * @since PHP 5.1.2 * * This container allows to store objects uniquly without the need to compare - * them one by one. This is only possible internally. The code represenation + * them one by one. This is only possible internally. The code representation * here therefore has a complexity of O(n) while the actual implementation has * complexity O(1). */ diff --git a/ext/spl/spl.php b/ext/spl/spl.php index fdffda36875..3638a5a2b77 100755 --- a/ext/spl/spl.php +++ b/ext/spl/spl.php @@ -260,7 +260,7 @@ class Exception /** The exception message */ protected $message; - /** The string represenations as generated during construction */ + /** The string representations as generated during construction */ private $string; /** The code passed to the constructor */ @@ -336,7 +336,7 @@ class Exception { } - /** @return string represenation of exception + /** @return string representation of exception */ public function __toString() { diff --git a/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt b/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt index 659ffb4bc06..076c6877123 100644 --- a/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt +++ b/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: priorityQueue paramter test on insert method +SPL: priorityQueue parameter test on insert method --CREDITS-- Sean Burlington www.practicalweb.co.uk TestFest London May 2009 diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index bf06ae48317..3d71ebb18d0 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -12731,7 +12731,7 @@ struct VdbeFunc { */ struct sqlite3_context { FuncDef *pFunc; /* Pointer to function information. MUST BE FIRST */ - VdbeFunc *pVdbeFunc; /* Auxilary data, if created. */ + VdbeFunc *pVdbeFunc; /* Auxiliary data, if created. */ Mem s; /* The return value is stored here */ Mem *pMem; /* Memory cell used to store aggregate context */ int isError; /* Error code returned by the function. */ @@ -44929,7 +44929,7 @@ SQLITE_PRIVATE int sqlite3WalOpen( } /* -** Change the size to which the WAL file is trucated on each reset. +** Change the size to which the WAL file is truncated on each reset. */ SQLITE_PRIVATE void sqlite3WalLimit(Wal *pWal, i64 iLimit){ if( pWal ) pWal->mxWalSize = iLimit; @@ -59355,7 +59355,7 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){ /* The complex case - There is a multi-file write-transaction active. ** This requires a master journal file to ensure the transaction is - ** committed atomicly. + ** committed atomically. */ #ifndef SQLITE_OMIT_DISKIO else{ @@ -61383,7 +61383,7 @@ SQLITE_API void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){ } /* -** Return the auxilary data pointer, if any, for the iArg'th argument to +** Return the auxiliary data pointer, if any, for the iArg'th argument to ** the user-function defined by pCtx. */ SQLITE_API void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){ @@ -61398,7 +61398,7 @@ SQLITE_API void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){ } /* -** Set the auxilary data pointer and delete function, for the iArg'th +** Set the auxiliary data pointer and delete function, for the iArg'th ** argument to the user-function defined by pCtx. Any previous value is ** deleted by calling the delete function specified when it was set. */ @@ -63408,7 +63408,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec( } #endif - /* On any opcode with the "out2-prerelase" tag, free any + /* On any opcode with the "out2-prerelease" tag, free any ** external allocations out of mem[p2] and set mem[p2] to be ** an undefined integer. Opcodes will either fill in the integer ** value or convert mem[p2] to a different type. diff --git a/ext/standard/pack.c b/ext/standard/pack.c index a09793e4847..eb80395f53b 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -503,7 +503,7 @@ static long php_unpack(char *data, int size, int issigned, int *map) /* unpack() is based on Perl's unpack(), but is modified a bit from there. * Rather than depending on error-prone ordered lists or syntactically - * unpleasant pass-by-reference, we return an object with named paramters + * unpleasant pass-by-reference, we return an object with named parameters * (like *_fetch_object()). Syntax is "f[repeat]name/...", where "f" is the * formatter char (like pack()), "[repeat]" is the optional repeater argument, * and "name" is the name of the variable to use. diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 89d7f37b1fe..1d614b452ad 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_count_values() function : Test all normal paramter variations +Test array_count_values() function : Test all normal parameter variations --FILE-- de3x27w6_q&JaNWCo2UL delta 12 Tcmca-de?MA7w6_~&R{_RCo=^U diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index 830378b9a15..15c1c8e53d0 100644 --- a/ext/standard/tests/strings/str_replace.phpt +++ b/ext/standard/tests/strings/str_replace.phpt @@ -120,7 +120,7 @@ var_dump($count); echo "\n-- Testing objects --\n"; /* we get "Catchable fatal error: saying Object of class could not be converted to string" by default, when an object is passed instead of string: -The error can be avoided by chosing the __toString magix method as follows: */ +The error can be avoided by choosing the __toString magix method as follows: */ class subject { diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 9b19153fa81..7b46f8b2869 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -33,7 +33,7 @@ var_dump($count); echo "\n-- Testing objects --\n"; /* we get "Catchable fatal error: saying Object of class could not be converted to string" by default, when an object is passed instead of string: -The error can be avoided by chosing the __toString magix method as follows: */ +The error can be avoided by choosing the __toString magix method as follows: */ class subject { diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt index 33694f987b83e5bce7854c957bf6f3b5e1473ccc..b3452cfd7c0f6322844e435ebd00b43f78dc060e 100644 GIT binary patch delta 14 Wcmeyfmhtae#trPOo7q^u1p)vx2L=}a delta 14 WcmeynmhsP8#trPOn>kp&1_A&y5C#|k diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index 0693880119111e28445dc0973dc009fbfe8fb0fb..e77ed6e46620eae96697c74a01fb13ab62ad0dc9 100644 GIT binary patch delta 14 WcmX>!hw<+hw;!H#tq+DHveGp_5=Vm$_B0g diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index 5a1114d5cb914991fc22664272000ac6012ebc30..df39f2469ce32f06ac10e1c7ba6265750282828e 100644 GIT binary patch delta 12 UcmdmFzS(@kIkwGb*`A6304J9P*8l(j delta 12 UcmdmNzR7&UIkwH`*`A0104JXX*Z=?k diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt index 9b44584ee165ca5f0a68b7e65966979f68a6605f..44785ef6c8664616e322cb21648c251cb00c27d1 100644 GIT binary patch delta 12 TcmezC`_FenALr&?&H`BgEIS3W delta 12 Tcmez8``33vALr(N&U{$_EJFpf diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index b135258f882e7daa4f120c8750a74153dc61a3a2..bdedb7e9f6719f8eb55e8fed9a16daa8872335fc 100644 GIT binary patch delta 12 TcmZ1!v^Z$P4YtkK*}RniCz}Oz delta 12 TcmZ1+v?yr94YtiU*}RkhC!+;+ diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt index bae40955dbe78b4de4b31fae75333b6946bc90a2..468f7f034e6d10142893677f957b78d983df1cb1 100644 GIT binary patch delta 12 Tcmcbqe@lPEMYhcs*f<3ND7OVX delta 12 Tcmcbme^Ykey, TOKEN_MUSTUNDERSTAND)) { b_must_understand = strchr(attr_iter->val, '1') ? 1 : 0; } - /* actor, used in conjuction with must understand. */ + /* actor, used in conjunction with must understand. */ else if (!strcmp(attr_iter->key, TOKEN_ACTOR)) { actor = attr_iter->val; } diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index af83e9bcfa2..1961289de00 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -59,7 +59,7 @@ if test "$PHP_APXS" != "no"; then # Test that we're trying to configure with apache 1.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test "$APACHE_VERSION" -ge 2000000; then - AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) + AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2]) fi for flag in $APXS_CFLAGS; do diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index c49488d1824..b6524fd874e 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -62,7 +62,7 @@ if test "$PHP_APXS2FILTER" != "no"; then # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test "$APACHE_VERSION" -le 2000000; then - AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) + AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)]) elif test "$APACHE_VERSION" -lt 2000040; then AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required]) fi diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 702f91f5d23..753de10ba85 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -61,7 +61,7 @@ if test "$PHP_APXS2" != "no"; then # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test "$APACHE_VERSION" -le 2000000; then - AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) + AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)]) elif test "$APACHE_VERSION" -lt 2000044; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4 index 4213b7c6a60..672f2980844 100644 --- a/sapi/apache_hooks/config.m4 +++ b/sapi/apache_hooks/config.m4 @@ -60,7 +60,7 @@ if test "$PHP_APACHE_HOOKS" != "no"; then # Test that we're trying to configure with apache 1.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test "$APACHE_VERSION" -ge 2000000; then - AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) + AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2]) fi for flag in $APXS_CFLAGS; do diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index 6912477b859..af4f2fa325a 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -401,7 +401,7 @@ pm.max_spare_servers = 3 ; - %{megabytes}M ; - %{mega}M ; %n: pool name -; %o: ouput header +; %o: output header ; it must be associated with embraces to specify the name of the header: ; - %{Content-Type}o ; - %{X-Powered-By}o diff --git a/scripts/dev/generate-phpt.phar b/scripts/dev/generate-phpt.phar index 0112d87a9719a9aa2ad822b24bbda31373722e58..c6268c0af3814be15272e90e705a432000cf2328 100644 GIT binary patch delta 18 acmZpk$=ouNd4to0$w%S^HwR5Hv;hD~_Xmpr delta 14 VcmZpf$=p1Xd4to0&CU}XZ2&Bc1;qdW diff --git a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php index cc5e19a5ae5..60c115a9c1a 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php @@ -104,7 +104,7 @@ abstract class gtTestCase { /** - * Add contructor argument initialisation to test case + * Add constructor argument initialisation to test case * */ public function constructorArgInit() { diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt index ce1d19dcc10..e98c605eb47 100644 --- a/tests/classes/static_properties_004.phpt +++ b/tests/classes/static_properties_004.phpt @@ -6,7 +6,7 @@ class C { public static $p = 'original'; } class D extends C { } class E extends D { } -echo "\nInherited static properties refer to the same value accross classes:\n"; +echo "\nInherited static properties refer to the same value across classes:\n"; var_dump(C::$p, D::$p, E::$p); echo "\nChanging one changes all the others:\n"; @@ -20,7 +20,7 @@ var_dump(C::$p, D::$p, E::$p); ?> ==Done== --EXPECTF-- -Inherited static properties refer to the same value accross classes: +Inherited static properties refer to the same value across classes: %unicode|string%(8) "original" %unicode|string%(8) "original" %unicode|string%(8) "original"