Skip to content

Commit 5e5d3b3

Browse files
Merge branch '3.4' into 4.0
* 3.4: [HttpKernel] Fix restoring trusted proxies in tests Update UPGRADE-4.0.md CODEOWNERS: some more rules removed unneeded comments in tests removed unneeded comments in tests Change PHPDoc in ResponseHeaderBag::getCookies() to help IDEs [HttpKernel] fix registering IDE links [HttpKernel] Set first trusted proxy as REMOTE_ADDR in InlineFragmentRenderer. [Process] Consider \"executable\" suffixes first on Windows Triggering RememberMe's loginFail() when token cannot be created [Serializer] Fix serializer tries to denormalize null values on nullable properties [FrameworkBundle] Change priority of AddConsoleCommandPass to TYPE_BEFORE_REMOVING
2 parents c0e2496 + e73ed7b commit 5e5d3b3

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

FrameworkBundle.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ class FrameworkBundle extends Bundle
6161
{
6262
public function boot()
6363
{
64-
if (!ini_get('xdebug.file_link_format') && !get_cfg_var('xdebug.file_link_format')) {
65-
ini_set('xdebug.file_link_format', $this->container->getParameter('debug.file_link_format'));
66-
}
6764
ErrorHandler::register(null, false)->throwAt($this->container->getParameter('debug.error_handler.throw_at'), true);
6865

6966
if ($this->container->getParameter('kernel.http_method_override')) {
@@ -99,7 +96,7 @@ public function build(ContainerBuilder $container)
9996
$this->addCompilerPassIfExists($container, AddConstraintValidatorsPass::class, PassConfig::TYPE_BEFORE_REMOVING);
10097
$container->addCompilerPass(new AddAnnotationsCachedReaderPass(), PassConfig::TYPE_AFTER_REMOVING, -255);
10198
$this->addCompilerPassIfExists($container, AddValidatorInitializersPass::class);
102-
$this->addCompilerPassIfExists($container, AddConsoleCommandPass::class);
99+
$this->addCompilerPassIfExists($container, AddConsoleCommandPass::class, PassConfig::TYPE_BEFORE_REMOVING);
103100
$this->addCompilerPassIfExists($container, TranslatorPass::class);
104101
$container->addCompilerPass(new LoggingTranslatorPass());
105102
$container->addCompilerPass(new AddExpressionLanguageProvidersPass());

Resources/config/web.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<argument type="service" id="logger" on-invalid="null" />
7575
<argument>%kernel.debug%</argument>
7676
<argument>%kernel.charset%</argument>
77+
<argument>%debug.file_link_format%</argument>
7778
</service>
7879

7980
<service id="validate_request_listener" class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">

0 commit comments

Comments
 (0)