Skip to content

Commit 1fb3168

Browse files
Merge branch '3.4' into 4.3
* 3.4: [Debug] fix ClassNotFoundFatalErrorHandler [Dotenv] Fixed infinite loop with missing quote followed by quoted value [TwigBridge] button_widget now has its title attr translated even if its label = null or false [PhpUnitBridge] When using phpenv + phpenv-composer plugin, composer executable is wrapped into a bash script [Security] Prevent canceled remember-me cookie from being accepted [FrameworkBundle][TranslationUpdateCommand] Do not output positive feedback on stderr
2 parents dbca0e9 + eb1ea84 commit 1fb3168

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

bin/simple-phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')
101101
|| ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
102102
|| ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`))
103-
? $PHP.' '.escapeshellarg($COMPOSER)
103+
? (file_get_contents($COMPOSER, null, 0, 18) === '#!/usr/bin/env php' ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang
104104
: 'composer';
105105

106106
$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml': ''));

0 commit comments

Comments
 (0)