Refactor 12488-HTML-Sitemap-Improvements

Author: ihorvansach

Block/Additional/AbstractLinks.php

@@ -30,7 +30,7 @@ protected function getCollection()
             $i = 0;
             $pageSize = $this->getPageSize();
             $collection = [];
-            $links = $this->config->getAdditionalLinks() ?: [];
+            $links = $this->config->getAdditionalLinks();
             foreach ($links as $link) {
                 if (!empty($link['url'])) {
                     $collection[] = new DataObject([
@@ -44,7 +44,6 @@ protected function getCollection()
                 if ($i >= $pageSize) {
                     break;
                 }
-
             }
 
             $this->setData($k, $collection);

Model/Config.php

@@ -68,19 +68,20 @@ class Config
     private $serializer;
 
     /**
-     * @param SerializerInterface $serializer
      * @param ScopeConfigInterface $scopeConfig
      * @param ModuleListInterface|null $moduleList
+     * @param SerializerInterface|null $serializer
      */
     public function __construct(
-        SerializerInterface $serializer,
         ScopeConfigInterface $scopeConfig,
-        ModuleListInterface $moduleList = null
+        ModuleListInterface $moduleList = null,
+        SerializerInterface $serializer = null
     ) {
-        $this->serializer = $serializer;
         $this->scopeConfig = $scopeConfig;
         $this->moduleList = $moduleList ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(ModuleListInterface::class);
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(SerializerInterface::class);
     }
 
     /**
@@ -200,16 +201,12 @@ public function getBlockMaxDepth(string $type, $storeId = null): string
     public function getAdditionalLinks($storeId = null): array
     {
         $data = $this->getConfig('mfhs/additionallinks/links', $storeId);
-
-        $additionalLinks = [];
         if ($data) {
-            $values = $this->serializer->unserialize($data);
-            foreach ($values as $item) {
-                $additionalLinks[] = $item;
-            }
+            $additionalLinks = array_values($this->serializer->unserialize($data));
+        } else {
+            $additionalLinks = [];
         }
         return $additionalLinks;
-
     }
 
     /**