Skip to content
Snippets Groups Projects
Verified Commit 57548bac 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 888f2e01
Branches
Tags
15 merge requests!10663Issue #3495778: Update phpdoc in FileSaveHtaccessLoggingTest,!10451Issue #3472458 by watergate, smustgrave: CKEditor 5 show blocks label is not translated,!103032838547 Fix punctuation rules for inline label suffix colon with CSS only,!10150Issue #3467294 by quietone, nod_, smustgrave, catch, longwave: Change string...,!10130Resolve #3480321 "Second level menu",!9936Issue #3483087: Check the module:// prefix in the translation server path and replace it with the actual module path,!9933Issue #3394728 by ankondrat4: Undefined array key "#prefix" and deprecated function: explode() in Drupal\file\Element\ManagedFile::uploadAjaxCallback(),!9914Issue #3451136 by quietone, gapple, ghost of drupal past: Improve...,!9882Draft: Issue #3481777 In bulk_form ensure the triggering element is the bulk_form button,!9839Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9815Issue #3480025: There is no way to remove entity cache items,!9757Issue #3478869 Add "All" or overview links to parent links,!9752Issue #3439910 by pooja_sharma, vensires: Fix Toolbar tests that rely on UID1's super user behavior,!9749Issue #3439910 by pooja_sharma, vensires: Fix Toolbar tests that rely on UID1's super user behavior,!9678Issue #3465132 by catch, Spokje, nod_: Show test run time by class in run-tests.sh output
Pipeline #294129 canceled
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#294130

    Hide whitespace changes
    Inline Side-by-side
    core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
    + 12
    − 12
    View file @ 57548bac
    ......@@ -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 @ 57548bac
    ......@@ -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