Drop show order and sort by provider name instead

Author: BurntimeX

wcfsetup/install/files/lib/event/acp/search/provider/ProviderCollecting.class.php

@@ -20,15 +20,9 @@ final class ProviderCollecting implements IPsr14Event
      */
     private array $providers = [];
 
-    /**
-     * @var array<string, int>
-     */
-    private array $showOrders = [];
-
-    public function register(string $providerName, IACPSearchResultProvider $provider, int $showOrder = 0): void
+    public function register(string $providerName, IACPSearchResultProvider $provider): void
     {
         $this->providers[$providerName] = $provider;
-        $this->showOrders[$providerName] = $showOrder;
     }
 
     /**
@@ -38,9 +32,4 @@ public function getProviders(): array
     {
         return $this->providers;
     }
-
-    public function getShowOrder(string $providerName): int
-    {
-        return $this->showOrders[$providerName] ?? 0;
-    }
 }

wcfsetup/install/files/lib/system/event/listener/AcpSearchProviderCollectingListener.class.php

@@ -25,14 +25,14 @@ final class AcpSearchProviderCollectingListener
 {
     public function __invoke(ProviderCollecting $event): void
     {
-        $event->register('com.woltlab.wcf.menuItem', new MenuItemACPSearchResultProvider(), 1);
-        $event->register('com.woltlab.wcf.option', new OptionACPSearchResultProvider(), 2);
-        $event->register('com.woltlab.wcf.user', new UserACPSearchResultProvider(), 3);
-        $event->register('com.woltlab.wcf.userGroupOption', new UserGroupOptionACPSearchResultProvider(), 4);
-        $event->register('com.woltlab.wcf.package', new PackageACPSearchResultProvider(), 5);
-        $event->register('com.woltlab.wcf.page', new PageACPSearchResultProvider(), 6);
-        $event->register('com.woltlab.wcf.box', new BoxACPSearchResultProvider(), 7);
-        $event->register('com.woltlab.wcf.article', new ArticleACPSearchResultProvider(), 8);
-        $event->register('com.woltlab.wcf.trophy', new TrophyACPSearchResultProvider(), 9);
+        $event->register('com.woltlab.wcf.article', new ArticleACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.box', new BoxACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.menuItem', new MenuItemACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.option', new OptionACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.package', new PackageACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.page', new PageACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.trophy', new TrophyACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.user', new UserACPSearchResultProvider());
+        $event->register('com.woltlab.wcf.userGroupOption', new UserGroupOptionACPSearchResultProvider());
     }
 }

wcfsetup/install/files/lib/system/search/acp/ACPSearchHandler.class.php

@@ -8,6 +8,7 @@
 use wcf\system\event\EventHandler;
 use wcf\system\exception\ImplementationException;
 use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 
 /**
  * Handles ACP Search.
@@ -29,19 +30,13 @@ class ACPSearchHandler extends SingletonFactory
      */
     private array $providers = [];
 
-    /**
-     * @var array<string, int>
-     */
-    private array $showOrders = [];
-
     #[\Override]
     protected function init()
     {
         $event = new ProviderCollecting();
         EventHandler::getInstance()->fire($event);
         foreach ($event->getProviders() as $providerName => $provider) {
             $this->providers[$providerName] = $provider;
-            $this->showOrders[$providerName] = $event->getShowOrder($providerName);
         }
 
         foreach (ACPSearchProviderCacheBuilder::getInstance()->getData() as $acpSearchProvider) {
@@ -55,12 +50,16 @@ protected function init()
             }
 
             $this->providers[$acpSearchProvider->providerName] = new $className();
-            $this->showOrders[$acpSearchProvider->providerName] = (int)$acpSearchProvider->showOrder;
         }
 
+        $language = WCF::getLanguage();
+        $collator = new \Collator($language->getLocale());
         \uksort(
             $this->providers,
-            fn(string $a, string $b) => $this->showOrders[$a] <=> $this->showOrders[$b]
+            static fn(string $a, string $b) => $collator->compare(
+                $language->get('wcf.acp.search.provider.' . $a),
+                $language->get('wcf.acp.search.provider.' . $b)
+            )
         );
     }