Skip to content

Commit 4285104

Browse files
committed
Merge branch '2.2'
* 2.2: (70 commits) change wrapped exception message to be more usefull updated VERSION for 2.0.23 update CONTRIBUTORS for 2.0.23 updated CHANGELOG for 2.0.23 [Form] fixed failing test [DomCrawler] added support for query string with slash Fixed invalid file path for hiddeninput.exe on Windows. fix xsd definition for strict-requirements [WebProfilerBundle] Fixed the toolbar styles to apply them in IE8 [ClassLoader] fixed heredocs handling fixed handling of heredocs Add a public modifier to an interface method removing xdebug extension [HttpRequest] fixes Request::getLanguages() bug [HttpCache] added a test (cached content should be kept after purging) [DoctrineBridge] Fixed non-utf-8 recognition [Security] fixed HttpUtils class tests replaced new occurences of 'Request::create()' with '::create()' changed sub-requests creation to '::create()' fixed merge issue ... Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig src/Symfony/Component/DomCrawler/Link.php src/Symfony/Component/Translation/Translator.php
2 parents aa28bbe + d146fc3 commit 4285104

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Helper/DialogHelper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,11 @@ public function askConfirmation(OutputInterface $output, $question, $default = t
230230
public function askHiddenResponse(OutputInterface $output, $question, $fallback = true)
231231
{
232232
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
233-
$exe = __DIR__ . '/../../Resources/bin/hiddeninput.exe';
233+
$exe = __DIR__ . '/../Resources/bin/hiddeninput.exe';
234234

235235
// handle code running from a phar
236236
if ('phar:' === substr(__FILE__, 0, 5)) {
237-
$tmpExe = sys_get_temp_dir() . '/../../Resources/bin/hiddeninput.exe';
237+
$tmpExe = sys_get_temp_dir() . '/hiddeninput.exe';
238238
copy($exe, $tmpExe);
239239
$exe = $tmpExe;
240240
}

0 commit comments

Comments
 (0)