summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2017-06-13 01:34:06 (GMT)
committerxjm2017-06-13 10:49:43 (GMT)
commit7d3bdf070c26cd3e8915e4a81a262c7ba12dcb27 (patch)
tree044110042dac28e056d1e48b883bf7fbc5bfdf6b
parent62fa7974e6e2a25cd6b0440503de67333b90af4c (diff)
Revert "Issue #2795489 by mpdonadio, gambry, Yogesh Pawar, cilefen, Munavijayalakshmi, wturrell, jhedstrom, pjohn, catch, xjm, ednawig: 2038 bug with PHP timestamps on 32-bit systems - warn users?"
This reverts commit fdc9ff9f4997e2b013db02096f00b6eb2a5872d6.
-rw-r--r--core/modules/system/system.install9
-rw-r--r--core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php24
2 files changed, 2 insertions, 31 deletions
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 2a8c5d6..056419d 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -929,15 +929,6 @@ function system_requirements($phase) {
];
}
}
- // Check to see if dates will be limited to 1901-2038.
- if (PHP_INT_SIZE <= 4) {
- $requirements['limited_date_range'] = [
- 'title' => t('Limited date range'),
- 'value' => t('Your PHP installation has a limited date range.'),
- 'description' => t('You are running on a system where PHP is compiled or limited to using 32-bit integers. This will limit the range of dates and timestamps to the years 1901-2038. Read about the <a href=":url">limitations of 32-bit PHP</a>.', [':url' => 'https://www.drupal.org/docs/8/system-requirements/limitations-of-32-bit-php']),
- 'severity' => REQUIREMENT_WARNING,
- ];
- }
return $requirements;
}
diff --git a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
index 8ddd60b..f120007 100644
--- a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
+++ b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
@@ -293,7 +293,7 @@ class DateTimePlusTest extends UnitTestCase {
* @see DateTimePlusTest::testDates()
*/
public function providerTestDates() {
- $dates = [
+ return [
// String input.
// Create date object from datetime string.
['2009-03-07 10:30', 'America/Chicago', '2009-03-07T10:30:00-06:00'],
@@ -308,16 +308,6 @@ class DateTimePlusTest extends UnitTestCase {
// Same during daylight savings time.
['2009-06-07 10:30', 'Australia/Canberra', '2009-06-07T10:30:00+10:00'],
];
-
- // On 32-bit systems, timestamps are limited to 1901-2038.
- if (PHP_INT_SIZE > 4) {
- // Create a date object in the distant past.
- $dates[] = ['1809-02-12 10:30', 'America/Chicago', '1809-02-12T10:30:00-06:00'];
- // Create a date object in the far future.
- $dates[] = ['2345-01-02 02:04', 'UTC', '2345-01-02T02:04:00+00:00'];
- }
-
- return $dates;
}
/**
@@ -330,7 +320,7 @@ class DateTimePlusTest extends UnitTestCase {
* @see DateTimePlusTest::testDates()
*/
public function providerTestDateArrays() {
- $dates = [
+ return [
// Array input.
// Create date object from date array, date only.
[['year' => 2010, 'month' => 2, 'day' => 28], 'America/Chicago', '2010-02-28T00:00:00-06:00'],
@@ -341,16 +331,6 @@ class DateTimePlusTest extends UnitTestCase {
// Create date object from date array with hour.
[['year' => 2010, 'month' => 2, 'day' => 28, 'hour' => 10], 'Europe/Berlin', '2010-02-28T10:00:00+01:00'],
];
-
- // On 32-bit systems, timestamps are limited to 1901-2038.
- if (PHP_INT_SIZE > 4) {
- // Create a date object in the distant past.
- $dates[] = [['year' => 1809, 'month' => 2, 'day' => 12], 'America/Chicago', '1809-02-12T00:00:00-06:00'];
- // Create a date object in the far future.
- $dates[] = [['year' => 2345, 'month' => 1, 'day' => 2], 'UTC', '2345-01-02T00:00:00+00:00'];
- }
-
- return $dates;
}
/**