Skip to content

Commit 4b95353

Browse files
vlajosvlajos
committed
1 parent f767451 commit 4b95353

File tree

102 files changed

+141
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+141
-141
lines changed

‎README.TESTING

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ MYMAIL=qa-test@domain.com
123123
TMPDIR=/var/tmp
124124
TODAY=`date +"%Y%m%d"`
125125

126-
# Make sure compilation enviroment is correct
126+
# Make sure compilation environment is correct
127127
CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre'
128128
export MAKE=gmake
129129
export CC=gcc

‎UPGRADING

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ PHP X.Y UPGRADE NOTES
126126
========================================
127127

128128
- Core
129-
. Instead of being undefined and platform-dependant, NaN and Infinity will
129+
. Instead of being undefined and platform-dependent, NaN and Infinity will
130130
always be zero when casted to integer.
131131
. Calling a method on a non-object no longer raises a fatal error; see
132132
also: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object

‎Zend/ZEND_CHANGES

+1-1
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ Changes in the Zend Engine 1.0
11031103
Use ob_start() to begin output buffering, ob_end_flush() to end
11041104
buffering and send out the buffered contents, ob_end_clean() to
11051105
end buffering without sending the buffered contents, and
1106-
ob_get_contents() to retreive the current contents of the output
1106+
ob_get_contents() to retrieve the current contents of the output
11071107
buffer. Header information (header(), content type, cookies) are
11081108
not buffered. By turning on output buffering, you can
11091109
effectively send header information all throughout your file,

‎Zend/tests/bug21478.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ stream_filter_append($fp, "myfilter");
2727
fwrite($fp, "This is a test.\n");
2828
print "Done.\n";
2929
fclose($fp);
30-
// Uncommenting the following 'print' line causes the segfault to stop occuring
30+
// Uncommenting the following 'print' line causes the segfault to stop occurring
3131
// print "2\n";
3232
readfile(dirname(__FILE__)."/test.txt");
3333
unlink(dirname(__FILE__)."/test.txt");

‎Zend/tests/bug33512.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class TheObj {
5353
unset($SomeObj->Virtual1);
5454
unset($SomeObj->{'Virtual'.(3)});
5555

56-
//but, these variables are still available??? eventhough they're "unset"-ed
56+
//but, these variables are still available??? even though they're "unset"-ed
5757
print $SomeObj->Virtual1."\n";
5858
print $SomeObj->{'Virtual'.(3)}."\n";
5959
?>

‎Zend/tests/bug40809.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #40809 (Poor perfomance of ".=")
2+
Bug #40809 (Poor performance of ".=")
33
--FILE--
44
<?php
55
error_reporting(E_ALL|E_STRICT);

‎Zend/tests/bug43200.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #43200 (Interface implementation / inheritence not possible in abstract classes)
2+
Bug #43200 (Interface implementation / inheritance not possible in abstract classes)
33
--FILE--
44
<?php
55

‎Zend/tests/bug43200_2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #43200.2 (Interface implementation / inheritence not possible in abstract classes)
2+
Bug #43200.2 (Interface implementation / inheritance not possible in abstract classes)
33
--FILE--
44
<?php
55

‎Zend/tests/debug_backtrace_with_include_and_this.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ set_error_handler(function($code, $msg, $file, $line) {
2323
});
2424

2525
try {
26-
(new CL())->load('class://non.existant.Class');
26+
(new CL())->load('class://non.existent.Class');
2727
} catch (CLException $e) {
2828
echo $e."\n";
2929
}
3030
--EXPECTF--
31-
ERR#2: include(class://non.existant.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include
32-
ERR#2: include(): Failed opening 'class://non.existant.Class' for inclusion (include_path='%s') @ include
31+
ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include
32+
ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include
3333

34-
Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existant.Class' in %s
34+
Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existent.Class' in %s
3535
Stack trace:
3636
#0 %s(%d): CL->load('class://non.exi...')
3737
#1 {main}

‎Zend/tests/traits/bug54441.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ class Boo {
1616

1717
?>
1818
--EXPECTF--
19-
Fatal error: The modifiers for the trait alias dontKnow() need to be changed in the same statment in which the alias is defined. Error in %s on line %d
19+
Fatal error: The modifiers for the trait alias dontKnow() need to be changed in the same statement in which the alias is defined. Error in %s on line %d

‎Zend/tests/try_finally_010.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Try finally (function call in the finaly block after exception)
2+
Try finally (function call in the finally block after exception)
33
--FILE--
44
<?php
55
function foo() {

‎Zend/tests/varSyntax/tempDimFetchByRefError.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Passing a dimention fetch on a temporary by reference is not allowed
2+
Passing a dimension fetch on a temporary by reference is not allowed
33
--FILE--
44
<?php
55

‎Zend/zend_alloc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* performed using mmap(). The result is aligned on 2M boundary.
3131
*
3232
* Large - a number of 4096K pages inside a CHUNK. Large blocks
33-
* are always alligned on page boundary.
33+
* are always aligned on page boundary.
3434
*
3535
* Small - less than 3/4 of page size. Small sizes are rounded up to nearest
3636
* greater predefined small size (there are 30 predefined sizes:
@@ -272,7 +272,7 @@ struct _zend_mm_page {
272272
};
273273

274274
/*
275-
* bin - is one or few continuous pages (up to 8) used for alocation of
275+
* bin - is one or few continuous pages (up to 8) used for allocation of
276276
* a particular "small size".
277277
*/
278278
struct _zend_mm_bin {

‎Zend/zend_float.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D);
5353
Implementation notes:
5454
5555
x86_64:
56-
- Since all x86_64 compilers use SSE by default, it is probably unecessary
56+
- Since all x86_64 compilers use SSE by default, it is probably unnecessary
5757
to use these macros there. We define them anyway since we are too lazy
5858
to differentiate the architecture. Also, the compiler option -mfpmath=i387
5959
justifies this decision.

‎Zend/zend_gc.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
469469
ht = NULL;
470470
GC_SET_BLACK(GC_INFO(ref));
471471

472-
/* don't count references for compatibilty ??? */
472+
/* don't count references for compatibility ??? */
473473
if (GC_TYPE(ref) != IS_REFERENCE) {
474474
count++;
475475
}
@@ -515,7 +515,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
515515
ZVAL_OBJ(&tmp, obj);
516516
props = get_gc(&tmp, &table, &n TSRMLS_CC);
517517
while (n > 0 && !Z_REFCOUNTED(table[n-1])) {
518-
/* count non-refcounted for compatibilty ??? */
518+
/* count non-refcounted for compatibility ??? */
519519
if (Z_TYPE(table[n-1]) != IS_UNDEF) {
520520
count++;
521521
}
@@ -532,7 +532,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
532532
} else {
533533
count += gc_collect_white(ref TSRMLS_CC);
534534
}
535-
/* count non-refcounted for compatibilty ??? */
535+
/* count non-refcounted for compatibility ??? */
536536
} else if (Z_TYPE(table[i]) != IS_UNDEF) {
537537
count++;
538538
}
@@ -563,7 +563,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
563563
for (idx = 0; idx < ht->nNumUsed; idx++) {
564564
p = ht->arData + idx;
565565
if (!Z_REFCOUNTED(p->val)) {
566-
/* count non-refcounted for compatibilty ??? */
566+
/* count non-refcounted for compatibility ??? */
567567
if (Z_TYPE(p->val) != IS_UNDEF && Z_TYPE(p->val) != IS_INDIRECT) {
568568
count++;
569569
}

‎Zend/zend_inheritance.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
12061206
}
12071207
zend_check_trait_usage(ce, cur_precedence->trait_method->ce TSRMLS_CC);
12081208

1209-
/** Ensure that the prefered method is actually available. */
1209+
/** Ensure that the preferred method is actually available. */
12101210
lcname = zend_string_alloc(cur_method_ref->method_name->len, 0);
12111211
zend_str_tolower_copy(lcname->val,
12121212
cur_method_ref->method_name->val,
@@ -1507,7 +1507,7 @@ static void zend_do_check_for_inconsistent_traits_aliasing(zend_class_entry *ce
15071507
lc_method_name)) {
15081508
zend_string_free(lc_method_name);
15091509
zend_error_noreturn(E_COMPILE_ERROR,
1510-
"The modifiers for the trait alias %s() need to be changed in the same statment in which the alias is defined. Error",
1510+
"The modifiers for the trait alias %s() need to be changed in the same statement in which the alias is defined. Error",
15111511
cur_alias->trait_method->method_name->val);
15121512
} else {
15131513
zend_string_free(lc_method_name);

‎Zend/zend_object_handlers.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static void zend_std_call_getter(zval *object, zval *member, zval *retval TSRMLS
184184
/* __get handler is called with one argument:
185185
property name
186186
187-
it should return whether the call was successfull or not
187+
it should return whether the call was successful or not
188188
*/
189189
if (Z_REFCOUNTED_P(member)) Z_ADDREF_P(member);
190190

@@ -207,7 +207,7 @@ static int zend_std_call_setter(zval *object, zval *member, zval *value TSRMLS_D
207207
property name
208208
value to be set
209209
210-
it should return whether the call was successfull or not
210+
it should return whether the call was successful or not
211211
*/
212212
zend_call_method_with_2_params(object, ce, &ce->__set, ZEND_SET_FUNC_NAME, &retval, member, value);
213213

‎ext/com_dotnet/com_typeinfo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codep
6767
hr = LoadRegTypeLib((REFGUID)&clsid, major_i, minor_i, LANG_NEUTRAL, &TL);
6868

6969
/* if that failed, assumed that the GUID is actually a CLSID and
70-
* attemp to get the library via an instance of that class */
70+
* attempt to get the library via an instance of that class */
7171
if (FAILED(hr) && (major == NULL || minor == NULL)) {
7272
IDispatch *disp = NULL;
7373
ITypeInfo *info = NULL;

‎ext/ctype/ctype.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
current locale.
1010
</para>
1111
<para>
12-
When called with an integer argument theese functions
12+
When called with an integer argument these functions
1313
behave exactly like their C counterparts.
1414
</para>
1515
<para>

‎ext/dba/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ inifile This is available since PHP 4.3.3 to be able to modify php.ini
3939
As the functions dba_firstkey() and dba_nextkey() return string
4040
representations of the key there is a new function dba_key_split()
4141
available since PHP 5 which allows to convert the string keys into
42-
array keys without loosing FALSE.
42+
array keys without losing FALSE.
4343
qdbm This is available since PHP 5.0.0. The qdbm library can be loaded
4444
from http://qdbm.sourceforge.net.
4545

‎ext/ereg/regex/regcomp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ int starordinary; /* is a leading * an ordinary character? */
450450
register sopno subno;
451451
# define BACKSL (1<<CHAR_BIT)
452452

453-
pos = HERE(); /* repetion op, if any, covers from here */
453+
pos = HERE(); /* repetition op, if any, covers from here */
454454

455455
assert(MORE()); /* caller should have ensured this */
456456
c = GETNEXT();

‎ext/intl/collator/collator_convert.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ zval* collator_convert_object_to_string( zval* obj, zval *rv TSRMLS_DC )
273273
}
274274
}
275275

276-
/* Object wasn't successfuly converted => bail out. */
276+
/* Object wasn't successfully converted => bail out. */
277277
if( zstr == NULL )
278278
{
279279
COLLATOR_CONVERT_RETURN_FAILED( obj );

‎ext/intl/collator/collator_sort.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
482482
sortKeyIndxBuf = erealloc( sortKeyIndxBuf, sortKeyIndxBufSize );
483483
}
484484

485-
sortKeyIndxBuf[sortKeyCount].key = (char*)sortKeyBufOffset; /* remeber just offset, cause address */
485+
sortKeyIndxBuf[sortKeyCount].key = (char*)sortKeyBufOffset; /* remember just offset, cause address */
486486
/* of 'sortKeyBuf' may be changed due to realloc. */
487487
sortKeyIndxBuf[sortKeyCount].zstr = hashData;
488488

‎ext/intl/doc/datefmt_api.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function isLenient() {}
150150
* time patterns, parsing as much as possible to obtain a value.
151151
* 'false' sets the parser to strictly parse strings into dates.
152152
* Extra space, unrecognized tokens, or invalid values
153-
* ("Feburary 30th") are not accepted.
153+
* ("February 30th") are not accepted.
154154
*
155155
* @return boolean 'true' if successful; 'false' if an error occurred.
156156
*/
@@ -338,7 +338,7 @@ function datefmt_is_lenient($fmt) {}
338338
* time patterns, parsing as much as possible to obtain a value.
339339
* 'false' sets the parser to strictly parse strings into dates.
340340
* Extra space, unrecognized tokens, or invalid values
341-
* ("Feburary 30th") are not accepted.
341+
* ("February 30th") are not accepted.
342342
*
343343
* @return boolean 'true' if successful; 'false' if an error occurred.
344344
*/

‎ext/intl/intl_convert.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void intl_convert_utf8_to_utf16(
6161

6262
if( *status == U_ZERO_ERROR )
6363
{
64-
/* String is converted successfuly */
64+
/* String is converted successfully */
6565
(*target)[dst_len] = 0;
6666
*target_len = dst_len;
6767
return;

‎ext/intl/tests/bug60192-compare.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Bug #60192 (SegFault when Collator not constructed properly)
88
<?php
99
class Collator2 extends Collator{
1010
public function __construct() {
11-
// ommitting parent::__construct($someLocale);
11+
// omitting parent::__construct($someLocale);
1212
}
1313
}
1414

‎ext/intl/tests/bug60192-getlocale.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)
99

1010
class Collator2 extends Collator{
1111
public function __construct() {
12-
// ommitting parent::__construct($someLocale);
12+
// omitting parent::__construct($someLocale);
1313
}
1414
}
1515

‎ext/intl/tests/bug60192-getsortkey.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)
99

1010
class Collator2 extends Collator{
1111
public function __construct() {
12-
// ommitting parent::__construct($someLocale);
12+
// omitting parent::__construct($someLocale);
1313
}
1414
}
1515

‎ext/intl/tests/bug60192-sort.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)
99

1010
class Collator2 extends Collator{
1111
public function __construct() {
12-
// ommitting parent::__construct($someLocale);
12+
// omitting parent::__construct($someLocale);
1313
}
1414
}
1515

‎ext/intl/tests/bug60192-sortwithsortkeys.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)
99

1010
class Collator2 extends Collator{
1111
public function __construct() {
12-
// ommitting parent::__construct($someLocale);
12+
// omitting parent::__construct($someLocale);
1313
}
1414
}
1515

‎ext/intl/tests/collator_get_error_code.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ get_error_code()
66
<?php
77

88
/*
9-
* Retreive error code.
9+
* Retrieve error code.
1010
*/
1111

1212

‎ext/intl/tests/collator_get_error_message.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ get_error_message()
66
<?php
77

88
/*
9-
* Retreive error message.
9+
* Retrieve error message.
1010
*/
1111

1212

‎ext/mysql/tests/mysql_deprecated_api.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ error_reporting=E_ALL | E_NOTICE | E_STRICT
1313
/*
1414
We use an extra test to cover deprecation warning.
1515
Due to this extra test we can silence deprecation warnings
16-
in have other test using @ operator without loosing the information
16+
in have other test using @ operator without losing the information
1717
which function is deprecated and, without reducing test portability.
1818
*/
1919
include "table.inc";

‎ext/mysqlnd/mysqlnd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#define MYSQLND_STRING_TO_INT_CONVERSION
3131
/*
32-
This force mysqlnd to do a single (or more depending on ammount of data)
32+
This force mysqlnd to do a single (or more depending on amount of data)
3333
non-blocking read() calls before sending a command to the server. Useful
3434
for debugging, if previous function hasn't consumed all the output sent
3535
to it - like stmt_send_long_data() error because the data was larger that

‎ext/oci8/oci8.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ static void php_oci_pconnection_list_np_dtor(zend_resource *entry TSRMLS_DC)
14751475
* semantics. With the PECL OCI 1.3.x extensions, we release pconnections when oci_close
14761476
* takes the refcount to zero.
14771477
*
1478-
* If oci_old_close_semantics is set, we artifically bump up the refcount and decremented
1478+
* If oci_old_close_semantics is set, we artificially bump up the refcount and decremented
14791479
* only at request shutdown.
14801480
*/
14811481
php_oci_connection_release(connection TSRMLS_CC);

‎ext/oci8/tests/bug36010.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #36010 (Crash when executing SQL statment with lob parameter twice)
2+
Bug #36010 (Crash when executing SQL statement with lob parameter twice)
33
--SKIPIF--
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs

0 commit comments

Comments
 (0)