Replace REQUEST_TIME in non-OO and non-module code

All changes look good to me.
For me it is RTBC.

+++ b/core/includes/bootstrap.inc
@@ -688,7 +688,7 @@ function drupal_valid_test_ua($new_prefix = NULL) {
-    $time_diff = REQUEST_TIME - $time;
+    $time_diff = (int) $_SERVER['REQUEST_TIME'] - $time;

Can this use \Drupal::time() now? Also if we can't I think using time() is better than doing $_SERVER['REQUEST_TIME'] - also there is no need to cast to int. it is an int.

Here I have made changes as suggested in comment #10

@ravi.shankar: Did you try the change that @alexpott suggested in comment #10 with \Drupal::time()->getCurrentTime() instead of time(). If you did and it did not work then it is for me RTBC.

Hi @daffie,

Unfortunately, I didn't try \Drupal::time()

I'll give it a try now.

Here I have added a new patch.

The patch with \Drupal::time()->getCurrentTime() instead of time() did not work. Re uploading the patch from comment #11. That patch addresses the change that @alexpott would like. Therefor is that patch for me RTBC.

+++ b/core/includes/bootstrap.inc
@@ -688,7 +688,7 @@ function drupal_valid_test_ua($new_prefix = NULL) {
-    $time_diff = REQUEST_TIME - $time;
+    $time_diff = time() - $time;

This needs to be the request time. I'm guessing that because \Drupal is not working this method is being called when there is no container. Changing this to time() still doesn't buy us the test-ability that something \Drupal::time() would. Is time() better than $_SERVER['REQUEST_TIME'] - i dunno - this feels like it is normally about validating a request made during a test so request time is more logical.

All this said another issue converting to the \Drupal::time() service caused a lot of random fails so I'm not sure that the plan to do the conversions piecemeal is a good one because there are situations (especially another kernel tests) where $_SERVER['REQUEST_TIME'] !== \Drupal::time()->getRequestTime() - see #2902895-58: [meta][no patch] Replace uses of REQUEST_TIME and time() with time service

If we want to resolve the problem of testability for drupal_valid_test_ua() then we need to pass the request into this method. If we did that we should get the request time form that object. So let's file another issue to do that.

I see a lot of similar issues with changing REQUEST_TIME so I'm adding them as related issues (though I may have missed some). I'm unclear why so many were opened separately and without a lot of digging, I don't know if any can be closed as duplicates but it's likely some could be.

For anyone looking for an explanation of why there are several issues on this, see the discussion in the parent issue.

Added reroll of patch #15 on Drupal 9.4.x.

1. +++ b/core/core.api.php
   @@ -1935,13 +1935,13 @@ function hook_cron() {
      foreach (Feed::loadMultiple($ids) as $feed) {
        if ($queue->createItem($feed)) {
          // Add timestamp to avoid queueing item more than once.
   -      $feed->setQueuedTime(REQUEST_TIME);
   +      $feed->setQueuedTime(\Drupal::time()->getRequestTime());
   

   should be moved out of loop

2. +++ b/core/includes/install.core.inc
   @@ -1058,9 +1058,9 @@ function install_display_output($output, $install_state) {
   -    'Last-Modified' => gmdate(DATE_RFC1123, REQUEST_TIME),
   +    'Last-Modified' => gmdate(DATE_RFC1123, \Drupal::time()->getRequestTime()),
        'Cache-Control' => 'no-cache, must-revalidate',
   -    'ETag' => '"' . REQUEST_TIME . '"',
   +    'ETag' => '"' . \Drupal::time()->getRequestTime() . '"',
   

   should use a variable to not call service twice

3. +++ b/core/rebuild.php
   @@ -38,7 +38,7 @@
   -    ((REQUEST_TIME - $request->query->get('timestamp')) < 300) &&
   +    ((\Drupal::time()->getRequestTime() - $request->query->get('timestamp')) < 300) &&
   

   I think this place should use request->server->getInt(REQUEST_TIME)

Made changes as per comment #27, please review.

Thanks for working on this ravi! I think there's still a few more changes which need to be made.

1. +++ b/core/rebuild.php
   @@ -38,7 +38,7 @@
   -    ((REQUEST_TIME - $request->query->get('timestamp')) < 300) &&
   +    ((\Drupal::time()->getRequestTime() - $request->query->get('timestamp')) < 300) &&
   

   You need to pass REQUEST_TIME as a string, not a constant since the constant is being deprecated. Passing 'REQUEST_TIME' tells the request object, "Hey, I want the time of this request as an integer". So, this should really be $request->server->getInt('REQUEST_TIME').

2. core/includes/install.core.inc
   @@ -1884,7 +1884,7 @@ function install_finished(&$install_state) {
      \Drupal::messenger()->addStatus($success_message);
    
      // Record when this install ran.
      \Drupal::state()->set('install_time', $_SERVER['REQUEST_TIME']);
    }
   

   This should really be updated as well with \Drupal::time()->getRequestTime());.

3. core/scripts/generate-d7-content.sh
   @@ -237,7 +238,7 @@
      $node->status = intval($i / 2) % 2;
      $node->revision = 1;
      $node->promote = $i % 2;
      $node->created = REQUEST_TIME + $i * 43200;
   

   This should be updated with either $_SERVER['REQUEST_TIME'] or maybe time(). If time() is used, I'd recommend setting the variable outside of the loop to prevent repeated calls to time().

I'm gonna work on @cliddell suggestions at #29. :)

Patch updated with @cliddell suggestions.

+++ b/core/scripts/generate-d7-content.sh
@@ -237,7 +237,7 @@
+  $node->created = $_SERVER['REQUEST_TIME'] + $i * 43200;

I'm not sure $_SERVER['REQUEST_TIME'] is ever set in this script? It might be safer to use time() as noted above, or explicitly set $_SERVER['REQUEST_TIME'] = time() at the top of the script where other $_SERVER values are set...

Actually, I think PHP always sets $_SERVER['REQUEST_TIME'), so #32 can be ignored.

I think #31 is good to go.

Committed 10dce7b and pushed to 10.0.x. Thanks!
Committed and pushed debf702718 to 9.5.x and 960480f092 to 9.4.x. Thanks!

diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 883c95f1d7..e7bcbbb205 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -1,25 +1,10 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
-			count: 1
-			path: includes/bootstrap.inc
-
-		-
-			message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
-			count: 1
-			path: includes/common.inc
-
 		-
 			message: "#^Function format_size\\(\\) should return Drupal\\\\Core\\\\StringTranslation\\\\TranslatableMarkup but return statement is missing\\.$#"
 			count: 1
 			path: includes/common.inc
 
-		-
-			message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
-			count: 2
-			path: includes/install.core.inc
-
 		-
 			message: "#^Function install_config_download_translations\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
@@ -2618,7 +2603,6 @@ parameters:
 			count: 1
 			path: modules/system/tests/modules/service_provider_test/src/TestFileUsage.php
 
-
 		-
 			message: "#^Access to an undefined property Drupal\\\\Tests\\\\system\\\\Functional\\\\Entity\\\\EntityListBuilderTest\\:\\:\\$webUser\\.$#"
 			count: 1
@@ -3524,7 +3508,6 @@ parameters:
 			count: 1
 			path: modules/workspaces/src/WorkspacePublisher.php
 
-
 		-
 			message: "#^Access to an undefined property Drupal\\\\Tests\\\\workspaces\\\\Kernel\\\\EntityReferenceSupportedNewEntitiesConstraintValidatorTest\\:\\:\\$entityTypeManager\\.$#"
 			count: 2
@@ -3540,11 +3523,6 @@ parameters:
 			count: 5
 			path: profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
 
-		-
-			message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
-			count: 1
-			path: rebuild.php
-
 		-
 			message: "#^Access to an undefined property Drupal\\\\BuildTests\\\\Framework\\\\BuildTestBase\\:\\:\\$phpFinder\\.$#"
 			count: 1
diff --git a/core/phpstan.neon.dist b/core/phpstan.neon.dist
index 543c5d50ef..41bedcd7d3 100644
--- a/core/phpstan.neon.dist
+++ b/core/phpstan.neon.dist
@@ -18,6 +18,9 @@ parameters:
     - ../*/node_modules/*
     - */tests/fixtures/*.php
     - */tests/fixtures/*.php.gz
+    # Skip Drupal 6 & 7 code.
+    - core/scripts/generate-d6-content.sh
+    - core/scripts/generate-d7-content.sh
     # Skip data files.
     - lib/Drupal/Component/Transliteration/data/*.php
     # Below extends on purpose a non existing class for testing.

On Drupal 10 has to make the above changes to commit this one. Given that core/phpstan-baseline.neon is automatically generated and the skips are obvious I think it is fine to do on commit.