From 9af55ec10fe30eb1b466cc94979b4116b431b2bc Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole Date: Fri, 8 Aug 2014 11:05:46 +0100 Subject: [PATCH] Issue #2316153 by Berdir: Fixed [typo follow-up] PHP 5.4.30/5.5.15+ changed json_encode() of DateTime objects to include microseconds, breaks tests. --- .../form_test/src/Form/FormTestDisabledElementsForm.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php index d768de689ec..09a2ed9b875 100644 --- a/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php +++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php @@ -129,8 +129,8 @@ class FormTestDisabledElementsForm extends FormBase { // Date. $date = new DrupalDateTime('1978-11-01 10:30:00', 'Europe/Berlin'); // Starting with PHP 5.4.30, 5.5.15, JSON encoded DateTime objects include - // microsends. Make sure that the expected value is correct for all versions - // by encoding and decoding it again instead of hardcoding it. + // microseconds. Make sure that the expected value is correct for all + // versions by encoding and decoding it again instead of hardcoding it. // See https://github.com/php/php-src/commit/fdb2709dd27c5987c2d2c8aaf0cdbebf9f17f643 $expected = json_decode(json_encode($date), TRUE); $form['disabled_container']['disabled_container_datetime'] = array(