Rename master request to main request

Author: derrabus

CHANGELOG.md

@@ -17,6 +17,7 @@ CHANGELOG
  * Add support to use a PSR-6 compatible cache for Doctrine annotations
  * Deprecate all other values than "none", "php_array" and "file" for `framework.annotation.cache`
  * Add `KernelTestCase::getContainer()` as the best way to get a container in tests
+ * Rename the container parameter `profiler_listener.only_master_requests` to `profiler_listener.only_main_requests`
 
 5.2.0
 -----

DependencyInjection/Configuration.php

@@ -304,7 +304,8 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
                     ->children()
                         ->booleanNode('collect')->defaultTrue()->end()
                         ->booleanNode('only_exceptions')->defaultFalse()->end()
-                        ->booleanNode('only_master_requests')->defaultFalse()->end()
+                        ->booleanNode('only_main_requests')->defaultFalse()->end()
+                        ->booleanNode('only_master_requests')->setDeprecated('symfony/framework-bundle', '5.3', 'Option "%node%" at "%path%" is deprecated, use "only_main_requests" instead.')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
                     ->end()
                 ->end()

DependencyInjection/FrameworkExtension.php

@@ -711,7 +711,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
         }
 
         $container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
-        $container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
+        $container->setParameter('profiler_listener.only_main_requests', $config['only_main_requests'] || $config['only_master_requests']);
 
         // Choose storage class based on the DSN
         [$class] = explode(':', $config['dsn'], 2);

HttpCache/HttpCache.php

@@ -63,7 +63,7 @@ public function __construct(KernelInterface $kernel, $cache = null, SurrogateInt
         parent::__construct($kernel, $this->createStore(), $this->createSurrogate(), array_merge($this->options, $this->getOptions()));
     }
 
-    public function handle(Request $request, int $type = HttpKernelInterface::MASTER_REQUEST, bool $catch = true)
+    public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $catch = true)
     {
         if ($this->kernel->getContainer()->getParameter('kernel.http_method_override')) {
             Request::enableHttpMethodParameterOverride();

Resources/config/profiling.php

@@ -31,7 +31,7 @@
                 service('request_stack'),
                 null,
                 param('profiler_listener.only_exceptions'),
-                param('profiler_listener.only_master_requests'),
+                param('profiler_listener.only_main_requests'),
             ])
             ->tag('kernel.event_subscriber')
     ;

Resources/config/schema/symfony-1.0.xsd

@@ -87,6 +87,7 @@
     <xsd:complexType name="profiler">
         <xsd:attribute name="collect" type="xsd:string" />
         <xsd:attribute name="only-exceptions" type="xsd:string" />
+        <xsd:attribute name="only-main-requests" type="xsd:string" />
         <xsd:attribute name="only-master-requests" type="xsd:string" />
         <xsd:attribute name="enabled" type="xsd:string" />
         <xsd:attribute name="dsn" type="xsd:string" />

Tests/DependencyInjection/ConfigurationTest.php

@@ -397,6 +397,7 @@ protected static function getBundleDefaultConfig()
                 'enabled' => false,
                 'only_exceptions' => false,
                 'only_master_requests' => false,
+                'only_main_requests' => false,
                 'dsn' => 'file:%kernel.cache_dir%/profiler',
                 'collect' => true,
             ],

Tests/Kernel/MicroKernelTraitTest.php

@@ -122,7 +122,7 @@ protected function configureRoutes(RoutingConfigurator $routes): void
         };
 
         $request = Request::create('/');
-        $response = $kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, false);
+        $response = $kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, false);
 
         $this->assertSame('Hello World!', $response->getContent());
     }
@@ -156,7 +156,7 @@ protected function configureContainer(ContainerConfigurator $c): void
         $this->expectExceptionMessage('"Symfony\Bundle\FrameworkBundle\Tests\Kernel\MinimalKernel@anonymous" uses "Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait", but does not implement the required method "protected function configureRoutes(RoutingConfigurator $routes): void".');
 
         $request = Request::create('/');
-        $kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, false);
+        $kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, false);
     }
 }
 

composer.json

@@ -25,7 +25,7 @@
         "symfony/event-dispatcher": "^5.1",
         "symfony/error-handler": "^4.4.1|^5.0.1",
         "symfony/http-foundation": "^5.3",
-        "symfony/http-kernel": "^5.2.1",
+        "symfony/http-kernel": "^5.3",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php80": "^1.15",
         "symfony/filesystem": "^4.4|^5.0",