Skip to content

Commit e43c8d4

Browse files
Merge branch '6.4' into 7.0
* 6.4: [Cache] Fix tests [Mailer] [MailPace] Fix undefined array key in errors response [DependencyInjection] Allow casting env var processors to cast null [VarDumper] Add named arguments coverage of VarDumper's function [SecurityBundle] Use LogicException instead of Definition::addError() [PhpUnitBridge] Disable deduplication of Doctrine deprecations [Cache] Fix DBAL deprecations [Messenger] Add deprecation message for the "messenger.listener.stop_worker_on_sigterm_signal_listener" service Fix broken symlink tests Windows PHP 7.4+ [SecurityBundle] Fix error message when using OIDC and web-token/jwt-core is not installed [Serializer] Fix discriminator map not working with `AbstractNormalizer::OBJECT_TO_POPULATE` add @throws to getPayload [FrameworkBundle] ease migration to symfony 6.3 [VarDumper] Use documentElement instead of body for JS flag Bump Symfony version to 6.3.1 Update VERSION for 6.3.0 Update CHANGELOG for 6.3.0 [Serializer] Fix discriminator map not working with `AbstractNormalizer::OBJECT_TO_POPULATE`
2 parents f0d0de1 + 02b5def commit e43c8d4

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

bin/simple-phpunit.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@
256256
if ('\\' === \DIRECTORY_SEPARATOR) {
257257
file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1 ".'"options": {"symlink": false},', file_get_contents('composer.json')));
258258
}
259+
$phpunitBridgeComposerJson = file_get_contents($path.'/composer.json');
260+
file_put_contents($path.'/composer.json', preg_replace('/^( {8})"files": .*/m', '', $phpunitBridgeComposerJson));
259261
} else {
260262
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
261263
}
@@ -265,6 +267,9 @@
265267
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
266268
$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
267269
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
270+
if (file_exists($path)) {
271+
file_put_contents($path.'/composer.json', $phpunitBridgeComposerJson);
272+
}
268273
if ($prevCacheDir) {
269274
putenv("COMPOSER_CACHE_DIR=$prevCacheDir");
270275
}

bootstrap.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
*/
1111

1212
use Doctrine\Common\Annotations\AnnotationRegistry;
13+
use Doctrine\Deprecations\Deprecation;
1314
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
1415

1516
// Detect if we need to serialize deprecations to a file.
16-
if ($file = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
17+
if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true) && $file = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
1718
DeprecationErrorHandler::collectDeprecations($file);
1819

1920
return;
@@ -27,6 +28,10 @@
2728
// Enforce a consistent locale
2829
setlocale(\LC_ALL, 'C');
2930

31+
if (class_exists(Deprecation::class)) {
32+
Deprecation::withoutDeduplication();
33+
}
34+
3035
if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
3136
if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
3237
AnnotationRegistry::registerUniqueLoader('class_exists');

0 commit comments

Comments
 (0)