From 9f01cf6122eed12960f4d897bf9f4a0c0d553e05 Mon Sep 17 00:00:00 2001
From: Mihail Geshoski <mihail@moodle.com>
Date: Fri, 19 Feb 2021 14:02:10 +0800
Subject: [PATCH] MDL-44613 behat: strftime format in time to timestamp
 transformation

Modifies the 'string time to timestamp' behat trasformation to use
userdate() instead of date(). The userdate() method is generally used
throught Moodle for constructing formatted date strings and this change
will provide more consistency and prevent any potential behat failures.
Therefore, if the date format is defined in the given trasformation, it
has to be strftime compatible. Example:
'I should see "##tomorrow noon##%A, %d %B %Y, %I:%M %p##"'
---
 lib/tests/behat/behat_transformations.php | 4 ++--
 lib/upgrade.txt                           | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/tests/behat/behat_transformations.php b/lib/tests/behat/behat_transformations.php
index 7e4fd490b4c..cd5c4a41221 100644
--- a/lib/tests/behat/behat_transformations.php
+++ b/lib/tests/behat/behat_transformations.php
@@ -167,8 +167,8 @@ class behat_transformations extends behat_base {
 
         $count = count($timepassed);
         if ($count === 2) {
-            // If timestamp with spcified format, then retrun date.
-            return date($timepassed[1], $timestamp);
+            // If timestamp with specified strftime format, then return formatted date string.
+            return userdate($timestamp, $timepassed[1]);
         } else if ($count === 1) {
             return $timestamp;
         } else {
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 6f60be44c53..95d16e8785f 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,11 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 3.9.6 ===
+* The behat transformation 'string time to timestamp' no longer supports datetime format. If provided, the format must
+  be strftime compatible. Example:
+    - I should see "##tomorrow noon##%A, %d %B %Y, %I:%M %p##"
+
 === 3.9.4 ===
 * New optional parameter $extracontent for print_collapsible_region_start(). This allows developers to add interactive HTML elements
   (e.g. a help icon) after the collapsible region's toggle link.