diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.7' into 2.8

Browse Source 
* 2.7:
  update phpunit-bridge cache-id
  respect optional error handler arguments
  [Intl] Fix bin/common.php PHP7 compatibility
This commit is contained in:
Nicolas Grekas 2017-05-21 11:46:38 +02:00
commit 7a792eb896
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpunit
View File

@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/2a45e94c3cde63d8cdfa729e51b80f85b1ab37f6
// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/29fa7b8196870591f35e1554dd69def482e01fb2
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";

2
src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
View File

@ -66,7 +66,7 @@ class DeprecationErrorHandler
'legacy' => array(),
'other' => array(),
);
$deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $getMode) {
$deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, $getMode) {
if (E_USER_DEPRECATED !== $type) {
return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
}

2
src/Symfony/Component/Intl/Resources/bin/common.php
View File

@ -68,7 +68,7 @@ function get_icu_version_from_genrb($genrb)
return $matches[1];
}
set_exception_handler(function (\Exception $exception) {
set_exception_handler(function (\Throwable $exception) {
echo "\n";
$cause = $exception;