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 8092dc6

Browse filesBrowse files
committed
removed the profiler.matcher configuration
1 parent 3e4f978 commit 8092dc6
Copy full SHA for 8092dc6

File tree

Expand file treeCollapse file tree

4 files changed

+1
-43
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+1
-43
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
-17Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -185,23 +185,6 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
185185
->booleanNode('only_exceptions')->defaultFalse()->end()
186186
->booleanNode('only_master_requests')->defaultFalse()->end()
187187
->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
188-
->arrayNode('matcher')
189-
->setDeprecated('The "profiler.matcher" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
190-
->canBeEnabled()
191-
->performNoDeepMerging()
192-
->fixXmlConfig('ip')
193-
->children()
194-
->scalarNode('path')
195-
->info('use the urldecoded format')
196-
->example('^/path to resource/')
197-
->end()
198-
->scalarNode('service')->end()
199-
->arrayNode('ips')
200-
->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
201-
->prototype('scalar')->end()
202-
->end()
203-
->end()
204-
->end()
205188
->end()
206189
->end()
207190
->end()

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-21Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -445,27 +445,6 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
445445

446446
$container->setParameter('profiler.storage.dsn', $config['dsn']);
447447

448-
if ($this->isConfigEnabled($container, $config['matcher'])) {
449-
if (isset($config['matcher']['service'])) {
450-
$container->setAlias('profiler.request_matcher', $config['matcher']['service'])->setPrivate(true);
451-
} elseif (isset($config['matcher']['ip']) || isset($config['matcher']['path']) || isset($config['matcher']['ips'])) {
452-
$definition = $container->register('profiler.request_matcher', 'Symfony\\Component\\HttpFoundation\\RequestMatcher');
453-
$definition->setPublic(false);
454-
455-
if (isset($config['matcher']['ip'])) {
456-
$definition->addMethodCall('matchIp', array($config['matcher']['ip']));
457-
}
458-
459-
if (isset($config['matcher']['ips'])) {
460-
$definition->addMethodCall('matchIps', array($config['matcher']['ips']));
461-
}
462-
463-
if (isset($config['matcher']['path'])) {
464-
$definition->addMethodCall('matchPath', array($config['matcher']['path']));
465-
}
466-
}
467-
}
468-
469448
if (!$config['collect']) {
470449
$container->getDefinition('profiler')->addMethodCall('disable', array());
471450
}

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<tag name="kernel.event_subscriber" />
2222
<argument type="service" id="profiler" />
2323
<argument type="service" id="request_stack" />
24-
<argument type="service" id="profiler.request_matcher" on-invalid="null" />
24+
<argument>null</argument>
2525
<argument>%profiler_listener.only_exceptions%</argument>
2626
<argument>%profiler_listener.only_master_requests%</argument>
2727
</service>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,6 @@ protected static function getBundleDefaultConfig()
148148
'only_master_requests' => false,
149149
'dsn' => 'file:%kernel.cache_dir%/profiler',
150150
'collect' => true,
151-
'matcher' => array(
152-
'enabled' => false,
153-
'ips' => array(),
154-
),
155151
),
156152
'translator' => array(
157153
'enabled' => !class_exists(FullStack::class),

0 commit comments

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