Issue #3263395 by longwave: Remove deprecated code from asset library system

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

@@ -32,12 +32,8 @@ class CssCollectionRenderer implements AssetCollectionRendererInterface {
    * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
    *   The file URL generator.
    */
-  public function __construct(StateInterface $state, FileUrlGeneratorInterface $file_url_generator = NULL) {
+  public function __construct(StateInterface $state, FileUrlGeneratorInterface $file_url_generator) {
     $this->state = $state;
-    if (!$file_url_generator) {
-      @trigger_error('Calling CssCollectionRenderer::__construct() without the $file_url_generator argument is deprecated in drupal:9.3.0 and will be required before drupal:10.0.0. See https://www.drupal.org/node/2549139.', E_USER_DEPRECATED);
-      $file_url_generator = \Drupal::service('file_url_generator');
-    }
     $this->fileUrlGenerator = $file_url_generator;
   }
 

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

@@ -31,11 +31,7 @@ class CssOptimizer implements AssetOptimizerInterface {
    * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
    *   The file URL generator.
    */
-  public function __construct(FileUrlGeneratorInterface $file_url_generator = NULL) {
-    if (!$file_url_generator) {
-      @trigger_error('Calling CssOptimizer::__construct() without the $file_url_generator argument is deprecated in drupal:9.3.0. The $file_url_generator argument will be required in drupal:10.0.0. See https://www.drupal.org/node/2940031', E_USER_DEPRECATED);
-      $file_url_generator = \Drupal::service('file_url_generator');
-    }
+  public function __construct(FileUrlGeneratorInterface $file_url_generator) {
     $this->fileUrlGenerator = $file_url_generator;
   }
 
@@ -291,27 +287,7 @@ public function rewriteFileURI($matches) {
       $last = $path;
       $path = preg_replace('`(^|/)(?!\.\./)([^/]+)/\.\./`', '$1', $path);
     }
-    return 'url(' . $this->getFileUrlGenerator()->generateString($path) . ')';
-  }
-
-  /**
-   * Returns the file URL generator.
-   *
-   * This is provided for BC as sub-classes may not call the parent constructor.
-   *
-   * @return \Drupal\Core\File\FileUrlGeneratorInterface
-   *   The file URL generator.
-   *
-   * @internal
-   *   This can be removed in Drupal 10.0.x when the constructor deprecation is
-   *   removed.
-   */
-  private function getFileUrlGenerator(): FileUrlGeneratorInterface {
-    if (!$this->fileUrlGenerator) {
-      @trigger_error('Calling CssOptimizer::__construct() without the $file_url_generator argument is deprecated in drupal:9.3.0. The $file_url_generator argument will be required in drupal:10.0.0. See https://www.drupal.org/node/2940031', E_USER_DEPRECATED);
-      $this->fileUrlGenerator = \Drupal::service('file_url_generator');
-    }
-    return $this->fileUrlGenerator;
+    return 'url(' . $this->fileUrlGenerator->generateString($path) . ')';
   }
 
 }

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

@@ -33,12 +33,8 @@ class JsCollectionRenderer implements AssetCollectionRendererInterface {
    * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
    *   The file URL generator.
    */
-  public function __construct(StateInterface $state, FileUrlGeneratorInterface $file_url_generator = NULL) {
+  public function __construct(StateInterface $state, FileUrlGeneratorInterface $file_url_generator) {
     $this->state = $state;
-    if (!$file_url_generator) {
-      @trigger_error('Calling JsCollectionRenderer::__construct() without the $file_url_generator argument is deprecated in drupal:9.3.0. The $file_url_generator argument will be required in drupal:10.0.0. See https://www.drupal.org/node/2940031', E_USER_DEPRECATED);
-      $file_url_generator = \Drupal::service('file_url_generator');
-    }
     $this->fileUrlGenerator = $file_url_generator;
   }
 

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

@@ -77,20 +77,12 @@ class LibraryDiscoveryParser {
    * @param \Drupal\Core\Extension\ExtensionPathResolver $extension_path_resolver
    *   The extension path resolver.
    */
-  public function __construct($root, ModuleHandlerInterface $module_handler, ThemeManagerInterface $theme_manager, StreamWrapperManagerInterface $stream_wrapper_manager, LibrariesDirectoryFileFinder $libraries_directory_file_finder = NULL, ExtensionPathResolver $extension_path_resolver = NULL) {
+  public function __construct($root, ModuleHandlerInterface $module_handler, ThemeManagerInterface $theme_manager, StreamWrapperManagerInterface $stream_wrapper_manager, LibrariesDirectoryFileFinder $libraries_directory_file_finder, ExtensionPathResolver $extension_path_resolver) {
     $this->root = $root;
     $this->moduleHandler = $module_handler;
     $this->themeManager = $theme_manager;
     $this->streamWrapperManager = $stream_wrapper_manager;
-    if (!$libraries_directory_file_finder) {
-      @trigger_error('Calling LibraryDiscoveryParser::__construct() without the $libraries_directory_file_finder argument is deprecated in drupal:8.9.0. The $libraries_directory_file_finder argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3099614', E_USER_DEPRECATED);
-      $libraries_directory_file_finder = \Drupal::service('library.libraries_directory_file_finder');
-    }
     $this->librariesDirectoryFileFinder = $libraries_directory_file_finder;
-    if (!$extension_path_resolver) {
-      @trigger_error('Calling LibraryDiscoveryParser::__construct() without the $extension_path_resolver argument is deprecated in drupal:9.3.0 and is required in drupal:10.0.0. See https://www.drupal.org/node/2940438', E_USER_DEPRECATED);
-      $extension_path_resolver = \Drupal::service('extension.path.resolver');
-    }
     $this->extensionPathResolver = $extension_path_resolver;
   }