BUGFIX PPP-29340 Method that calculates categories with top packages has been changed

Author: Nikita Rybalov

src/plib/library/Extension/Catalog.php

@@ -20,6 +20,7 @@ class Catalog
     const TYPE_PACKAGES = 'packages';
     const TYPE_CATEGORIES = 'categories';
     const GOD_EXTENSIONS = ['catalog'];
+    const TOP_PACKAGES_AMOUNT = 3;
 
     /** @var self */
     private static $_instance;
@@ -81,24 +82,47 @@ public function getDetails($uuid)
     {
         $packages = $this->getFetcher()->getPackages(self::TYPE_PACKAGES, "/{$uuid}");
 
-        return reset($packages);
+        return is_array($packages) && count($packages) ? reset($packages) : [];
     }
 
     /**
      * @return array
      */
     public function getCategories()
     {
+        $packages = $this->getAvailable();
+
+        $topPackages = [];
+        foreach ($packages as $package) {
+            foreach ($package['categories'] as $category) {
+                if (array_key_exists($category->code, $topPackages)
+                    && count($topPackages[$category->code]) >= self::TOP_PACKAGES_AMOUNT
+                ) {
+                    continue;
+                }
+                $topPackages[$category->code][] = (object) [
+                    'uuid' => $package['uuid'],
+                    'code' => $package['code'],
+                    'name' => $package['name'],
+                    'icon' => $package['icons']['64x64'],
+                ];
+            }
+        }
+
         $version = \pm_ProductInfo::getVersion();
-        $categories = $this->getFetcher()->getFeedContent(self::TYPE_CATEGORIES, "?with-top-packages&version={$version}");
+        $categories = $this->getFetcher()->getFeedContent(self::TYPE_CATEGORIES, "?version={$version}");
         $categories = json_decode($categories);
         $categories = $categories ?: [];
 
-        foreach ($categories as $category) {
-            $category->top_packages = array_values(FilterHelper::filterBlacklisted($category->top_packages));
+        foreach ($categories as $key => $category) {
+            if (array_key_exists($category->code, $topPackages)) {
+                $category->top_packages = $topPackages[$category->code];
+            } else {
+                unset($categories[$key]);
+            }
         }
 
-        return $categories;
+        return array_values($categories);
     }
 
     /**
@@ -108,11 +132,11 @@ public function getCategories()
     public function getDetailsByCode($code)
     {
         $packages = $this->getFetcher()->getPackages(self::TYPE_PACKAGES);
-        $packagesByCode = array_filter($packages, function ($package) use ($code) {
+        $packages = array_filter($packages, function ($package) use ($code) {
             return $code === $package['code'];
         });
 
-        return reset($packagesByCode);
+        return is_array($packages) && count($packages) ? reset($packages) : [];
     }
 
     /**