feat(DateMethods): enhance date methods to return UTC formatted strings and add unit tests for validation

Author: lihq1403

src/Kernel/RuleEngine/PHPSandbox/ExecutableCode/Methods/Date/GetISO8601DateTime.php

@@ -7,6 +7,8 @@
 
 namespace Dtyq\FlowExprEngine\Kernel\RuleEngine\PHPSandbox\ExecutableCode\Methods\Date;
 
+use DateTime;
+use DateTimeZone;
 use Dtyq\FlowExprEngine\Kernel\RuleEngine\PHPSandbox\ExecutableCode\Methods\AbstractMethod;
 
 class GetISO8601DateTime extends AbstractMethod
@@ -19,7 +21,7 @@ class GetISO8601DateTime extends AbstractMethod
 
     protected string $group = '日期/时间';
 
-    protected string $desc = '获取ISO 8601格式的日期和时间;如：2021-01-01T00:00:00';
+    protected string $desc = '获取ISO 8601格式的日期和时间（UTC时间）;如：2021-01-01T00:00:00Z';
 
     protected array $args = [
         [
@@ -36,7 +38,13 @@ public function getFunction(): ?callable
             if (is_string($time)) {
                 $time = strtotime($time) ?: time();
             }
-            return date('Y-m-d\TH:i:s', $time);
+
+            // Create DateTime object from timestamp and convert to UTC
+            $datetime = new DateTime('@' . $time);
+            $datetime->setTimezone(new DateTimeZone('UTC'));
+
+            // Format as ISO 8601 with UTC timezone (Z suffix)
+            return $datetime->format('Y-m-d\TH:i:s\Z');
         };
     }
 }

src/Kernel/RuleEngine/PHPSandbox/ExecutableCode/Methods/Date/GetRFC1123DateTime.php

@@ -7,6 +7,8 @@
 
 namespace Dtyq\FlowExprEngine\Kernel\RuleEngine\PHPSandbox\ExecutableCode\Methods\Date;
 
+use DateTime;
+use DateTimeZone;
 use Dtyq\FlowExprEngine\Kernel\RuleEngine\PHPSandbox\ExecutableCode\Methods\AbstractMethod;
 
 class GetRFC1123DateTime extends AbstractMethod
@@ -36,7 +38,13 @@ public function getFunction(): ?callable
             if (is_string($time)) {
                 $time = strtotime($time) ?: time();
             }
-            return date('D, d M Y H:i:s \G\M\T', $time);
+
+            // Create DateTime object from timestamp and set to UTC
+            $datetime = new DateTime('@' . $time);
+            $datetime->setTimezone(new DateTimeZone('UTC'));
+
+            // Format as RFC 1123 with proper GMT suffix
+            return $datetime->format('D, d M Y H:i:s') . ' GMT';
         };
     }
 }

tests/Structure/Expression/ExpressionTest.php

@@ -346,7 +346,8 @@ public function testGetDate()
             true
         ))->getResult());
 
-        $this->assertEquals(date('Y-m-d\TH:i:s'), $builder->build(json_decode(
+        // Test that get_iso8601_date_time returns UTC time with Z suffix
+        $result = $builder->build(json_decode(
             <<<'JSON'
 [
     {
@@ -358,7 +359,8 @@ public function testGetDate()
 ]
 JSON,
             true
-        ))->getResult());
+        ))->getResult();
+        $this->assertMatchesRegularExpression('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/', $result);
 
         $this->assertEquals(date('Y-m-d\TH:i:s') . date('P'), $builder->build(json_decode(
             <<<'JSON'

tests/Structure/Form/FormTest.php

@@ -2030,6 +2030,50 @@ public function testObjectFormWithArrayMethodExpression()
         $this->assertTrue($value->expressionIsOnlyMethod());
     }
 
+    public function testGetRFC1123DateTimeWithCorrectTimezone()
+    {
+        $valueBuilder = new ValueBuilder();
+
+        // 创建一个使用get_rfc1123_date_time方法的表达式
+        $methodExpressionData = json_decode(<<<'JSON'
+{
+    "type": "expression",
+    "const_value": null,
+    "expression_value": [
+        {
+            "type": "methods",
+            "value": "get_rfc1123_date_time",
+            "name": "get_rfc1123_date_time",
+            "args": [
+                {
+                    "type": "const",
+                    "const_value": [
+                        {
+                            "type": "input",
+                            "value": "1634799280",
+                            "name": ""
+                        }
+                    ],
+                    "expression_value": null
+                }
+            ]
+        }
+    ]
+}
+JSON, true);
+
+        $value = $valueBuilder->build($methodExpressionData);
+        $result = $value->getResult();
+
+        // 验证结果格式符合RFC 1123标准
+        $this->assertIsString($result);
+        // 验证格式: Thu, 21 Oct 2021 07:28:00 GMT
+        $this->assertMatchesRegularExpression('/^[A-Za-z]{3}, \d{2} [A-Za-z]{3} \d{4} \d{2}:\d{2}:\d{2} GMT$/', $result);
+
+        // 验证时间戳1634799280对应的UTC时间: Thu, 21 Oct 2021 06:54:40 GMT
+        $this->assertStringContainsString('21 Oct 2021 06:54:40 GMT', $result);
+    }
+
     private function getFormJsonArray(): array
     {
         $formJson = <<<'JSON'