diff --git a/README.md b/README.md index 3e1b7815d..691fda8dd 100644 --- a/README.md +++ b/README.md @@ -62,5 +62,3 @@ Acknowledgments - This project's Solver started out as a PHP port of openSUSE's [Libzypp satsolver](https://en.opensuse.org/openSUSE:Libzypp_satsolver). -- This project uses hiddeninput.exe to prompt for passwords on windows, sources - and details can be found on the [github page of the project](https://github.com/Seldaek/hidden-input). diff --git a/composer.json b/composer.json index 60c85711e..7cecf7cae 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,6 @@ "symfony/process": "^2.7 || ^3.0 || ^4.0", "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", "seld/phar-utils": "^1.0", - "seld/cli-prompt": "^1.0", "psr/log": "^1.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 4b7e927d9..5cf0feae0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c6378672910186460447c90de26a6c03", + "content-hash": "2dc8cdba11ff8ac7c8fd9a3767af326b", "packages": [ { "name": "composer/ca-bundle", @@ -342,54 +342,6 @@ ], "time": "2016-10-10T12:19:37+00:00" }, - { - "name": "seld/cli-prompt", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/cli-prompt.git", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Seld\\CliPrompt\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", - "keywords": [ - "cli", - "console", - "hidden", - "input", - "prompt" - ], - "time": "2017-03-18T11:32:45+00:00" - }, { "name": "seld/jsonlint", "version": "1.7.1", diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php index 3fdbcd867..4064b20b5 100644 --- a/src/Composer/Compiler.php +++ b/src/Composer/Compiler.php @@ -105,7 +105,7 @@ class Compiler foreach ($finder as $file) { $this->addFile($phar, $file, false); } - $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../vendor/seld/cli-prompt/res/hiddeninput.exe'), false); + $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../vendor/symfony/console/Resources/bin/hiddeninput.exe'), false); $finder = new Finder(); $finder->files() @@ -117,7 +117,6 @@ class Compiler ->exclude('docs') ->in(__DIR__.'/../../vendor/symfony/') ->in(__DIR__.'/../../vendor/seld/jsonlint/') - ->in(__DIR__.'/../../vendor/seld/cli-prompt/') ->in(__DIR__.'/../../vendor/justinrainbow/json-schema/') ->in(__DIR__.'/../../vendor/composer/spdx-licenses/') ->in(__DIR__.'/../../vendor/composer/semver/') diff --git a/src/Composer/IO/ConsoleIO.php b/src/Composer/IO/ConsoleIO.php index 55c80e29c..c0f235659 100644 --- a/src/Composer/IO/ConsoleIO.php +++ b/src/Composer/IO/ConsoleIO.php @@ -272,9 +272,12 @@ class ConsoleIO extends BaseIO */ public function askAndHideAnswer($question) { - $this->writeError($question, false); + /** @var \Symfony\Component\Console\Helper\QuestionHelper $helper */ + $helper = $this->helperSet->get('question'); + $question = new Question($question); + $question->setHidden(true); - return \Seld\CliPrompt\CliPrompt::hiddenPrompt(true); + return $helper->ask($this->input, $this->getErrorOutput(), $question); } /**