Security update for Core, with self-updated composer

[yaffs-website] / vendor / drupal / console / src / Command / Module / UninstallCommand.php

diff --git a/vendor/drupal/console/src/Command/Module/UninstallCommand.php b/vendor/drupal/console/src/Command/Module/UninstallCommand.php
index 6b8bfae378cefc1e46d13afc388b1c772c74b397..5fc466bcfc743cd53b866f28c11631479e703f93 100755 (executable)
--- a/vendor/drupal/console/src/Command/Module/UninstallCommand.php
+++ b/vendor/drupal/console/src/Command/Module/UninstallCommand.php
@@ -7,23 +7,20 @@
 
 namespace Drupal\Console\Command\Module;
 
-use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Extension\Manager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Command\Shared\ProjectDownloadTrait;
-use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Console\Utils\Site;
-use Drupal\Core\ProxyClass\Extension\ModuleInstaller;
+use Drupal\Core\Extension\ModuleInstallerInterface;
 use Drupal\Console\Core\Utils\ChainQueue;
-use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Config\ConfigFactoryInterface;
 
 class UninstallCommand extends Command
 {
-    use CommandTrait;
     use ProjectDownloadTrait;
 
     /**
@@ -62,9 +59,9 @@ class UninstallCommand extends Command
      */
     public function __construct(
         Site $site,
-        ModuleInstaller $moduleInstaller,
+        ModuleInstallerInterface $moduleInstaller,
         ChainQueue $chainQueue,
-        ConfigFactory $configFactory,
+        ConfigFactoryInterface $configFactory,
         Manager $extensionManager
     ) {
         $this->site = $site;
@@ -99,18 +96,18 @@ class UninstallCommand extends Command
                 null,
                 InputOption::VALUE_NONE,
                 $this->trans('commands.module.uninstall.options.composer')
-            );
+            )
+            ->setAliases(['mou']);
     }
     /**
      * {@inheritdoc}
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
         $module = $input->getArgument('module');
 
         if (!$module) {
-            $module = $this->modulesUninstallQuestion($io);
+            $module = $this->modulesUninstallQuestion();
             $input->setArgument('module', $module);
         }
     }
@@ -119,7 +116,6 @@ class UninstallCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $io =  new DrupalStyle($input, $output);
         $composer = $input->getOption('composer');
         $module = $input->getArgument('module');
 
@@ -141,7 +137,7 @@ class UninstallCommand extends Command
 
                 $shellProcess = $this->get('shell_process');
                 if ($shellProcess->exec($command)) {
-                    $io->success(
+                    $this->getIo()->success(
                         sprintf(
                             $this->trans('commands.module.uninstall.messages.composer-success'),
                             $moduleItem
@@ -152,7 +148,7 @@ class UninstallCommand extends Command
         }
 
         if ($missingModules = array_diff_key($moduleList, $moduleData)) {
-            $io->error(
+            $this->getIo()->error(
                 sprintf(
                     $this->trans('commands.module.uninstall.messages.missing'),
                     implode(', ', $module),
@@ -165,23 +161,34 @@ class UninstallCommand extends Command
 
         $installedModules = $coreExtension->get('module') ?: [];
         if (!$moduleList = array_intersect_key($moduleList, $installedModules)) {
-            $io->info($this->trans('commands.module.uninstall.messages.nothing'));
+            $this->getIo()->info($this->trans('commands.module.uninstall.messages.nothing'));
 
             return 0;
         }
 
         if (!$force = $input->getOption('force')) {
+
+            // Get a list of installed profiles that will be excluded when calculating
+            // the dependency tree.
+            if (\Drupal::hasService('profile_handler')) {
+                // #1356276 adds the profile_handler service but it hasn't been committed
+                // to core yet so we need to check if it exists.
+                $profiles = \Drupal::service('profile_handler')->getProfileInheritance();
+            } else {
+                $profiles[drupal_get_profile()] = [];
+            }
+
             $dependencies = [];
             while (list($module) = each($moduleList)) {
                 foreach (array_keys($moduleData[$module]->required_by) as $dependency) {
-                    if (isset($installedModules[$dependency]) && !isset($moduleList[$dependency]) && $dependency != $profile) {
+                    if (isset($installedModules[$dependency]) && !isset($moduleList[$dependency]) && (!array_key_exists($dependency, $profiles))) {
                         $dependencies[] = $dependency;
                     }
                 }
             }
 
             if (!empty($dependencies)) {
-                $io->error(
+                $this->getIo()->error(
                     sprintf(
                         $this->trans('commands.module.uninstall.messages.dependents'),
                         implode('", "', $moduleList),
@@ -196,14 +203,14 @@ class UninstallCommand extends Command
         try {
             $this->moduleInstaller->uninstall($moduleList);
 
-            $io->info(
+            $this->getIo()->info(
                 sprintf(
                     $this->trans('commands.module.uninstall.messages.success'),
                     implode(', ', $moduleList)
                 )
             );
 
-            $io->comment(
+            $this->getIo()->comment(
                 sprintf(
                     $this->trans('commands.module.uninstall.messages.composer-success'),
                     implode(', ', $moduleList),
@@ -211,7 +218,7 @@ class UninstallCommand extends Command
                 )
             );
         } catch (\Exception $e) {
-            $io->error($e->getMessage());
+            $this->getIo()->error($e->getMessage());
 
             return 1;
         }