Change ini variable name

hnw · Sep 11, 2012 · ea210b5 · ea210b5
1 parent 926afaa
commit ea210b5
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 47 deletions.
diff --git a/php_timecop.h b/php_timecop.h
@@ -70,15 +70,15 @@ typedef enum timecop_mode_t {
 } timecop_mode_t;
 
 ZEND_BEGIN_MODULE_GLOBALS(timecop)
-	long func_overload;
+	long func_override;
 	timecop_mode_t timecop_mode;
 	long freezed_timestamp;
 	long travel_offset;
 	zend_class_entry *ce_DateTime;
 	zend_class_entry *ce_TimecopDateTime;
 ZEND_END_MODULE_GLOBALS(timecop)
 
-struct timecop_overload_def {
+struct timecop_override_def {
 	char *orig_name;
 	char *ovld_name;
 	char *save_name;

diff --git a/tests/nooverload01.phpt b/tests/nooverload01.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Check for timecop_orig_time presence when timecop.func_overload=0
+Check for timecop_orig_time presence when timecop.func_override=0
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');
@@ -10,7 +10,7 @@ Check for timecop_orig_time presence when timecop.func_overload=0
 		}
 	}
 --INI--
-timecop.func_overload=0
+timecop.func_override=0
 --FILE--
 <?php
 var_dump(function_exists("timecop_orig_time"));

diff --git a/tests/overload01.phpt b/tests/overload01.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for time
+Function overrideing test for time
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload02.phpt b/tests/overload02.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for date
+Function overrideing test for date
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload03.phpt b/tests/overload03.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for strtotime
+Function overrideing test for strtotime
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload04.phpt b/tests/overload04.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for gmdate
+Function overrideing test for gmdate
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload05.phpt b/tests/overload05.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for strftime
+Function overrideing test for strftime
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload06.phpt b/tests/overload06.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for gmstrftime
+Function overrideing test for gmstrftime
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload07.phpt b/tests/overload07.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Class overloading test for datetime
+Class overrideing test for datetime
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload08.phpt b/tests/overload08.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for idate
+Function overrideing test for idate
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload09.phpt b/tests/overload09.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for getdate
+Function overrideing test for getdate
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload10.phpt b/tests/overload10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for localtime
+Function overrideing test for localtime
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload11.phpt b/tests/overload11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for unixtojd
+Function overrideing test for unixtojd
 --SKIPIF--
 <?php 
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload12.phpt b/tests/overload12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for mktime
+Function overrideing test for mktime
 --SKIPIF--
 <?php
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/tests/overload13.phpt b/tests/overload13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Function overloading test for gmmktime
+Function overrideing test for gmmktime
 --SKIPIF--
 <?php
 	extension_loaded('timecop') or die('skip timecop not available');

diff --git a/timecop.c b/timecop.c
@@ -35,7 +35,7 @@ ZEND_DECLARE_MODULE_GLOBALS(timecop)
 
 static void timecop_globals_ctor(zend_timecop_globals *globals TSRMLS_DC) {
 	/* Initialize your global struct */
-	globals->func_overload = 1;
+	globals->func_override = 1;
 	globals->timecop_mode = TIMECOP_MODE_NORMAL;
 	globals->freezed_timestamp = 0;
 	globals->travel_offset = 0;
@@ -53,8 +53,8 @@ static zend_object_handlers timecop_datetime_object_handlers;
 static zend_class_entry *timecop_datetime_ce;
 */
 
-/* {{{ timecop_overload_def mb_ovld_func[] */
-static const struct timecop_overload_def timecop_ovld_func[] = {
+/* {{{ timecop_override_def mb_ovld_func[] */
+static const struct timecop_override_def timecop_ovld_func[] = {
 	{"time", "timecop_time", "timecop_orig_time"},
 	{"mktime", "timecop_mktime", "timecop_orig_mktime"},
 	{"gmmktime", "timecop_gmmktime", "timecop_orig_gmmktime"},
@@ -71,8 +71,8 @@ static const struct timecop_overload_def timecop_ovld_func[] = {
 };
 /* }}} */
 
-/* {{{ timecop_overload_def mb_ovld_class[] */
-static const struct timecop_overload_def timecop_ovld_class[] = {
+/* {{{ timecop_override_def mb_ovld_class[] */
+static const struct timecop_override_def timecop_ovld_class[] = {
 	{"datetime", "timecopdatetime", "timecoporigdatetime"},
 	{NULL, NULL, NULL}
 };
@@ -190,10 +190,10 @@ static zend_function_entry timecop_datetime_class_functions[] = {
 static void timecop_globals_ctor(zend_timecop_globals *globals TSRMLS_DC);
 
 static int init_timecop_datetime(TSRMLS_D);
-static int timecop_func_overload(TSRMLS_D);
-static int timecop_class_overload(TSRMLS_D);
-static int timecop_func_overload_clear(TSRMLS_D);
-static int timecop_class_overload_clear(TSRMLS_D);
+static int timecop_func_override(TSRMLS_D);
+static int timecop_class_override(TSRMLS_D);
+static int timecop_func_override_clear(TSRMLS_D);
+static int timecop_class_override_clear(TSRMLS_D);
 
 static int timecop_zend_fcall_info_init(zval *callable, zend_fcall_info *fci, zend_fcall_info_cache *fcc TSRMLS_DC);
 static int init_fcall_info(zval *callable, zend_fcall_info * fci, zend_fcall_info_cache * fcc, int num_args TSRMLS_DC);
@@ -240,8 +240,8 @@ ZEND_GET_MODULE(timecop)
 /* {{{ PHP_INI
  */
 PHP_INI_BEGIN()
-    STD_PHP_INI_ENTRY("timecop.func_overload", "1",
-    PHP_INI_SYSTEM, OnUpdateLong, func_overload, zend_timecop_globals, timecop_globals)
+    STD_PHP_INI_ENTRY("timecop.func_override", "1",
+    PHP_INI_SYSTEM, OnUpdateLong, func_override, zend_timecop_globals, timecop_globals)
 PHP_INI_END()
 /* }}} */
 
@@ -272,9 +272,9 @@ PHP_RINIT_FUNCTION(timecop)
 
 	init_timecop_datetime(TSRMLS_C);
 
-	if (TIMECOP_G(func_overload)) {
-		if (SUCCESS != timecop_func_overload(TSRMLS_C) ||
-			SUCCESS != timecop_class_overload(TSRMLS_C)) {
+	if (TIMECOP_G(func_override)) {
+		if (SUCCESS != timecop_func_override(TSRMLS_C) ||
+			SUCCESS != timecop_class_override(TSRMLS_C)) {
 			return FAILURE;
 		}
 	}
@@ -286,9 +286,9 @@ PHP_RINIT_FUNCTION(timecop)
 /* {{{ PHP_RSHUTDOWN_FUNCTION(timecop) */
 PHP_RSHUTDOWN_FUNCTION(timecop)
 {
-	if (TIMECOP_G(func_overload)) {
-		timecop_func_overload_clear(TSRMLS_C);
-		timecop_class_overload_clear(TSRMLS_C);
+	if (TIMECOP_G(func_override)) {
+		timecop_func_override_clear(TSRMLS_C);
+		timecop_class_override_clear(TSRMLS_C);
 	}
 
 	TIMECOP_G(timecop_mode) = TIMECOP_MODE_NORMAL;
@@ -331,10 +331,10 @@ static int init_timecop_datetime(TSRMLS_D)
 	return SUCCESS;
 }
 
-static int timecop_func_overload(TSRMLS_D)
+static int timecop_func_override(TSRMLS_D)
 {
 	zend_function *func, *orig;
-	const struct timecop_overload_def *p;
+	const struct timecop_override_def *p;
 
 	p = &(timecop_ovld_func[0]);
 	while (p->orig_name != NULL) {
@@ -363,10 +363,10 @@ static int timecop_func_overload(TSRMLS_D)
 	return SUCCESS;
 }
 
-static int timecop_class_overload(TSRMLS_D)
+static int timecop_class_override(TSRMLS_D)
 {
 	zend_class_entry **pce_ovld, **pce_orig, *ce_ovld, *ce_orig;
-	const struct timecop_overload_def *p;
+	const struct timecop_override_def *p;
 
 	p = &(timecop_ovld_class[0]);
 	while (p->orig_name != NULL) {
@@ -400,10 +400,10 @@ static int timecop_class_overload(TSRMLS_D)
 	return SUCCESS;
 }
 
-/*  clear overloaded function. */
-static int timecop_func_overload_clear(TSRMLS_D)
+/*  clear overrideed function. */
+static int timecop_func_override_clear(TSRMLS_D)
 {
-	const struct timecop_overload_def *p;
+	const struct timecop_override_def *p;
 	zend_function *func, *orig;
 
 	p = &(timecop_ovld_func[0]);
@@ -419,9 +419,9 @@ static int timecop_func_overload_clear(TSRMLS_D)
 	return SUCCESS;
 }
 
-static int timecop_class_overload_clear(TSRMLS_D)
+static int timecop_class_override_clear(TSRMLS_D)
 {
-	const struct timecop_overload_def *p;
+	const struct timecop_override_def *p;
 	zend_class_entry **pce_ovld, **pce_orig, *ce_ovld, *ce_orig;
 	zend_function *func, *orig;
 
@@ -509,7 +509,7 @@ static void call_callable_with_optional_timestamp(INTERNAL_FUNCTION_PARAMETERS,
 static void _timecop_call_function(INTERNAL_FUNCTION_PARAMETERS, char* orig_func_name, char* saved_func_name, int num_required_func_args)
 {
 	zval callable;
-	if (TIMECOP_G(func_overload)){
+	if (TIMECOP_G(func_override)){
 		ZVAL_STRING(&callable, saved_func_name, 1);
 	} else {
 		ZVAL_STRING(&callable, orig_func_name, 1);
@@ -696,7 +696,7 @@ static zval *timecop_current_date(char *format TSRMLS_DC)
 	zend_fcall_info_cache date_fci_cache;
 	zval date_callable;
 
-	if (TIMECOP_G(func_overload)){
+	if (TIMECOP_G(func_override)){
 		ZVAL_STRING(&date_callable, "timecop_orig_date", 1);
 	} else {
 		ZVAL_STRING(&date_callable, "date", 1);
@@ -764,7 +764,7 @@ PHPAPI void php_timecop_mktime(INTERNAL_FUNCTION_PARAMETERS, zval *mktime_callab
 PHP_FUNCTION(timecop_mktime)
 {
 	zval mktime_callable, date_callable;
-	if (TIMECOP_G(func_overload)){
+	if (TIMECOP_G(func_override)){
 		ZVAL_STRING(&mktime_callable, "timecop_orig_mktime", 1);
 		ZVAL_STRING(&date_callable, "timecop_orig_date", 1);
 	} else {
@@ -780,7 +780,7 @@ PHP_FUNCTION(timecop_mktime)
 PHP_FUNCTION(timecop_gmmktime)
 {
 	zval mktime_callable, date_callable;
-	if (TIMECOP_G(func_overload)){
+	if (TIMECOP_G(func_override)){
 		ZVAL_STRING(&mktime_callable, "timecop_orig_gmmktime", 1);
 		ZVAL_STRING(&date_callable, "timecop_orig_gmdate", 1);
 	} else {