summaryrefslogtreecommitdiff
path: root/ext/sybase_ct
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2013-07-13 13:37:04 +0100
committerStanislav Malyshev <stas@php.net>2013-07-15 00:19:49 -0700
commit1b06e0be96774eeb59a59b80476213a8b98a8fdc (patch)
treec4fe348b1f1ca872dbf58a6c643534e92be25715 /ext/sybase_ct
parentd17e8ac32fe1f4bbf92c4bac1826d83d8372df95 (diff)
downloadphp-git-1b06e0be96774eeb59a59b80476213a8b98a8fdc.tar.gz
typo fixes
Diffstat (limited to 'ext/sybase_ct')
-rw-r--r--ext/sybase_ct/php_sybase_ct.c8
-rw-r--r--ext/sybase_ct/tests/bug26407.phpt2
-rw-r--r--ext/sybase_ct/tests/bug43578.phpt2
-rw-r--r--ext/sybase_ct/tests/test_fetch_object.phpt2
-rw-r--r--ext/sybase_ct/tests/test_msghandler.phpt4
5 files changed, 9 insertions, 9 deletions
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index bd4cf1429c..ee53d484cf 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1121,7 +1121,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
break;
case CS_CMD_FAIL:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Command failed, cancelling rest");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Command failed, canceling rest");
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
fail = 1;
break;
@@ -1131,7 +1131,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
case CS_PARAM_RESULT:
case CS_ROW_RESULT:
/* Unexpected results, cancel them. */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, cancelling current");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, canceling current");
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_CURRENT);
break;
@@ -1141,7 +1141,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, cancelling all");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, canceling all");
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
break;
}
@@ -1696,7 +1696,7 @@ PHP_FUNCTION(sybase_free_result)
/* Did we fetch up until the end? */
if (result->last_retcode != CS_END_DATA && result->last_retcode != CS_END_RESULTS) {
- /* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cancelling the rest of the results"); */
+ /* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: canceling the rest of the results"); */
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
php_sybase_finish_results(result TSRMLS_CC);
}
diff --git a/ext/sybase_ct/tests/bug26407.phpt b/ext/sybase_ct/tests/bug26407.phpt
index 35bf6df7ad..27f5f99b9d 100644
--- a/ext/sybase_ct/tests/bug26407.phpt
+++ b/ext/sybase_ct/tests/bug26407.phpt
@@ -80,7 +80,7 @@ bool(true)
select "bar"
-Notice: sybase_query(): Sybase: Unexpected results, cancelling current in %stest.inc on line %d
+Notice: sybase_query(): Sybase: Unexpected results, canceling current in %stest.inc on line %d
<<< Return: resource
array(1) {
[0]=>
diff --git a/ext/sybase_ct/tests/bug43578.phpt b/ext/sybase_ct/tests/bug43578.phpt
index e840402edc..9f75b9c0ea 100644
--- a/ext/sybase_ct/tests/bug43578.phpt
+++ b/ext/sybase_ct/tests/bug43578.phpt
@@ -23,7 +23,7 @@ Sybase-CT bug #43578 (Incurred fault #6 - if returned textfield ist empty)
var_dump(sybase_query('insert into #Resource values (123, NULL)', $db));
var_dump(sybase_query('insert into #Resource values (124, "")', $db));
- // Select non-existant
+ // Select non-existent
var_dump(sybase_select_ex($db, 'select DC_Rights from #Resource where Resource_ID = 122'));
// Select null
diff --git a/ext/sybase_ct/tests/test_fetch_object.phpt b/ext/sybase_ct/tests/test_fetch_object.phpt
index c23658fa35..2d225cd9cf 100644
--- a/ext/sybase_ct/tests/test_fetch_object.phpt
+++ b/ext/sybase_ct/tests/test_fetch_object.phpt
@@ -40,7 +40,7 @@ Sybase-CT sybase_fetch_object
// Test with object
var_export(fetch_object($db, new article())); echo "\n";
- // Test with non-existant class
+ // Test with non-existent class
var_export(fetch_object($db, '***')); echo "\n";
sybase_close($db);
diff --git a/ext/sybase_ct/tests/test_msghandler.phpt b/ext/sybase_ct/tests/test_msghandler.phpt
index afe97cbef3..3189aaac21 100644
--- a/ext/sybase_ct/tests/test_msghandler.phpt
+++ b/ext/sybase_ct/tests/test_msghandler.phpt
@@ -13,7 +13,7 @@ Sybase-CT server message handler
$db= sybase_connect_ex();
- echo 'Nonexistant: '; sybase_set_messagehandler_ex('function_does_not_exist');
+ echo 'Nonexistent: '; sybase_set_messagehandler_ex('function_does_not_exist');
echo 'Static method: '; sybase_set_messagehandler_ex(array('sybase', 'static_handler'));
echo 'Instance method: '; sybase_set_messagehandler_ex(array(new sybase(), 'handler'));
echo 'Lambda function: '; sybase_set_messagehandler_ex(create_function('', 'return FALSE;'));
@@ -25,7 +25,7 @@ Sybase-CT server message handler
sybase_close($db);
?>
--EXPECTF--
-Nonexistant:
+Nonexistent:
Warning: sybase_set_message_handler() expects parameter 1 to be a valid callback, function 'function_does_not_exist' not found or invalid function name in %stest.inc on line %d
NULL
Static method: bool(true)