refactor shop collector

Application/Models/Collectors/OxidShopCollector.php

@@ -20,28 +20,21 @@ use DebugBar\DataCollector\DataCollector;
 use DebugBar\DataCollector\Renderable;
 use Exception;
 use OxidEsales\Eshop\Core\Config;
-use OxidEsales\Eshop\Core\Module\Module;
 use OxidEsales\Eshop\Core\ShopVersion;
 use OxidEsales\Eshop\Core\Theme;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationDaoBridge;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 use OxidEsales\Facts\Facts;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 class OxidShopCollector extends DataCollector implements Renderable
 {
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var array  */
+    protected array $configVars = [];
-    protected $configVars = [];
-
-    /**
-     * @var bool
-     */
-    protected $useHtmlVarDumper = true;
 
     /**
      * @throws ContainerExceptionInterface
@@ -57,11 +50,11 @@ class OxidShopCollector extends DataCollector implements Renderable
         $parentThemeId = $parent ? $parent->getId() : '--';
 
         $moduleList = $this->getInstalledModules();
+        $list = [];
         array_walk(
             $moduleList,
-            function (Module &$module) {
+            function (ModuleConfiguration $module) use (&$list) {
-                $str = trim(strip_tags($module->getTitle())).' - '.$module->getInfo('version').' ';
+                $list[] = trim(strip_tags(current($module->getTitle()))).' - '.$module->getVersion();
-                $module = $str;
             }
         );
 
@@ -71,8 +64,10 @@ class OxidShopCollector extends DataCollector implements Renderable
             'CE Version:' => InstalledVersions::getVersion('oxid-esales/oxideshop-ce'),
             'Theme:' => $theme->getActiveThemeId(),
             'Parent Theme:' => $parentThemeId,
-            'Modules:'  => implode(chr(10), $moduleList),
+            'Modules:'  => $list,
         ];
+
+        $this->useHtmlVarDumper(false);
     }
 
     /**
@@ -103,17 +98,6 @@ class OxidShopCollector extends DataCollector implements Renderable
         return ['vars' => $data, 'count' => count($data)];
     }
 
-    /**
-     * Indicates whether the Symfony HtmlDumper will be used to dump variables for rich variable
-     * rendering.
-     *
-     * @return bool
-     */
-    public function isHtmlVarDumperUsed(): bool
-    {
-        return $this->useHtmlVarDumper;
-    }
-
     /**
      * @return array
      */
@@ -133,7 +117,7 @@ class OxidShopCollector extends DataCollector implements Renderable
     }
 
     /**
-     * @return array
+     * @return ModuleConfiguration[]
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
@@ -147,13 +131,13 @@ class OxidShopCollector extends DataCollector implements Renderable
         $modules = [];
 
         foreach ($shopConfiguration->getModuleConfigurations() as $moduleConfiguration) {
-            $module = oxNew(Module::class);
+            $modules[] = $moduleConfiguration;
-            $module->load($moduleConfiguration->getId());
-            $modules[] = $module;
         }
 
+        /** @var $a ModuleConfiguration */
+        /** @var $b ModuleConfiguration */
         usort($modules, function ($a, $b) {
-            return strcmp($a->getTitle(), $b->getTitle());
+            return strcmp(current($a->getTitle()), current($b->getTitle()));
         });
 
         return $modules;