Merge branch '2.6'

xerc · Jan 26, 2024 · d3aeb13 · d3aeb13
2 parents f402517 + 7048ff3
commit d3aeb13
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/Composer/Command/BaseCommand.php b/src/Composer/Command/BaseCommand.php
@@ -223,6 +223,15 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         // initialize a plugin-enabled Composer instance, either local or global
         $disablePlugins = $input->hasParameterOption('--no-plugins');
         $disableScripts = $input->hasParameterOption('--no-scripts');
+
+        $application = parent::getApplication();
+        if ($application instanceof Application && $application->getDisablePluginsByDefault()) {
+            $disablePlugins = true;
+        }
+        if ($application instanceof Application && $application->getDisableScriptsByDefault()) {
+            $disableScripts = true;
+        }
+
         if ($this instanceof SelfUpdateCommand) {
             $disablePlugins = true;
             $disableScripts = true;

diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php
@@ -659,6 +659,16 @@ public function getInitialWorkingDirectory()
         return $this->initialWorkingDirectory;
     }
 
+    public function getDisablePluginsByDefault(): bool
+    {
+        return $this->disablePluginsByDefault;
+    }
+
+    public function getDisableScriptsByDefault(): bool
+    {
+        return $this->disableScriptsByDefault;
+    }
+
     /**
      * @return 'prompt'|bool
      */