Merge branch '1.2'

ezsystems · Jan 20, 2021 · dd0edc9 · dd0edc9
2 parents 0932b8e + d59089d
commit dd0edc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/EventListener/IndexRequestListener.php b/eZ/Bundle/EzPublishCoreBundle/EventListener/IndexRequestListener.php
@@ -49,7 +49,7 @@ public function onKernelRequestIndex(RequestEvent $event)
             if ($indexPage !== null) {
                 $indexPage = '/' . ltrim($indexPage, '/');
                 $request->attributes->set('semanticPathinfo', $indexPage);
-                $request->attributes->set('needsForward', true);
+                $request->attributes->set('needsRedirect', true);
             }
         }
     }

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/IndexRequestListenerTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/IndexRequestListenerTest.php
@@ -77,7 +77,7 @@ public function testOnKernelRequestIndexOnIndexPage($requestPath, $configuredInd
         $this->request->attributes->set('semanticPathinfo', $requestPath);
         $this->indexRequestEventListener->onKernelRequestIndex($this->event);
         $this->assertEquals($expectedIndexPath, $this->request->attributes->get('semanticPathinfo'));
-        $this->assertTrue($this->request->attributes->get('needsForward'));
+        $this->assertTrue($this->request->attributes->get('needsRedirect'));
     }
 
     public function indexPageProvider()
@@ -97,6 +97,6 @@ public function testOnKernelRequestIndexNotOnIndexPage()
     {
         $this->request->attributes->set('semanticPathinfo', '/anyContent');
         $this->indexRequestEventListener->onKernelRequestIndex($this->event);
-        $this->assertFalse($this->request->attributes->has('needsForward'));
+        $this->assertFalse($this->request->attributes->has('needsRedirect'));
     }
 }