Issue #3000671 by axel.rutz, surbz, msankhala, goodboy, dawehner: Frontpage...

Issue #3000671 by axel.rutz, surbz, msankhala, goodboy, dawehner: Frontpage with query parameter results in "Page not found"

core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php

@@ -42,6 +42,16 @@ public function processInbound($path, Request $request) {
         // might be broken so stop execution.
         throw new NotFoundHttpException();
       }
+      $components = parse_url($path);
+      // Remove query string and fragment.
+      $path = $components['path'];
+      // Merge query parameters from front page configuration value
+      // with URL query, so that actual URL takes precedence.
+      if (!empty($components['query'])) {
+        parse_str($components['query'], $parameters);
+        array_replace($parameters, $request->query->all());
+        $request->query->replace($parameters);
+      }
     }
     return $path;
   }

core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorFrontTest.php

@@ -23,15 +23,17 @@ class PathProcessorFrontTest extends UnitTestCase {
    * @covers ::processInbound
    * @dataProvider providerProcessInbound
    */
-  public function testProcessInbound($path, $expected) {
+  public function testProcessInbound($frontpage_path, $path, $expected, array $expected_query = []) {
     $config_factory = $this->prophesize(ConfigFactoryInterface::class);
     $config = $this->prophesize(ImmutableConfig::class);
     $config_factory->get('system.site')
       ->willReturn($config->reveal());
     $config->get('page.front')
-      ->willReturn('/node');
+      ->willReturn($frontpage_path);
     $processor = new PathProcessorFront($config_factory->reveal());
-    $this->assertEquals($expected, $processor->processInbound($path, new Request()));
+    $request = new Request();
+    $this->assertEquals($expected, $processor->processInbound($path, $request));
+    $this->assertEquals($expected_query, $request->query->all());
   }
 
   /**
@@ -39,8 +41,13 @@ public function testProcessInbound($path, $expected) {
    */
   public function providerProcessInbound() {
     return [
-      ['/', '/node'],
-      ['/user', '/user'],
+      'accessing frontpage' => ['/node', '/', '/node'],
+      'accessing non frontpage' => ['/node', '/user', '/user'],
+      'accessing frontpage with query parameters' => ['/node?example=muh',
+        '/',
+        '/node',
+        ['example' => 'muh'],
+      ],
     ];
   }