diff --git a/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php b/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php index 054bf84ab3..0c13370d7f 100644 --- a/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php +++ b/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php @@ -71,13 +71,6 @@ class AjaxResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn */ protected $moduleHandler; - /** - * The language manager. - * - * @var \Drupal\Core\Language\LanguageManagerInterface - */ - protected $languageManager; - /** * Constructs an AjaxResponseAttachmentsProcessor object. * @@ -95,10 +88,10 @@ class AjaxResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn * The renderer. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. - * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager + * @param \Drupal\Core\Language\LanguageManagerInterface $languageManager * The language manager. */ - public function __construct(AssetResolverInterface $asset_resolver, ConfigFactoryInterface $config_factory, AssetCollectionRendererInterface $css_collection_renderer, AssetCollectionRendererInterface $js_collection_renderer, RequestStack $request_stack, RendererInterface $renderer, ModuleHandlerInterface $module_handler, LanguageManagerInterface $language_manager = NULL) { + public function __construct(AssetResolverInterface $asset_resolver, ConfigFactoryInterface $config_factory, AssetCollectionRendererInterface $css_collection_renderer, AssetCollectionRendererInterface $js_collection_renderer, RequestStack $request_stack, RendererInterface $renderer, ModuleHandlerInterface $module_handler, protected LanguageManagerInterface $languageManager) { $this->assetResolver = $asset_resolver; $this->config = $config_factory->get('system.performance'); $this->cssCollectionRenderer = $css_collection_renderer; @@ -106,11 +99,10 @@ public function __construct(AssetResolverInterface $asset_resolver, ConfigFactor $this->requestStack = $request_stack; $this->renderer = $renderer; $this->moduleHandler = $module_handler; - if (!isset($language_manager)) { + if (!isset($languageManager)) { @trigger_error('Calling ' . __METHOD__ . '() without the $language_manager argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0', E_USER_DEPRECATED); - $language_manager = \Drupal::languageManager(); + $this->languageManager = \Drupal::languageManager(); } - $this->languageManager = $language_manager; } /** diff --git a/core/lib/Drupal/Core/Asset/AssetDumper.php b/core/lib/Drupal/Core/Asset/AssetDumper.php index 1d12d5da35..91360e5bc4 100644 --- a/core/lib/Drupal/Core/Asset/AssetDumper.php +++ b/core/lib/Drupal/Core/Asset/AssetDumper.php @@ -47,7 +47,7 @@ public function dump($data, $file_extension) { /** * {@inheritdoc} */ - public function dumpToUri($data, $file_extension, $uri): string { + public function dumpToUri(string $data, string $file_extension, string $uri): string { $path = 'public://' . $file_extension; // Create the CSS or JS file. $this->fileSystem->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY); diff --git a/core/lib/Drupal/Core/Asset/AssetDumperUriInterface.php b/core/lib/Drupal/Core/Asset/AssetDumperUriInterface.php index 72758d817a..cf7085fef7 100644 --- a/core/lib/Drupal/Core/Asset/AssetDumperUriInterface.php +++ b/core/lib/Drupal/Core/Asset/AssetDumperUriInterface.php @@ -20,6 +20,6 @@ interface AssetDumperUriInterface extends AssetDumperInterface { * @return string * An URI to access the dumped asset. */ - public function dumpToUri($data, $file_extension, $uri): string; + public function dumpToUri(string $data, string $file_extension, string $uri): string; } diff --git a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php index 95b53422e1..c932f84181 100644 --- a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php +++ b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php @@ -81,13 +81,6 @@ class HtmlResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn */ protected $moduleHandler; - /** - * The language manager. - * - * @var \Drupal\Core\Language\LanguageManagerInterface - */ - protected $languageManager; - /** * Constructs a HtmlResponseAttachmentsProcessor object. * @@ -105,10 +98,10 @@ class HtmlResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn * The renderer. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler service. - * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager + * @param \Drupal\Core\Language\LanguageManagerInterface $languageManager * The language manager. */ - public function __construct(AssetResolverInterface $asset_resolver, ConfigFactoryInterface $config_factory, AssetCollectionRendererInterface $css_collection_renderer, AssetCollectionRendererInterface $js_collection_renderer, RequestStack $request_stack, RendererInterface $renderer, ModuleHandlerInterface $module_handler, LanguageManagerInterface $language_manager) { + public function __construct(AssetResolverInterface $asset_resolver, ConfigFactoryInterface $config_factory, AssetCollectionRendererInterface $css_collection_renderer, AssetCollectionRendererInterface $js_collection_renderer, RequestStack $request_stack, RendererInterface $renderer, ModuleHandlerInterface $module_handler, protected LanguageManagerInterface $languageManager) { $this->assetResolver = $asset_resolver; $this->config = $config_factory->get('system.performance'); $this->cssCollectionRenderer = $css_collection_renderer; @@ -116,11 +109,10 @@ public function __construct(AssetResolverInterface $asset_resolver, ConfigFactor $this->requestStack = $request_stack; $this->renderer = $renderer; $this->moduleHandler = $module_handler; - if (!isset($language_manager)) { - @trigger_error('Calling ' . __METHOD__ . '() without the $language_manager argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0', E_USER_DEPRECATED); - $language_manager = \Drupal::languageManager(); + if (!isset($languageManager)) { + @trigger_error('Calling ' . __METHOD__ . '() without the $languageManager argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0', E_USER_DEPRECATED); + $this->languageManager = \Drupal::languageManager(); } - $this->languageManager = $language_manager; } /** diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon index 50c770ed62..3fe6bec6b1 100644 --- a/core/phpstan-baseline.neon +++ b/core/phpstan-baseline.neon @@ -100,16 +100,6 @@ parameters: count: 1 path: lib/Drupal/Core/Archiver/ArchiverManager.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: "#^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 diff --git a/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php b/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php index cc3f12bc5b..b2589385ab 100644 --- a/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php @@ -11,6 +11,7 @@ use Drupal\Core\Asset\AttachedAssets; use Drupal\Core\Asset\AttachedAssetsInterface; use Drupal\Core\Cache\MemoryBackend; +use Drupal\Core\Language\LanguageInterface; use Drupal\Tests\UnitTestCase; /** @@ -71,12 +72,12 @@ class AssetResolverTest extends UnitTestCase { /** * A mocked English language object. */ - protected $english; + protected LanguageInterface $english; /** * A mocked Japanese language object. */ - protected $japanese; + protected LanguageInterface $japanese; /** * {@inheritdoc} diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php index 9371d9dc9c..9f2e029dce 100644 --- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php @@ -23,20 +23,6 @@ */ class CssCollectionOptimizerLazyUnitTest extends UnitTestCase { - /** - * The data from the dumper. - * - * @var string - */ - protected $dumperData; - - /** - * A CSS Collection optimizer. - * - * @var \Drupal\Core\Asset\AssetCollectionOptimizerInterface - */ - protected $optimizer; - /** * Tests that CSS imports with strange letters do not destroy the CSS output. */ @@ -66,8 +52,8 @@ public function testCssImport(): void { $mock_file_url_generator = $this->createMock(FileUrlGeneratorInterface::class); $mock_time = $this->createMock(TimeInterface::class); $mock_language = $this->createMock(LanguageManagerInterface::class); - $this->optimizer = new CssCollectionOptimizerLazy($mock_grouper, $mock_optimizer, $mock_theme_manager, $mock_dependency_resolver, new RequestStack(), $mock_state, $mock_file_system, $mock_config_factory, $mock_file_url_generator, $mock_time, $mock_language); - $aggregate = $this->optimizer->optimizeGroup( + $optimizer = new CssCollectionOptimizerLazy($mock_grouper, $mock_optimizer, $mock_theme_manager, $mock_dependency_resolver, new RequestStack(), $mock_state, $mock_file_system, $mock_config_factory, $mock_file_url_generator, $mock_time, $mock_language); + $aggregate = $optimizer->optimizeGroup( [ 'items' => [ 'core/modules/system/tests/modules/common_test/common_test_css_import.css' => [