Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
vlajos committed Nov 19, 2014
1 parent f767451 commit 4b95353
Show file tree
Hide file tree
Showing 102 changed files with 141 additions and 141 deletions.
2 changes: 1 addition & 1 deletion README.TESTING
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ [email protected]
TMPDIR=/var/tmp
TODAY=`date +"%Y%m%d"`

# Make sure compilation enviroment is correct
# Make sure compilation environment is correct
CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre'
export MAKE=gmake
export CC=gcc
Expand Down
2 changes: 1 addition & 1 deletion UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ PHP X.Y UPGRADE NOTES
========================================

- Core
. Instead of being undefined and platform-dependant, NaN and Infinity will
. Instead of being undefined and platform-dependent, NaN and Infinity will
always be zero when casted to integer.
. Calling a method on a non-object no longer raises a fatal error; see
also: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object
Expand Down
2 changes: 1 addition & 1 deletion Zend/ZEND_CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ Changes in the Zend Engine 1.0
Use ob_start() to begin output buffering, ob_end_flush() to end
buffering and send out the buffered contents, ob_end_clean() to
end buffering without sending the buffered contents, and
ob_get_contents() to retreive the current contents of the output
ob_get_contents() to retrieve the current contents of the output
buffer. Header information (header(), content type, cookies) are
not buffered. By turning on output buffering, you can
effectively send header information all throughout your file,
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/bug21478.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stream_filter_append($fp, "myfilter");
fwrite($fp, "This is a test.\n");
print "Done.\n";
fclose($fp);
// Uncommenting the following 'print' line causes the segfault to stop occuring
// Uncommenting the following 'print' line causes the segfault to stop occurring
// print "2\n";
readfile(dirname(__FILE__)."/test.txt");
unlink(dirname(__FILE__)."/test.txt");
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/bug33512.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TheObj {
unset($SomeObj->Virtual1);
unset($SomeObj->{'Virtual'.(3)});

//but, these variables are still available??? eventhough they're "unset"-ed
//but, these variables are still available??? even though they're "unset"-ed
print $SomeObj->Virtual1."\n";
print $SomeObj->{'Virtual'.(3)}."\n";
?>
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/bug40809.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Bug #40809 (Poor perfomance of ".=")
Bug #40809 (Poor performance of ".=")
--FILE--
<?php
error_reporting(E_ALL|E_STRICT);
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/bug43200.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Bug #43200 (Interface implementation / inheritence not possible in abstract classes)
Bug #43200 (Interface implementation / inheritance not possible in abstract classes)
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/bug43200_2.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Bug #43200.2 (Interface implementation / inheritence not possible in abstract classes)
Bug #43200.2 (Interface implementation / inheritance not possible in abstract classes)
--FILE--
<?php

Expand Down
8 changes: 4 additions & 4 deletions Zend/tests/debug_backtrace_with_include_and_this.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ set_error_handler(function($code, $msg, $file, $line) {
});

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

Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existant.Class' in %s
Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existent.Class' in %s
Stack trace:
#0 %s(%d): CL->load('class://non.exi...')
#1 {main}
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/traits/bug54441.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ class Boo {

?>
--EXPECTF--
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
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
2 changes: 1 addition & 1 deletion Zend/tests/try_finally_010.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Try finally (function call in the finaly block after exception)
Try finally (function call in the finally block after exception)
--FILE--
<?php
function foo() {
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/varSyntax/tempDimFetchByRefError.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Passing a dimention fetch on a temporary by reference is not allowed
Passing a dimension fetch on a temporary by reference is not allowed
--FILE--
<?php

Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* performed using mmap(). The result is aligned on 2M boundary.
*
* Large - a number of 4096K pages inside a CHUNK. Large blocks
* are always alligned on page boundary.
* are always aligned on page boundary.
*
* Small - less than 3/4 of page size. Small sizes are rounded up to nearest
* greater predefined small size (there are 30 predefined sizes:
Expand Down Expand Up @@ -272,7 +272,7 @@ struct _zend_mm_page {
};

/*
* bin - is one or few continuous pages (up to 8) used for alocation of
* bin - is one or few continuous pages (up to 8) used for allocation of
* a particular "small size".
*/
struct _zend_mm_bin {
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_float.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D);
Implementation notes:
x86_64:
- Since all x86_64 compilers use SSE by default, it is probably unecessary
- Since all x86_64 compilers use SSE by default, it is probably unnecessary
to use these macros there. We define them anyway since we are too lazy
to differentiate the architecture. Also, the compiler option -mfpmath=i387
justifies this decision.
Expand Down
8 changes: 4 additions & 4 deletions Zend/zend_gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
ht = NULL;
GC_SET_BLACK(GC_INFO(ref));

/* don't count references for compatibilty ??? */
/* don't count references for compatibility ??? */
if (GC_TYPE(ref) != IS_REFERENCE) {
count++;
}
Expand Down Expand Up @@ -515,7 +515,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
ZVAL_OBJ(&tmp, obj);
props = get_gc(&tmp, &table, &n TSRMLS_CC);
while (n > 0 && !Z_REFCOUNTED(table[n-1])) {
/* count non-refcounted for compatibilty ??? */
/* count non-refcounted for compatibility ??? */
if (Z_TYPE(table[n-1]) != IS_UNDEF) {
count++;
}
Expand All @@ -532,7 +532,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
} else {
count += gc_collect_white(ref TSRMLS_CC);
}
/* count non-refcounted for compatibilty ??? */
/* count non-refcounted for compatibility ??? */
} else if (Z_TYPE(table[i]) != IS_UNDEF) {
count++;
}
Expand Down Expand Up @@ -563,7 +563,7 @@ static int gc_collect_white(zend_refcounted *ref TSRMLS_DC)
for (idx = 0; idx < ht->nNumUsed; idx++) {
p = ht->arData + idx;
if (!Z_REFCOUNTED(p->val)) {
/* count non-refcounted for compatibilty ??? */
/* count non-refcounted for compatibility ??? */
if (Z_TYPE(p->val) != IS_UNDEF && Z_TYPE(p->val) != IS_INDIRECT) {
count++;
}
Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_inheritance.c
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
}
zend_check_trait_usage(ce, cur_precedence->trait_method->ce TSRMLS_CC);

/** Ensure that the prefered method is actually available. */
/** Ensure that the preferred method is actually available. */
lcname = zend_string_alloc(cur_method_ref->method_name->len, 0);
zend_str_tolower_copy(lcname->val,
cur_method_ref->method_name->val,
Expand Down Expand Up @@ -1507,7 +1507,7 @@ static void zend_do_check_for_inconsistent_traits_aliasing(zend_class_entry *ce
lc_method_name)) {
zend_string_free(lc_method_name);
zend_error_noreturn(E_COMPILE_ERROR,
"The modifiers for the trait alias %s() need to be changed in the same statment in which the alias is defined. Error",
"The modifiers for the trait alias %s() need to be changed in the same statement in which the alias is defined. Error",
cur_alias->trait_method->method_name->val);
} else {
zend_string_free(lc_method_name);
Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_object_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static void zend_std_call_getter(zval *object, zval *member, zval *retval TSRMLS
/* __get handler is called with one argument:
property name
it should return whether the call was successfull or not
it should return whether the call was successful or not
*/
if (Z_REFCOUNTED_P(member)) Z_ADDREF_P(member);

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

Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_typeinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codep
hr = LoadRegTypeLib((REFGUID)&clsid, major_i, minor_i, LANG_NEUTRAL, &TL);

/* if that failed, assumed that the GUID is actually a CLSID and
* attemp to get the library via an instance of that class */
* attempt to get the library via an instance of that class */
if (FAILED(hr) && (major == NULL || minor == NULL)) {
IDispatch *disp = NULL;
ITypeInfo *info = NULL;
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/ctype.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
current locale.
</para>
<para>
When called with an integer argument theese functions
When called with an integer argument these functions
behave exactly like their C counterparts.
</para>
<para>
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/README
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ inifile This is available since PHP 4.3.3 to be able to modify php.ini
As the functions dba_firstkey() and dba_nextkey() return string
representations of the key there is a new function dba_key_split()
available since PHP 5 which allows to convert the string keys into
array keys without loosing FALSE.
array keys without losing FALSE.
qdbm This is available since PHP 5.0.0. The qdbm library can be loaded
from http://qdbm.sourceforge.net.

Expand Down
2 changes: 1 addition & 1 deletion ext/ereg/regex/regcomp.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ int starordinary; /* is a leading * an ordinary character? */
register sopno subno;
# define BACKSL (1<<CHAR_BIT)

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

assert(MORE()); /* caller should have ensured this */
c = GETNEXT();
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/collator/collator_convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ zval* collator_convert_object_to_string( zval* obj, zval *rv TSRMLS_DC )
}
}

/* Object wasn't successfuly converted => bail out. */
/* Object wasn't successfully converted => bail out. */
if( zstr == NULL )
{
COLLATOR_CONVERT_RETURN_FAILED( obj );
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/collator/collator_sort.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
sortKeyIndxBuf = erealloc( sortKeyIndxBuf, sortKeyIndxBufSize );
}

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

Expand Down
4 changes: 2 additions & 2 deletions ext/intl/doc/datefmt_api.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function isLenient() {}
* time patterns, parsing as much as possible to obtain a value.
* 'false' sets the parser to strictly parse strings into dates.
* Extra space, unrecognized tokens, or invalid values
* ("Feburary 30th") are not accepted.
* ("February 30th") are not accepted.
*
* @return boolean 'true' if successful; 'false' if an error occurred.
*/
Expand Down Expand Up @@ -338,7 +338,7 @@ function datefmt_is_lenient($fmt) {}
* time patterns, parsing as much as possible to obtain a value.
* 'false' sets the parser to strictly parse strings into dates.
* Extra space, unrecognized tokens, or invalid values
* ("Feburary 30th") are not accepted.
* ("February 30th") are not accepted.
*
* @return boolean 'true' if successful; 'false' if an error occurred.
*/
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/intl_convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void intl_convert_utf8_to_utf16(

if( *status == U_ZERO_ERROR )
{
/* String is converted successfuly */
/* String is converted successfully */
(*target)[dst_len] = 0;
*target_len = dst_len;
return;
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug60192-compare.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Bug #60192 (SegFault when Collator not constructed properly)
<?php
class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
// omitting parent::__construct($someLocale);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug60192-getlocale.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)

class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
// omitting parent::__construct($someLocale);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug60192-getsortkey.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)

class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
// omitting parent::__construct($someLocale);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug60192-sort.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)

class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
// omitting parent::__construct($someLocale);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug60192-sortwithsortkeys.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly)

class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
// omitting parent::__construct($someLocale);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_get_error_code.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ get_error_code()
<?php

/*
* Retreive error code.
* Retrieve error code.
*/


Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_get_error_message.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ get_error_message()
<?php

/*
* Retreive error message.
* Retrieve error message.
*/


Expand Down
2 changes: 1 addition & 1 deletion ext/mysql/tests/mysql_deprecated_api.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ error_reporting=E_ALL | E_NOTICE | E_STRICT
/*
We use an extra test to cover deprecation warning.
Due to this extra test we can silence deprecation warnings
in have other test using @ operator without loosing the information
in have other test using @ operator without losing the information
which function is deprecated and, without reducing test portability.
*/
include "table.inc";
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqlnd/mysqlnd.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#define MYSQLND_STRING_TO_INT_CONVERSION
/*
This force mysqlnd to do a single (or more depending on ammount of data)
This force mysqlnd to do a single (or more depending on amount of data)
non-blocking read() calls before sending a command to the server. Useful
for debugging, if previous function hasn't consumed all the output sent
to it - like stmt_send_long_data() error because the data was larger that
Expand Down
2 changes: 1 addition & 1 deletion ext/oci8/oci8.c
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ static void php_oci_pconnection_list_np_dtor(zend_resource *entry TSRMLS_DC)
* semantics. With the PECL OCI 1.3.x extensions, we release pconnections when oci_close
* takes the refcount to zero.
*
* If oci_old_close_semantics is set, we artifically bump up the refcount and decremented
* If oci_old_close_semantics is set, we artificially bump up the refcount and decremented
* only at request shutdown.
*/
php_oci_connection_release(connection TSRMLS_CC);
Expand Down
2 changes: 1 addition & 1 deletion ext/oci8/tests/bug36010.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Bug #36010 (Crash when executing SQL statment with lob parameter twice)
Bug #36010 (Crash when executing SQL statement with lob parameter twice)
--SKIPIF--
<?php
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
Expand Down
Loading

0 comments on commit 4b95353

Please sign in to comment.