Replace non-test usages of \Drupal::theme() with IoC injection

impletemented suggestion a per #6

I have reroll the patch

Replacing \Drupal::theme() with \Drupal::service('theme.manager') in ThemeTest file. Kindly review a patch.

Kindly ignore patch #17, replacing \Drupal::theme() and \Drupal::service('theme.manager') with IoC injection where possible , that's why no interdiff. Kindly review a new patch.

Adding change record and deprecation error also. Kindly review a new patch.

Unrelated failed test case comes , retested the last patch.

There are a few more instances that can be injected:

grep -nri '\Drupal::theme()' core | grep -v .module | grep -vi test | grep -v .api.php | grep -v authorize.php | grep -v .inc
core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php:264:    $regions = \Drupal::theme()->getActiveTheme()->getRegions();
core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php:305:    \Drupal::theme()->alter('page_attachments', $attachments);

Injecting theme manager service in HtmlRenderer.php file and adding Change Record and deprecation error also.
Kindly review a new patch.

Working on this.

Working on this.

Review please, thanks.

+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -97,8 +105,10 @@ class HtmlRenderer implements MainContentRendererInterface {
-  public function __construct(TitleResolverInterface $title_resolver, PluginManagerInterface $display_variant_manager, EventDispatcherInterface $event_dispatcher, ModuleHandlerInterface $module_handler, RendererInterface $renderer, RenderCacheInterface $render_cache, array $renderer_config) {
+  public function __construct(TitleResolverInterface $title_resolver, PluginManagerInterface $display_variant_manager, EventDispatcherInterface $event_dispatcher, ModuleHandlerInterface $module_handler, RendererInterface $renderer, RenderCacheInterface $render_cache, array $renderer_config, ThemeManagerInterface $theme_manager = NULL) {

@@ -106,6 +116,7 @@ public function __construct(TitleResolverInterface $title_resolver, PluginManage
+    $this->themeManager = $theme_manager;

+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -64,12 +72,15 @@ class ViewEditForm extends ViewFormBase {
-  public function __construct(SharedTempStoreFactory $temp_store_factory, RequestStack $requestStack, DateFormatterInterface $date_formatter, ElementInfoManagerInterface $element_info) {
+  public function __construct(SharedTempStoreFactory $temp_store_factory, RequestStack $requestStack, DateFormatterInterface $date_formatter, ElementInfoManagerInterface $element_info, ThemeManagerInterface $theme_manager = NULL) {
...
+    $this->themeManager = $theme_manager;

In Drupal 9 this argument needs to be optional. In Drupal 10 we can require it. We need to do something like:

    if ($theme_manager === NULL) {
      @trigger_error('The theme.manager service must be passed to ' . __NAMESPACE__ . '\HtmlRenderer::__construct(). It was added in drupal:9.1.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);
      $theme_manager = \Drupal::service('theme.manager');
    }

Thanks @alexpott and @jungle for your review. This patch is based on #23, please review again, thanks.

Oh, sorry, thanks you @jungle for finding the problem. Please review again.

Committed 4cb745d and pushed to 9.1.x. Thanks!

+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -64,12 +72,19 @@ class ViewEditForm extends ViewFormBase {
+    if ($theme_manager === NULL) {

Given a type hint of ThemeManagerInterface $theme_manager = NULL there is no difference between if ($theme_manager === NULL) { and if (!$theme_manager) { apart from about lines and working out if the === means anything. In this case it does not. That might possibly change if https://wiki.php.net/rfc/objects-can-be-falsifiable lands but at this point that feels unlikely.

diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index 39a3ab8ab6..66af0a82d4 100644
--- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -15,9 +15,9 @@
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Render\RenderEvents;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Theme\ThemeManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Drupal\Core\Theme\ThemeManagerInterface;
 
 /**
  * Default main content renderer for HTML requests.
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index a53b9ead32..c4a5a94b33 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -11,13 +11,13 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\ElementInfoManagerInterface;
-use Drupal\Core\Url;
 use Drupal\Core\TempStore\SharedTempStoreFactory;
+use Drupal\Core\Theme\ThemeManagerInterface;
+use Drupal\Core\Url;
 use Drupal\views\Views;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
-use Drupal\Core\Theme\ThemeManagerInterface;
 
 /**
  * Form controller for the Views edit form.

Changed the use statements to be alphabetical on commit.