From fd6018f00b8a6bdc32bafd00b0a87bf4208357e3 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 29 Feb 2024 00:19:15 +0000
Subject: [PATCH] Issue #3422345 by mondrake, smustgrave: Change
DateTest::providerTestFormatDiff and family to static
---
.../Drupal/Tests/Core/Datetime/DateTest.php | 172 +++++++++---------
1 file changed, 86 insertions(+), 86 deletions(-)
diff --git a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
index 39d9c54850f1..a31757d9ef85 100644
--- a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
+++ b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
@@ -191,8 +191,8 @@ public function testGetSampleDateFormats() {
*/
public function testFormatTimeDiffUntil() {
$expected = '1 second';
- $request_time = $this->createTimestamp('2013-12-11 10:09:08');
- $timestamp = $this->createTimestamp('2013-12-11 10:09:09');
+ $request_time = self::createTimestamp('2013-12-11 10:09:08');
+ $timestamp = self::createTimestamp('2013-12-11 10:09:09');
$options = [];
// Mocks the formatDiff function of the DateFormatter object.
@@ -224,8 +224,8 @@ public function testFormatTimeDiffUntil() {
*/
public function testFormatTimeDiffSince() {
$expected = '1 second';
- $timestamp = $this->createTimestamp('2013-12-11 10:09:07');
- $request_time = $this->createTimestamp('2013-12-11 10:09:08');
+ $timestamp = self::createTimestamp('2013-12-11 10:09:07');
+ $request_time = self::createTimestamp('2013-12-11 10:09:08');
$options = [];
// Mocks the formatDiff function of the DateFormatter object.
@@ -257,7 +257,7 @@ public function testFormatTimeDiffSince() {
*
* @covers ::formatDiff
*/
- public function testFormatDiff($expected, $max_age, $timestamp1, $timestamp2, $options = []) {
+ public function testFormatDiff(string $expected, int $max_age, int $timestamp1, int $timestamp2, array $options = []): void {
// Mocks a simple translateString implementation.
$this->stringTranslation->expects($this->any())
->method('translateString')
@@ -281,9 +281,9 @@ public function testFormatDiff($expected, $max_age, $timestamp1, $timestamp2, $o
/**
* Data provider for testFormatDiff().
*/
- public function providerTestFormatDiff() {
+ public static function providerTestFormatDiff(): array {
// This is the fixed request time in the test.
- $request_time = $this->createTimestamp('2013-12-11 10:09:08');
+ $request_time = self::createTimestamp('2013-12-11 10:09:08');
$granularity_3 = ['granularity' => 3];
$granularity_4 = ['granularity' => 4];
@@ -298,100 +298,100 @@ public function providerTestFormatDiff() {
['0 seconds', 0, $request_time, $request_time],
// Checks for seconds only.
- ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time],
- ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time],
- ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_3 + $langcode_en],
- ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_4 + $langcode_lolspeak],
- ['2 seconds', 1, $this->createTimestamp('2013-12-11 10:09:06'), $request_time],
- ['59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time],
- ['59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time],
+ ['1 second', 1, self::createTimestamp('2013-12-11 10:09:07'), $request_time],
+ ['1 second', 1, self::createTimestamp('2013-12-11 10:09:07'), $request_time],
+ ['1 second', 1, self::createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_3 + $langcode_en],
+ ['1 second', 1, self::createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_4 + $langcode_lolspeak],
+ ['2 seconds', 1, self::createTimestamp('2013-12-11 10:09:06'), $request_time],
+ ['59 seconds', 1, self::createTimestamp('2013-12-11 10:08:09'), $request_time],
+ ['59 seconds', 1, self::createTimestamp('2013-12-11 10:08:09'), $request_time],
// Checks for minutes and possibly seconds.
- ['1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time],
- ['1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time],
- ['1 minute 1 second', 1, $this->createTimestamp('2013-12-11 10:08:07'), $request_time],
- ['1 minute 59 seconds', 1, $this->createTimestamp('2013-12-11 10:07:09'), $request_time],
- ['2 minutes', 60, $this->createTimestamp('2013-12-11 10:07:08'), $request_time],
- ['2 minutes 1 second', 1, $this->createTimestamp('2013-12-11 10:07:07'), $request_time],
- ['2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time],
- ['2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_3],
- ['2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_4],
- ['30 minutes', 60, $this->createTimestamp('2013-12-11 09:39:08'), $request_time],
- ['59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time],
- ['59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time],
+ ['1 minute', 60, self::createTimestamp('2013-12-11 10:08:08'), $request_time],
+ ['1 minute', 60, self::createTimestamp('2013-12-11 10:08:08'), $request_time],
+ ['1 minute 1 second', 1, self::createTimestamp('2013-12-11 10:08:07'), $request_time],
+ ['1 minute 59 seconds', 1, self::createTimestamp('2013-12-11 10:07:09'), $request_time],
+ ['2 minutes', 60, self::createTimestamp('2013-12-11 10:07:08'), $request_time],
+ ['2 minutes 1 second', 1, self::createTimestamp('2013-12-11 10:07:07'), $request_time],
+ ['2 minutes 2 seconds', 1, self::createTimestamp('2013-12-11 10:07:06'), $request_time],
+ ['2 minutes 2 seconds', 1, self::createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_3],
+ ['2 minutes 2 seconds', 1, self::createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_4],
+ ['30 minutes', 60, self::createTimestamp('2013-12-11 09:39:08'), $request_time],
+ ['59 minutes 59 seconds', 1, self::createTimestamp('2013-12-11 09:09:09'), $request_time],
+ ['59 minutes 59 seconds', 1, self::createTimestamp('2013-12-11 09:09:09'), $request_time],
// Checks for hours and possibly minutes or seconds.
- ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time],
- ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time],
- ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:07'), $request_time],
- ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:06'), $request_time],
- ['1 hour 1 minute', 60, $this->createTimestamp('2013-12-11 09:08:08'), $request_time],
- ['1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-11 09:08:07'), $request_time, $granularity_3],
- ['1 hour 1 minute 2 seconds', 1, $this->createTimestamp('2013-12-11 09:08:06'), $request_time, $granularity_4],
- ['1 hour 30 minutes', 60, $this->createTimestamp('2013-12-11 08:39:08'), $request_time],
- ['2 hours', 3600, $this->createTimestamp('2013-12-11 08:09:08'), $request_time],
- ['23 hours 59 minutes', 60, $this->createTimestamp('2013-12-10 10:10:08'), $request_time],
+ ['1 hour', 3600, self::createTimestamp('2013-12-11 09:09:08'), $request_time],
+ ['1 hour', 3600, self::createTimestamp('2013-12-11 09:09:08'), $request_time],
+ ['1 hour', 3600, self::createTimestamp('2013-12-11 09:09:07'), $request_time],
+ ['1 hour', 3600, self::createTimestamp('2013-12-11 09:09:06'), $request_time],
+ ['1 hour 1 minute', 60, self::createTimestamp('2013-12-11 09:08:08'), $request_time],
+ ['1 hour 1 minute 1 second', 1, self::createTimestamp('2013-12-11 09:08:07'), $request_time, $granularity_3],
+ ['1 hour 1 minute 2 seconds', 1, self::createTimestamp('2013-12-11 09:08:06'), $request_time, $granularity_4],
+ ['1 hour 30 minutes', 60, self::createTimestamp('2013-12-11 08:39:08'), $request_time],
+ ['2 hours', 3600, self::createTimestamp('2013-12-11 08:09:08'), $request_time],
+ ['23 hours 59 minutes', 60, self::createTimestamp('2013-12-10 10:10:08'), $request_time],
// Checks for days and possibly hours, minutes or seconds.
- ['1 day', 86400, $this->createTimestamp('2013-12-10 10:09:08'), $request_time],
- ['1 day', 86400, $this->createTimestamp('2013-12-10 10:09:07'), $request_time],
- ['1 day 1 hour', 3600, $this->createTimestamp('2013-12-10 09:09:08'), $request_time],
- ['1 day 1 hour 1 minute', 60, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_3 + $langcode_en],
- ['1 day 1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_4 + $langcode_lolspeak],
- ['1 day 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-10 08:07:06'), $request_time, $granularity_4],
- ['2 days', 86400, $this->createTimestamp('2013-12-09 10:09:08'), $request_time],
- ['2 days', 86400, $this->createTimestamp('2013-12-09 10:07:08'), $request_time],
- ['2 days 2 hours', 3600, $this->createTimestamp('2013-12-09 08:09:08'), $request_time],
- ['2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_3 + $langcode_en],
- ['2 days 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_4 + $langcode_lolspeak],
+ ['1 day', 86400, self::createTimestamp('2013-12-10 10:09:08'), $request_time],
+ ['1 day', 86400, self::createTimestamp('2013-12-10 10:09:07'), $request_time],
+ ['1 day 1 hour', 3600, self::createTimestamp('2013-12-10 09:09:08'), $request_time],
+ ['1 day 1 hour 1 minute', 60, self::createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_3 + $langcode_en],
+ ['1 day 1 hour 1 minute 1 second', 1, self::createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_4 + $langcode_lolspeak],
+ ['1 day 2 hours 2 minutes 2 seconds', 1, self::createTimestamp('2013-12-10 08:07:06'), $request_time, $granularity_4],
+ ['2 days', 86400, self::createTimestamp('2013-12-09 10:09:08'), $request_time],
+ ['2 days', 86400, self::createTimestamp('2013-12-09 10:07:08'), $request_time],
+ ['2 days 2 hours', 3600, self::createTimestamp('2013-12-09 08:09:08'), $request_time],
+ ['2 days 2 hours 2 minutes', 60, self::createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_3 + $langcode_en],
+ ['2 days 2 hours 2 minutes 2 seconds', 1, self::createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_4 + $langcode_lolspeak],
// Checks for weeks and possibly days, hours, minutes or seconds.
- ['1 week', 7 * 86400, $this->createTimestamp('2013-12-04 10:09:08'), $request_time],
- ['1 week 1 day', 86400, $this->createTimestamp('2013-12-03 10:09:08'), $request_time],
- ['2 weeks', 7 * 86400, $this->createTimestamp('2013-11-27 10:09:08'), $request_time],
- ['2 weeks 2 days', 86400, $this->createTimestamp('2013-11-25 08:07:08'), $request_time],
- ['2 weeks 2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-11-25 08:07:08'), $request_time, $granularity_4],
- ['4 weeks', 7 * 86400, $this->createTimestamp('2013-11-13 10:09:08'), $request_time],
- ['4 weeks 1 day', 86400, $this->createTimestamp('2013-11-12 10:09:08'), $request_time],
+ ['1 week', 7 * 86400, self::createTimestamp('2013-12-04 10:09:08'), $request_time],
+ ['1 week 1 day', 86400, self::createTimestamp('2013-12-03 10:09:08'), $request_time],
+ ['2 weeks', 7 * 86400, self::createTimestamp('2013-11-27 10:09:08'), $request_time],
+ ['2 weeks 2 days', 86400, self::createTimestamp('2013-11-25 08:07:08'), $request_time],
+ ['2 weeks 2 days 2 hours 2 minutes', 60, self::createTimestamp('2013-11-25 08:07:08'), $request_time, $granularity_4],
+ ['4 weeks', 7 * 86400, self::createTimestamp('2013-11-13 10:09:08'), $request_time],
+ ['4 weeks 1 day', 86400, self::createTimestamp('2013-11-12 10:09:08'), $request_time],
// Checks for months and possibly days, hours, minutes or seconds.
- ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:08'), $request_time],
- ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:07'), $request_time],
- ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:09:08'), $request_time],
- ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3],
- ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4],
- ['1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time],
- ['1 month 4 weeks 1 day', 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time, $granularity_3],
- ['1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time],
- ['1 month 4 weeks 2 days', 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time, $granularity_3],
- ['2 months', 30 * 86400, $this->createTimestamp('2013-10-11 10:09:08'), $request_time],
- ['2 months', 30 * 86400, $this->createTimestamp('2013-10-10 10:09:08'), $request_time],
- ['2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time],
- ['2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3],
- ['2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4],
- ['6 months', 30 * 86400, $this->createTimestamp('2013-06-09 10:09:08'), $request_time],
- ['11 months', 30 * 86400, $this->createTimestamp('2013-01-11 07:09:08'), $request_time],
- ['11 months 4 weeks', 7 * 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time],
- ['11 months 4 weeks 2 days', 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time, $granularity_3],
+ ['1 month', 30 * 86400, self::createTimestamp('2013-11-11 10:09:08'), $request_time],
+ ['1 month', 30 * 86400, self::createTimestamp('2013-11-11 10:09:07'), $request_time],
+ ['1 month', 30 * 86400, self::createTimestamp('2013-11-11 09:09:08'), $request_time],
+ ['1 month', 30 * 86400, self::createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3],
+ ['1 month', 30 * 86400, self::createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4],
+ ['1 month 4 weeks', 7 * 86400, self::createTimestamp('2013-10-13 10:09:08'), $request_time],
+ ['1 month 4 weeks 1 day', 86400, self::createTimestamp('2013-10-13 10:09:08'), $request_time, $granularity_3],
+ ['1 month 4 weeks', 7 * 86400, self::createTimestamp('2013-10-12 10:09:08'), $request_time],
+ ['1 month 4 weeks 2 days', 86400, self::createTimestamp('2013-10-12 10:09:08'), $request_time, $granularity_3],
+ ['2 months', 30 * 86400, self::createTimestamp('2013-10-11 10:09:08'), $request_time],
+ ['2 months', 30 * 86400, self::createTimestamp('2013-10-10 10:09:08'), $request_time],
+ ['2 months', 30 * 86400, self::createTimestamp('2013-10-09 08:07:06'), $request_time],
+ ['2 months', 30 * 86400, self::createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3],
+ ['2 months', 30 * 86400, self::createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4],
+ ['6 months', 30 * 86400, self::createTimestamp('2013-06-09 10:09:08'), $request_time],
+ ['11 months', 30 * 86400, self::createTimestamp('2013-01-11 07:09:08'), $request_time],
+ ['11 months 4 weeks', 7 * 86400, self::createTimestamp('2012-12-12 10:09:08'), $request_time],
+ ['11 months 4 weeks 2 days', 86400, self::createTimestamp('2012-12-12 10:09:08'), $request_time, $granularity_3],
// Checks for years and possibly months, days, hours, minutes or seconds.
- ['1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:09:08'), $request_time],
- ['1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:08:08'), $request_time],
- ['1 year', 365 * 86400, $this->createTimestamp('2012-12-10 10:09:08'), $request_time],
- ['2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:09:08'), $request_time],
- ['2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:07:08'), $request_time],
- ['2 years', 365 * 86400, $this->createTimestamp('2011-12-09 10:09:08'), $request_time],
- ['2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3],
- ['2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4],
- ['10 years', 365 * 86400, $this->createTimestamp('2003-12-11 10:09:08'), $request_time],
- ['100 years', 365 * 86400, $this->createTimestamp('1913-12-11 10:09:08'), $request_time],
+ ['1 year', 365 * 86400, self::createTimestamp('2012-12-11 10:09:08'), $request_time],
+ ['1 year', 365 * 86400, self::createTimestamp('2012-12-11 10:08:08'), $request_time],
+ ['1 year', 365 * 86400, self::createTimestamp('2012-12-10 10:09:08'), $request_time],
+ ['2 years', 365 * 86400, self::createTimestamp('2011-12-11 10:09:08'), $request_time],
+ ['2 years', 365 * 86400, self::createTimestamp('2011-12-11 10:07:08'), $request_time],
+ ['2 years', 365 * 86400, self::createTimestamp('2011-12-09 10:09:08'), $request_time],
+ ['2 years 2 months', 30 * 86400, self::createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3],
+ ['2 years 2 months', 30 * 86400, self::createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4],
+ ['10 years', 365 * 86400, self::createTimestamp('2003-12-11 10:09:08'), $request_time],
+ ['100 years', 365 * 86400, self::createTimestamp('1913-12-11 10:09:08'), $request_time],
// Checks the non-strict option vs. strict (default).
- ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07'), $non_strict],
- ['0 seconds', 0, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07')],
+ ['1 second', 1, self::createTimestamp('2013-12-11 10:09:08'), self::createTimestamp('2013-12-11 10:09:07'), $non_strict],
+ ['0 seconds', 0, self::createTimestamp('2013-12-11 10:09:08'), self::createTimestamp('2013-12-11 10:09:07')],
// Checks granularity limit.
- ['2 years 3 months 1 week', 7 * 86400, $this->createTimestamp('2011-08-30 11:15:57'), $request_time, $granularity_3],
+ ['2 years 3 months 1 week', 7 * 86400, self::createTimestamp('2011-08-30 11:15:57'), $request_time, $granularity_3],
];
return $data;
@@ -455,7 +455,7 @@ public function testRfc2822DateFormat(): void {
* @return int
* The UNIX timestamp.
*/
- private function createTimestamp($dateTimeString) {
+ private static function createTimestamp(string $dateTimeString): int {
return \DateTime::createFromFormat('Y-m-d G:i:s', $dateTimeString)->getTimestamp();
}
--
GitLab