Merge remote-tracking branch 'origin/imported-magento-magento2-32326' into 2.4-develop-pr134

Author: zakdma

lib/internal/Magento/Framework/App/FrontController.php

@@ -184,6 +184,10 @@ private function processRequest(
 
         //Validating a request only once.
         if (!$this->validatedRequest) {
+            $area = $this->areaList->getArea($this->appState->getAreaCode());
+            $area->load(Area::PART_DESIGN);
+            $area->load(Area::PART_TRANSLATE);
+
             try {
                 $this->requestValidator->validate($request, $actionInstance);
             } catch (InvalidRequestException $exception) {
@@ -193,9 +197,6 @@ private function processRequest(
                     ["exception" => $exception]
                 );
                 $result = $exception->getReplaceResult();
-                $area = $this->areaList->getArea($this->appState->getAreaCode());
-                $area->load(Area::PART_DESIGN);
-                $area->load(Area::PART_TRANSLATE);
                 if ($messages = $exception->getMessages()) {
                     foreach ($messages as $message) {
                         $this->messages->addErrorMessage($message);

lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php

@@ -226,7 +226,10 @@ public function testDispatched()
         $this->routerList->expects($this->any())
             ->method('current')
             ->willReturn($this->router);
-
+        $this->appStateMock->expects($this->any())->method('getAreaCode')->willReturn('frontend');
+        $this->areaMock->expects($this->at(0))->method('load')->with(Area::PART_DESIGN)->willReturnSelf();
+        $this->areaMock->expects($this->at(1))->method('load')->with(Area::PART_TRANSLATE)->willReturnSelf();
+        $this->areaListMock->expects($this->any())->method('getArea')->willReturn($this->areaMock);
         $this->request->expects($this->at(0))->method('isDispatched')->willReturn(false);
         $this->request->expects($this->at(1))->method('setDispatched')->with(true);
         $this->request->expects($this->at(2))->method('isDispatched')->willReturn(true);
@@ -261,6 +264,10 @@ public function testDispatchedNotFoundException()
             ->method('current')
             ->willReturn($this->router);
 
+        $this->appStateMock->expects($this->any())->method('getAreaCode')->willReturn('frontend');
+        $this->areaMock->expects($this->at(0))->method('load')->with(Area::PART_DESIGN)->willReturnSelf();
+        $this->areaMock->expects($this->at(1))->method('load')->with(Area::PART_TRANSLATE)->willReturnSelf();
+        $this->areaListMock->expects($this->any())->method('getArea')->willReturn($this->areaMock);
         $this->request->expects($this->at(0))->method('isDispatched')->willReturn(false);
         $this->request->expects($this->at(1))->method('initForward');
         $this->request->expects($this->at(2))->method('setActionName')->with('noroute');