Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/54'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Mar 21, 2018
2 parents 836b941 + d59ccbf commit 788b744
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 150 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 2.1.1 - TBD
## 2.1.1 - 2018-03-21

### Added

Expand All @@ -22,7 +22,8 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#54](https://github.com/zendframework/zend-component-installer/pull/54) fixes
issues when run with symfony/console v4 releases.

## 2.1.0 - 2018-02-08

Expand Down
5 changes: 2 additions & 3 deletions src/ComponentInstaller.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
use Zend\ComponentInstaller\Injector\AbstractInjector;
use Zend\ComponentInstaller\Injector\ConfigInjectorChain;
use Zend\ComponentInstaller\Injector\InjectorInterface;
use Zend\ComponentInstaller\Injector\NoopInjector;

/**
* If a package represents a component module, update the application configuration.
Expand Down Expand Up @@ -449,7 +448,7 @@ private function promptForConfigOption(
$ask[] = sprintf(' Make your selection (default is <comment>%d</comment>):', $default);

while (true) {
$answer = $this->io->ask($ask, $default);
$answer = $this->io->ask(implode($ask), $default);

if (is_numeric($answer) && isset($options[(int) $answer])) {
$injector = $options[(int) $answer]->getInjector();
Expand All @@ -474,7 +473,7 @@ private function promptToRememberOption(Injector\InjectorInterface $injector, $p
$ask = ["\n <question>Remember this option for other packages of the same type? (Y/n)</question>"];

while (true) {
$answer = strtolower($this->io->ask($ask, 'y'));
$answer = strtolower($this->io->ask(implode($ask), 'y'));

switch ($answer) {
case 'y':
Expand Down
Loading

0 comments on commit 788b744

Please sign in to comment.