Skip to content

Commit 34dd6d3

Browse files
Merge branch '4.4'
* 4.4: [Bridge/PhpUnit] fix looking for composer cs fix [Mailer] fixed Mailgun support when a response is not JSON as expected [4.3] Cleanup tests Cleanup tests [Finder] Prevent unintentional file locks in Windows [FrameworkBundle] Fix about command not showing .env vars [DomCrawler] Fix FileFormField PHPDoc [Mailer] Remove the default dispatcher in AbstractTransport Fix #33395 PHP 5.3 compatibility
2 parents 04fdc2e + 0767d6d commit 34dd6d3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

DeprecationErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private function displayDeprecations($groups, $configuration)
307307
private static function getPhpUnitErrorHandler()
308308
{
309309
if (!isset(self::$isAtLeastPhpUnit83)) {
310-
self::$isAtLeastPhpUnit83 = class_exists(ErrorHandler::class) && method_exists(ErrorHandler::class, '__invoke');
310+
self::$isAtLeastPhpUnit83 = class_exists('PHPUnit\Util\ErrorHandler') && method_exists('PHPUnit\Util\ErrorHandler', '__invoke');
311311
}
312312
if (!self::$isAtLeastPhpUnit83) {
313313
return 'PHPUnit\Util\ErrorHandler::handleError';

bin/simple-phpunit.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@
9696
}
9797
}
9898

99-
$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
99+
$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')
100+
|| ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
101+
|| ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`))
100102
? $PHP.' '.escapeshellarg($COMPOSER)
101103
: 'composer';
102104

103-
104105
$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml': ''));
105106
$configurationHash = md5(implode(PHP_EOL, array(md5_file(__FILE__), $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT)));
106107
$PHPUNIT_VERSION_DIR=sprintf('phpunit-%s-%d', $PHPUNIT_VERSION, $PHPUNIT_REMOVE_RETURN_TYPEHINT);

0 commit comments

Comments
 (0)