feature #24159 Remove the profiler.matcher configuration (fabpot)

fabpot · fabpot · commit ebe8fc632b4c · 2017-09-14T21:52:07.000-07:00
This PR was squashed before being merged into the 4.0-dev branch (closes #24159). Discussion ---------- Remove the profiler.matcher configuration | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | to be done I've not removed (nor deprecated) the `ProfilerListener` constructor argument that allows to set a request matcher. That way, if someone really want to do that, it's still possible. WDTY? Commits ------- 5b77d99 fixed CS 8092dc6 removed the profiler.matcher configuration
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -185,23 +185,6 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
                         ->booleanNode('only_exceptions')->defaultFalse()->end()
                         ->booleanNode('only_master_requests')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
-                        ->arrayNode('matcher')
-                            ->setDeprecated('The "profiler.matcher" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
-                            ->canBeEnabled()
-                            ->performNoDeepMerging()
-                            ->fixXmlConfig('ip')
-                            ->children()
-                                ->scalarNode('path')
-                                    ->info('use the urldecoded format')
-                                    ->example('^/path to resource/')
-                                ->end()
-                                ->scalarNode('service')->end()
-                                ->arrayNode('ips')
-                                    ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
-                                    ->prototype('scalar')->end()
-                                ->end()
-                            ->end()
-                        ->end()
                     ->end()
                 ->end()
             ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -445,27 +445,6 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
 
         $container->setParameter('profiler.storage.dsn', $config['dsn']);
 
-        if ($this->isConfigEnabled($container, $config['matcher'])) {
-            if (isset($config['matcher']['service'])) {
-                $container->setAlias('profiler.request_matcher', $config['matcher']['service'])->setPrivate(true);
-            } elseif (isset($config['matcher']['ip']) || isset($config['matcher']['path']) || isset($config['matcher']['ips'])) {
-                $definition = $container->register('profiler.request_matcher', 'Symfony\\Component\\HttpFoundation\\RequestMatcher');
-                $definition->setPublic(false);
-
-                if (isset($config['matcher']['ip'])) {
-                    $definition->addMethodCall('matchIp', array($config['matcher']['ip']));
-                }
-
-                if (isset($config['matcher']['ips'])) {
-                    $definition->addMethodCall('matchIps', array($config['matcher']['ips']));
-                }
-
-                if (isset($config['matcher']['path'])) {
-                    $definition->addMethodCall('matchPath', array($config['matcher']['path']));
-                }
-            }
-        }
-
         if (!$config['collect']) {
             $container->getDefinition('profiler')->addMethodCall('disable', array());
         }
@@ -501,9 +480,9 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
             $transitions = array();
             foreach ($workflow['transitions'] as $transition) {
-                if ($type === 'workflow') {
+                if ('workflow' === $type) {
                     $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $transition['from'], $transition['to']));
-                } elseif ($type === 'state_machine') {
+                } elseif ('state_machine' === $type) {
                     foreach ($transition['from'] as $from) {
                         foreach ($transition['to'] as $to) {
                             $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $from, $to));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -21,7 +21,7 @@
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="profiler" />
             <argument type="service" id="request_stack" />
-            <argument type="service" id="profiler.request_matcher" on-invalid="null" />
+            <argument>null</argument>
             <argument>%profiler_listener.only_exceptions%</argument>
             <argument>%profiler_listener.only_master_requests%</argument>
         </service>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -148,10 +148,6 @@ protected static function getBundleDefaultConfig()
                 'only_master_requests' => false,
                 'dsn' => 'file:%kernel.cache_dir%/profiler',
                 'collect' => true,
-                'matcher' => array(
-                    'enabled' => false,
-                    'ips' => array(),
-                ),
             ),
             'translator' => array(
                 'enabled' => !class_exists(FullStack::class),
