Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 12:17:36 +02:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/feature/blueprints-update' into feature/blueprints-update

Browse Source
This commit is contained in:
Matias Griese
2016-03-03 20:52:21 +02:00
parent ed0d562a3e 76f9d85360
commit b58cce573a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system/src/Grav/Console/Gpm/InstallCommand.php
View File

@@ -169,7 +169,7 @@ class InstallCommand extends ConsoleCommand
try {
$this->installDependencies($dependencies, 'install', "The following dependencies need to be installed...");
$this->installDependencies($dependencies, 'update', "The following dependencies need to be updated...");
$this->installDependencies($dependencies, 'ignore', "The following dependencies can be updated as there is a newer version, but it's not mandatory...");
$this->installDependencies($dependencies, 'ignore', "The following dependencies can be updated as there is a newer version, but it's not mandatory...", false);
} catch (\Exception $e) {
$this->output->writeln("<red>Installation aborted</red>");
return false;
@@ -204,13 +204,14 @@ class InstallCommand extends ConsoleCommand
* shows $message prior to listing them to the user. Then asks the user a confirmation prior
* to installing them.
*
* @param array $dependencies The dependencies array
* @param string $type The type of dependency to show: install, update, ignore
* @param string $message A message to be shown prior to listing the dependencies
* @param array $dependencies The dependencies array
* @param string $type The type of dependency to show: install, update, ignore
* @param string $message A message to be shown prior to listing the dependencies
* @param bool $required A flag that determines if the installation is required or optional
*
* @throws \Exception
*/
public function installDependencies($dependencies, $type, $message) {
public function installDependencies($dependencies, $type, $message, $required = true) {
$packages = array_filter($dependencies, function ($action) use ($type) { return $action === $type; });
if (count($packages) > 0) {
$this->output->writeln($message);
@@ -226,11 +227,14 @@ class InstallCommand extends ConsoleCommand
if ($helper->ask($this->input, $this->output, $question)) {
foreach ($packages as $dependencyName => $dependencyVersion) {
$this->processPackage($dependencyName);
$package = $this->gpm->findPackage($dependencyName);
$this->processPackage($package);
}
$this->output->writeln('');
} else {
throw new \Exception();
if ($required) {
throw new \Exception();
}
}
}
}