fix: simplify hook_strtotime

t-matsuno-777 · Sep 19, 2024 · 49cbbe4 · 49cbbe4
1 parent 0b9098a
commit 49cbbe4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,10 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        platform: ['linux/amd64', 'linux/arm64/v8', 'linux/s390x']
-        version: ['8.1', '8.2', '8.3']
-        type: ['cli', 'zts']
-        distro: ['bookworm', 'alpine']
+        # platform: ['linux/amd64', 'linux/arm64/v8', 'linux/s390x']
+        platform: ['linux/amd64']
+        # version: ['8.1', '8.2', '8.3']
+        version: ['8.3']
+        # type: ['cli', 'zts']
+        type: ['cli']
+        # distro: ['bookworm', 'alpine']
+        distro: ['bookworm']
     steps:
         - name: Checkout
           uses: actions/checkout@v4

diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -17,7 +17,8 @@ jobs:
     strategy:
       matrix:
         version: ['8.3']
-        type: ['cli', 'zts']
+        # type: ['cli', 'zts']
+        type: ['cli']
         distro: ['bookworm']
     outputs:
       matrix: ${{ toJson(matrix) }}

diff --git a/ext/hook.c b/ext/hook.c
@@ -699,25 +699,15 @@ static void hook_strtotime(INTERNAL_FUNCTION_PARAMETERS)
 		return;
 	}
 
-	if (is_fixed_ret == 2) {
-		CALL_ORIGINAL_FUNCTION(strtotime);
-	} else {
-		/* Call original function with params. */
-		zval *params = NULL;
-		uint32_t param_count = 0;
-		zend_parse_parameters(ZEND_NUM_ARGS(), "+", &params, &param_count);
-		ZVAL_LONG(&params[1], get_shifted_time(NULL));
-		CALL_ORIGINAL_FUNCTION_WITH_PARAMS(strtotime, params, param_count);
-	}
-
-	/* Apply interval. */
-	timelib_time *t = timelib_time_ctor();
-	timelib_rel_time interval;
-	timelib_unixtime2gmt(t, Z_LVAL_P(return_value));
-	get_shift_interval(&interval);
-	apply_interval(&t, &interval);
-	RETVAL_LONG(timelib_date_to_int(t, NULL));
-	timelib_time_dtor(t);
+	/* Call original function based on shifted time */
+	zval params[2];
+	uint32_t param_count = 0;
+	zend_parse_parameters(ZEND_NUM_ARGS(), "+", &params, &param_count);
+	ZVAL_STRING(&params[0], ZSTR_VAL(times));
+	ZVAL_LONG(&params[1], get_shifted_time(NULL));
+	CALL_ORIGINAL_FUNCTION_WITH_PARAMS(strtotime, params, 2);
+	zval_ptr_dtor(&params[0]);
+	zval_ptr_dtor(&params[1]);
 }
 
 #if HAVE_GETTIMEOFDAY

diff --git a/ext/tests/functions/strtotime.phpt b/ext/tests/functions/strtotime.phpt
@@ -31,7 +31,7 @@ if ($before_now != $after_now && $before_fixed === $after_fixed && 4 > $interval
     die('success');
 }
 
-die('failed');
+die('failed, before_now = ' . $before_now . ', after_now = ' . $after_now . ', before_fixed = ' . $before_fixed . ', after_fixed = ' . $after_fixed . ', interval->days = ' . $interval->days . ', interval->invert = ' . $interval->invert);
 ?>
 --EXPECT--
 success
diff --git a/ext/tests/functions/strtotime_extra.phpt b/ext/tests/functions/strtotime_extra.phpt
@@ -14,13 +14,16 @@ $after_two = new \DateTime('@' . \strtotime('now'));
 
 $interval = $after_one->diff($before);
 
-if ($before == $after_one || $before == $after_two) {
-    die('failed');
+if ($before->getTimestamp() == $after_one->getTimestamp()) {
+    die('failed, $before == $after_one');
+}
+if ($before->getTimestamp() == $after_two->getTimestamp()) {
+    die('failed, $before == $after_two');
 }
 
 /* Note: Sometime valgrind makes flaky: $interval->y !== 2 */
 if (($interval->y > 2 && $interval->y !== 0) || $interval->invert !== 0) {
-    die('failed');
+    die('failed, $interval->y = ' . $interval->y . ', $interval->invert = ' . $interval->invert);
 }
 
 die('success');