Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit fbab9a7

Browse filesBrowse files
restore call to addGlobalIgnoredName
1 parent 27e6eb4 commit fbab9a7
Copy full SHA for fbab9a7

File tree

2 files changed

+16
-7
lines changed
Filter options

2 files changed

+16
-7
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+15-6Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,11 +1631,14 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
16311631

16321632
$loader->load('annotations.php');
16331633

1634+
// registerUniqueLoader only exists in doctrine/annotations ^1.6
16341635
if (!method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
1636+
// registerLoader only exists in doctrine/annotations ^1.0
16351637
if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
16361638
$container->getDefinition('annotations.dummy_registry')
16371639
->setMethodCalls([['registerLoader', ['class_exists']]]);
16381640
} else {
1641+
// remove the dummy registry when doctrine/annotations ^2.0 is used
16391642
$container->removeDefinition('annotations.dummy_registry');
16401643
}
16411644
}
@@ -2687,12 +2690,18 @@ private function resolveTrustedHeaders(array $headers): int
26872690

26882691
foreach ($headers as $h) {
26892692
switch ($h) {
2690-
case 'forwarded': $trustedHeaders |= Request::HEADER_FORWARDED; break;
2691-
case 'x-forwarded-for': $trustedHeaders |= Request::HEADER_X_FORWARDED_FOR; break;
2692-
case 'x-forwarded-host': $trustedHeaders |= Request::HEADER_X_FORWARDED_HOST; break;
2693-
case 'x-forwarded-proto': $trustedHeaders |= Request::HEADER_X_FORWARDED_PROTO; break;
2694-
case 'x-forwarded-port': $trustedHeaders |= Request::HEADER_X_FORWARDED_PORT; break;
2695-
case 'x-forwarded-prefix': $trustedHeaders |= Request::HEADER_X_FORWARDED_PREFIX; break;
2693+
case 'forwarded': $trustedHeaders |= Request::HEADER_FORWARDED;
2694+
break;
2695+
case 'x-forwarded-for': $trustedHeaders |= Request::HEADER_X_FORWARDED_FOR;
2696+
break;
2697+
case 'x-forwarded-host': $trustedHeaders |= Request::HEADER_X_FORWARDED_HOST;
2698+
break;
2699+
case 'x-forwarded-proto': $trustedHeaders |= Request::HEADER_X_FORWARDED_PROTO;
2700+
break;
2701+
case 'x-forwarded-port': $trustedHeaders |= Request::HEADER_X_FORWARDED_PORT;
2702+
break;
2703+
case 'x-forwarded-prefix': $trustedHeaders |= Request::HEADER_X_FORWARDED_PREFIX;
2704+
break;
26962705
}
26972706
}
26982707

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
->set('annotations.reader', AnnotationReader::class)
2727
->call('addGlobalIgnoredName', [
2828
'required',
29-
service('annotations.dummy_registry')->ignoreOnInvalid(), // dummy arg to register class_exists as annotation loader only when required
29+
service('annotations.dummy_registry')->nullOnInvalid(), // dummy arg to register class_exists as annotation loader only when required
3030
])
3131

3232
->set('annotations.dummy_registry', AnnotationRegistry::class)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.