From b682f765e3e35780984b3bb9a82f56c8218d1a17 Mon Sep 17 00:00:00 2001
From: Nikolay Lobachev <nikolay.lobachev@gmail.com>
Date: Fri, 16 Sep 2022 17:24:53 +0200
Subject: [PATCH] Extension list (#4340)

* Add new arguments key and target. Make it possible use not only default target for db connections

* Issue #4265: Replace DI with direct call of extension.list.module to avoid errors service is not found.
---
 src/Extension/Manager.php | 11 ++---------
 uninstall.services.yml    |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Extension/Manager.php b/src/Extension/Manager.php
index 19e4d4a74..31af0f97b 100644
--- a/src/Extension/Manager.php
+++ b/src/Extension/Manager.php
@@ -46,11 +46,6 @@ class Manager
      */
     private $extension = null;
 
-    /**
-     * @var Drupal\Core\Extension\ModuleExtensionList
-     */
-    private $extensionList;
-
     /**
      * @var ModuleHandlerInterface
      */
@@ -67,7 +62,6 @@ class Manager
      * @param Site   $site
      * @param Client $httpClient
      * @param string $appRoot
-     * @param ModuleExtensionList $extensionList
      * @param ModuleHandlerInterface $moduleHandler
      * @param ThemeHandler  $themeHandler
      */
@@ -75,14 +69,12 @@ public function __construct(
         Site $site,
         Client $httpClient,
         $appRoot,
-        ModuleExtensionList $extensionList,
         ModuleHandlerInterface $moduleHandler,
         ThemeHandler $themeHandler
     ) {
         $this->site = $site;
         $this->httpClient = $httpClient;
         $this->appRoot = $appRoot;
-        $this->extensionList = $extensionList;
         $this->moduleHandler = $moduleHandler;
         $this->themeHandler = $themeHandler;
         $this->initialize();
@@ -250,7 +242,8 @@ private function discoverExtensions($type)
     {
         if ($type === 'module') {
             $this->site->loadLegacyFile('/core/modules/system/system.module');
-            $this->extensionList->reset()->getList();
+            $extensionList = \Drupal::service('extension.list.module');
+            $extensionList->reset()->getList();
         }
 
         if ($type === 'theme') {
diff --git a/uninstall.services.yml b/uninstall.services.yml
index 0b6fb832b..c6b809a3c 100644
--- a/uninstall.services.yml
+++ b/uninstall.services.yml
@@ -4,7 +4,7 @@ services:
     arguments: ['@app.root', '@console.configuration_manager']
   console.extension_manager:
     class: Drupal\Console\Extension\Manager
-    arguments: ['@console.site', '@http_client', '@app.root', '@extension.list.module', '@module_handler', '@theme_handler']
+    arguments: ['@console.site', '@http_client', '@app.root', '@module_handler', '@theme_handler']
   # Commands
   console.server:
     class: Drupal\Console\Command\ServerCommand