Fixes after CR

OXID-eSales · Jan 9, 2025 · 040d5f8 · 040d5f8
1 parent ad26582
commit 040d5f8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/source/Core/Routing/ControllerClassNameResolver.php b/source/Core/Routing/ControllerClassNameResolver.php
@@ -58,8 +58,9 @@ public function getClassNameById($classId)
     public function getIdByClassName($className)
     {
         $controllers = ContainerFacade::getParameter('oxid.controllers_map');
-        if (in_array($className, $controllers)) {
-            return array_search($className, $controllers, true);
+        $classId = array_search($className, $controllers, true);
+        if ($classId) {
+            return $classId;
         }
 
         $classId = $this->getClassIdFromShopMap($className);

diff --git a/source/Core/ShopControl.php b/source/Core/ShopControl.php
@@ -342,20 +342,22 @@ protected function initializeViewObject($class, $function, $parameters = null, $
         $classKey = Registry::getControllerClassNameResolver()->getIdByClassName($class);
         $classKey = !is_null($classKey) ? $classKey : $class; //fallback
 
-        /** @var FrontendController $view */
-        $view = ContainerFacade::has($class) ? ContainerFacade::get($class) : oxNew($class);
+        /** @var ControllerInterface $controller */
+        $controller = $this->isServiceController($classKey, $class)
+            ? ContainerFacade::get($class)
+            : oxNew($class);
 
-        $view->setClassKey($classKey);
-        $view->setFncName($function);
-        $view->setViewParameters($parameters);
+        $controller->setClassKey($classKey);
+        $controller->setFncName($function);
+        $controller->setViewParameters($parameters);
 
-        Registry::getConfig()->setActiveView($view);
+        Registry::getConfig()->setActiveView($controller);
 
-        $this->onViewCreation($view);
+        $this->onViewCreation($controller);
 
-        $view->init();
+        $controller->init();
 
-        return $view;
+        return $controller;
     }
 
     /**
@@ -889,4 +891,9 @@ private function passSessionErrorsToViewData(ControllerInterface $view, array $v
         }
         return $viewData;
     }
+
+    private function isServiceController(string $classKey, string $class): bool
+    {
+        return isset(ContainerFacade::getParameter('oxid.controllers_map')[$classKey]) && ContainerFacade::has($class);
+    }
 }
diff --git a/source/Internal/Framework/Controller/ControllerInterface.php b/source/Internal/Framework/Controller/ControllerInterface.php
@@ -5,8 +5,6 @@
  * See LICENSE file for license details.
  */
 
-declare(strict_types=1);
-
 namespace OxidEsales\EshopCommunity\Internal\Framework\Controller;
 
 interface ControllerInterface
@@ -35,7 +33,12 @@ public function getViewData();
 
     public function getViewId();
 
-    public function getCharSet();
-
     public function getIsCallForCache();
+
+    /*
+     * @deprecated
+     *
+     * Added only for BC and will be removed in the next major with 'charset' language string.
+     */
+    public function getCharSet();
 }