Skip to content
Snippets Groups Projects
Verified Commit 97d929b6 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3473214 by mstrelan: Stop passing ints to... 

Issue #3473214 by mstrelan: Stop passing ints to DateTimePlus::createFromFormat and DrupalDateTime::createFromFormat

(cherry picked from commit aeef5cd6)
parent 43924c4b
Branches
Tags
9 merge requests!10602Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub workspace does not clear,!10301Issue #3469309 by mstrelan, smustgrave, moshe weitzman: Use one-time login...,!10187Issue #3487488 by dakwamine: ExtensionMimeTypeGuesser::guessMimeType must support file names with "0" (zero) like foo.0.zip,!9929Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9787Resolve issue 3479427 - bootstrap barrio issue under Windows,!9742Issue #3463908 by catch, quietone: Split OptionsFieldUiTest into two,!6502Draft: Resolve #2938524 "Plach testing issue",!38582585169-10.1.x,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key
Pipeline #293918 passed with warnings
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#293978

    Pipeline: drupal

    #293968

      Pipeline: drupal

      #293964

        +6
        Hide whitespace changes
        Inline Side-by-side
        core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
        + 12
        − 12
        View file @ 97d929b6
        ......@@ -683,38 +683,38 @@ public static function providerTestDateDiff() {
        'expected' => $positive_18_hours,
        ],
        [
        'input1' => DateTimePlus::createFromFormat('U', 3600, new \DateTimeZone('America/Los_Angeles')),
        'input2' => DateTimePlus::createFromFormat('U', 0, new \DateTimeZone('UTC')),
        'input1' => DateTimePlus::createFromFormat('U', '3600', new \DateTimeZone('America/Los_Angeles')),
        'input2' => DateTimePlus::createFromTimestamp(0, new \DateTimeZone('UTC')),
        'absolute' => FALSE,
        'expected' => $negative_1_hour,
        ],
        [
        'input1' => DateTimePlus::createFromFormat('U', 3600),
        'input2' => DateTimePlus::createFromFormat('U', 0),
        'input1' => DateTimePlus::createFromTimestamp(3600),
        'input2' => DateTimePlus::createFromTimestamp(0),
        'absolute' => FALSE,
        'expected' => $negative_1_hour,
        ],
        [
        'input1' => DateTimePlus::createFromFormat('U', 3600),
        'input1' => DateTimePlus::createFromTimestamp(3600),
        'input2' => \DateTime::createFromFormat('U', '0'),
        'absolute' => FALSE,
        'expected' => $negative_1_hour,
        ],
        [
        'input1' => DateTimePlus::createFromFormat('U', 3600),
        'input2' => DateTimePlus::createFromFormat('U', 0),
        'input1' => DateTimePlus::createFromTimestamp(3600),
        'input2' => DateTimePlus::createFromTimestamp(0),
        'absolute' => TRUE,
        'expected' => $positive_1_hour,
        ],
        [
        'input1' => DateTimePlus::createFromFormat('U', 3600),
        'input1' => DateTimePlus::createFromTimestamp(3600),
        'input2' => \DateTime::createFromFormat('U', '0'),
        'absolute' => TRUE,
        'expected' => $positive_1_hour,
        ],
        [
        'input1' => DateTimePlus::createFromFormat('U', 0),
        'input2' => DateTimePlus::createFromFormat('U', 0),
        'input1' => DateTimePlus::createFromTimestamp(0),
        'input2' => DateTimePlus::createFromTimestamp(0),
        'absolute' => FALSE,
        'expected' => $empty_interval,
        ],
        ......@@ -733,12 +733,12 @@ public static function providerTestDateDiff() {
        public static function providerTestInvalidDateDiff() {
        return [
        [
        'input1' => DateTimePlus::createFromFormat('U', 3600),
        'input1' => DateTimePlus::createFromTimestamp(3600),
        'input2' => '1970-01-01 00:00:00',
        'absolute' => FALSE,
        ],
        [
        'input1' => DateTimePlus::createFromFormat('U', 3600),
        'input1' => DateTimePlus::createFromTimestamp(3600),
        'input2' => NULL,
        'absolute' => FALSE,
        ],
        ......
        core/tests/Drupal/Tests/Core/Datetime/DrupalDateTimeTest.php
        + 12
        − 12
        View file @ 97d929b6
        ......@@ -98,38 +98,38 @@ public static function providerTestDateDiff() {
        'expected' => $positive_18_hours,
        ],
        [
        'input1' => DrupalDateTime::createFromFormat('U', 3600, new \DateTimeZone('America/Los_Angeles'), $settings),
        'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromFormat('U', '3600', new \DateTimeZone('America/Los_Angeles'), $settings),
        'input2' => DrupalDateTime::createFromTimestamp(0, $utc_tz, $settings),
        'absolute' => FALSE,
        'expected' => $negative_1_hour,
        ],
        [
        'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
        'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromTimestamp(3600, $utc_tz, $settings),
        'input2' => DrupalDateTime::createFromTimestamp(0, $utc_tz, $settings),
        'absolute' => FALSE,
        'expected' => $negative_1_hour,
        ],
        [
        'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromTimestamp(3600, $utc_tz, $settings),
        'input2' => \DateTime::createFromFormat('U', '0'),
        'absolute' => FALSE,
        'expected' => $negative_1_hour,
        ],
        [
        'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
        'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromTimestamp(3600, $utc_tz, $settings),
        'input2' => DrupalDateTime::createFromTimestamp(0, $utc_tz, $settings),
        'absolute' => TRUE,
        'expected' => $positive_1_hour,
        ],
        [
        'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromTimestamp(3600, $utc_tz, $settings),
        'input2' => \DateTime::createFromFormat('U', '0'),
        'absolute' => TRUE,
        'expected' => $positive_1_hour,
        ],
        [
        'input1' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
        'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromTimestamp(0, $utc_tz, $settings),
        'input2' => DrupalDateTime::createFromTimestamp(0, $utc_tz, $settings),
        'absolute' => FALSE,
        'expected' => $empty_interval,
        ],
        ......@@ -150,12 +150,12 @@ public static function providerTestInvalidDateDiff() {
        $utc_tz = new \DateTimeZone('UTC');
        return [
        [
        'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromTimestamp(3600, $utc_tz, $settings),
        'input2' => '1970-01-01 00:00:00',
        'absolute' => FALSE,
        ],
        [
        'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
        'input1' => DrupalDateTime::createFromTimestamp(3600, $utc_tz, $settings),
        'input2' => NULL,
        'absolute' => FALSE,
        ],
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment