Преглед на файлове

Respect current PHP version when figuring out requirements for init command, fixes #7257

Jordi Boggiano преди 7 години
родител
ревизия
5460e5d86f
променени са 1 файла, в които са добавени 7 реда и са изтрити 2 реда
  1. 7 2
      src/Composer/Command/InitCommand.php

+ 7 - 2
src/Composer/Command/InitCommand.php

@@ -319,11 +319,16 @@ EOT
 
         $io->writeError(array('', 'Define your dependencies.', ''));
 
+        // prepare to resolve dependencies
+        $repos = $this->getRepos();
+        $preferredStability = $minimumStability ?: 'stable';
+        $phpVersion = $repos->findPackage('php', '*')->getPrettyVersion();
+
         $question = 'Would you like to define your dependencies (require) interactively [<comment>yes</comment>]? ';
         $require = $input->getOption('require');
         $requirements = array();
         if ($require || $io->askConfirmation($question, true)) {
-            $requirements = $this->determineRequirements($input, $output, $require);
+            $requirements = $this->determineRequirements($input, $output, $require, $phpVersion, $preferredStability);
         }
         $input->setOption('require', $requirements);
 
@@ -331,7 +336,7 @@ EOT
         $requireDev = $input->getOption('require-dev');
         $devRequirements = array();
         if ($requireDev || $io->askConfirmation($question, true)) {
-            $devRequirements = $this->determineRequirements($input, $output, $requireDev);
+            $devRequirements = $this->determineRequirements($input, $output, $requireDev, $phpVersion, $preferredStability);
         }
         $input->setOption('require-dev', $devRequirements);
     }