Remove usage of drush pm:security as composer audit does the job

Metadrop · Oct 20, 2023 · 4951d06 · 4951d06
1 parent cd846b8
commit 4951d06
Showing 1 changed file with 4 additions and 32 deletions.
diff --git a/src/UpdaterCommand.php b/src/UpdaterCommand.php
@@ -270,16 +270,6 @@ protected function consolidateConfiguration() {
   protected function checkPackages() {
     if ($this->onlySecurity) {
       $packages_to_update = $this->runCommand(sprintf('composer audit --locked %s --format plain 2>&1 | grep ^Package | cut -f2 -d: | sort -u', $this->getNoDevParameter()))->getOutput();
-
-      try {
-        $drupal_security_packages = $this->runCommand('./vendor/bin/drush pm:security --fields=name --format=list 2>/dev/null')
-          ->getOutput();
-      }
-      catch (ProcessFailedException $e) {
-        $drupal_security_packages = $e->getProcess()->getOutput();
-      }
-
-      $packages_to_update = sprintf("%s\n%s", $packages_to_update, $drupal_security_packages);
     }
     else {
       $packages_to_update = $this->runCommand(sprintf('composer show --locked --direct --name-only %s 2>/dev/null', $this->getNoDevParameter()))
@@ -439,21 +429,11 @@ protected function handlePackageUpdateErrors(\Exception $e) {
   protected function showPendingUpdates() {
 
     if ($this->onlySecurity) {
-      $this->printHeader2('Not Updated Securities (Packagist):');
+      $this->printHeader2('Not Updated Securities:');
       $this->output->writeln(
         $this->runCommand('composer audit --locked --format plain 2>&1 | grep ^Package | cut -f2 -d: | sort -u')->getOutput(),
       );
 
-      $this->printHeader2('Not Updated Securities (Drupal):');
-      try {
-        $this->output->writeln(
-          $this->runCommand('./vendor/bin/drush pm:security --fields=name --format=list 2>/dev/null')->getOutput(),
-        );
-      }
-      catch (ProcessFailedException $e) {
-        $this->output->writeln($e->getProcess()->getErrorOutput());
-      }
-
     }
     else {
       $this->printHeader2('Not Updated Packages (Direct):');
@@ -469,17 +449,9 @@ protected function showPendingUpdates() {
 
       $this->output->writeln('');
       $this->printHeader2('Not Updated Securities (ALL):');
-      $composer_audit_securities = trim($this->runCommand('composer audit --locked --format plain 2>&1 | grep ^Package | cut -f2 -d: | sort -u')->getOutput());
-
-      try {
-        $drupal_securities = trim($this->runCommand('./vendor/bin/drush pm:security --fields=name --format=list 2>/dev/null')->getOutput());
-      }
-      catch (ProcessFailedException $e) {
-        $drupal_securities = trim($e->getProcess()->getOutput());
-      }
-
-      $securities = implode("\n", array_unique(explode("\n", $drupal_securities)));
-      $this->output->writeln($securities);
+      $this->output->writeln(
+        trim($this->runCommand('composer audit --locked --format plain 2>&1 | grep ^Package | cut -f2 -d: | sort -u')->getOutput())
+      );
       $this->output->writeln("");
     }
   }