Issue #3474819: Drupal 11 Compatibility

orejime.info.yml

 name: 'Orejime'
 type: module
 description: 'Drupal integration of Orejime'
-core_version_requirement: ^9.2 || ^10 || ^11
+core_version_requirement: ^10 || ^11
 package: 'orejime'
 configure: orejime_service.settings
 dependencies:

src/Services/JsCollectionRendererOrejime.php

@@ -25,9 +25,9 @@ class JsCollectionRendererOrejime extends JsCollectionRenderer {
     // A dummy query-string is added to filenames, to gain control over
     // browser-caching. The string changes on every update or full cache
     // flush, forcing browsers to load a new copy of the files, as the
-    // URL changed. Files that should not be cached get REQUEST_TIME as
+    // URL changed. Files that should not be cached get the request time as a
     // query-string instead, to enforce reload on every page request.
-    $default_query_string = $this->state->get('system.css_js_query_string') ?: '0';
+    $default_query_string = $this->assetQueryString->get();
 
     // Defaults for each SCRIPT element.
     $element_defaults = [
@@ -38,7 +38,6 @@ class JsCollectionRendererOrejime extends JsCollectionRenderer {
 
     // Loop through all JS assets.
     foreach ($js_assets as $js_asset) {
-      // Element properties that do not depend on JS asset type.
       $element = $element_defaults;
       $element['#browsers'] = $js_asset['browsers'] ?? [];
 
@@ -56,12 +55,12 @@ class JsCollectionRendererOrejime extends JsCollectionRenderer {
 
         case 'file':
           $query_string = $js_asset['version'] == -1 ? $default_query_string : 'v=' . $js_asset['version'];
-          $query_string_separator = (strpos($js_asset['data'], '?') !== FALSE) ? '&' : '?';
-          $element['#attributes']['src'] = \Drupal::service('file_url_generator')->generateString($js_asset['data']);
+          $query_string_separator = str_contains($js_asset['data'], '?') ? '&' : '?';
+          $element['#attributes']['src'] = $this->fileUrlGenerator->generateString($js_asset['data']);
           // Only add the cache-busting query string if this isn't an aggregate
           // file.
           if (!isset($js_asset['preprocessed'])) {
-            $element['#attributes']['src'] .= $query_string_separator . ($js_asset['cache'] ? $query_string : \Drupal::time()->getRequestTime());
+            $element['#attributes']['src'] .= $query_string_separator . ($js_asset['cache'] ? $query_string : $this->time->getRequestTime());
           }
           break;