Commit f1eaa020 authored by catch's avatar catch
Browse files

Issue #3320025 by alexpott, longwave: Make PHPStan baseline the same in 10.1.x and 10.0.x

parent c0b30d92

core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public function deleteAll() { 


    $delete_stale = function ($uri) {

      // Default stale file threshold is 30 days.

      if (REQUEST_TIME - filemtime($uri) > \Drupal::config('system.performance')->get('stale_file_threshold')) {

      if (\Drupal::time()->getRequestTime() - filemtime($uri) > \Drupal::config('system.performance')->get('stale_file_threshold')) {

        $this->fileSystem->delete($uri);

      }

    };

core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ public function deleteAll() { 
    $this->state->delete('system.js_cache_files');

    $delete_stale = function ($uri) {

      // Default stale file threshold is 30 days.

      if (REQUEST_TIME - filemtime($uri) > \Drupal::config('system.performance')->get('stale_file_threshold')) {

      if (\Drupal::time()->getRequestTime() - filemtime($uri) > \Drupal::config('system.performance')->get('stale_file_threshold')) {

        $this->fileSystem->delete($uri);

      }

    };

core/phpstan-baseline.neon

+0 −10
Original line number Diff line number Diff line
@@ -255,21 +255,11 @@ parameters: 
			count: 2

			path: lib/Drupal/Core/Asset/CssCollectionGrouper.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: lib/Drupal/Core/Asset/CssCollectionOptimizer.php



		-

			message: "#^Variable \\$group_keys might not be defined\\.$#"

			count: 2

			path: lib/Drupal/Core/Asset/JsCollectionGrouper.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: lib/Drupal/Core/Asset/JsCollectionOptimizer.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