Issue #3473214 by mstrelan: Stop passing ints to... (97d929b6) · Commits · project / drupal

core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php

+12 −12

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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,
		],