Replace matchPlugins with array_intersect_key

kint-php · Aug 26, 2024 · c60934c · c60934c
1 parent d528bb1
commit c60934c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 26 deletions.
diff --git a/build/kint.phar b/build/kint.phar
diff --git a/src/Renderer/AbstractRenderer.php b/src/Renderer/AbstractRenderer.php
@@ -119,27 +119,6 @@ public function postRender(): string
         return '';
     }
 
-    /**
-     * Returns the first compatible plugin available.
-     *
-     * @psalm-param PluginMap $plugins Array of hints to class strings
-     * @psalm-param array<string, true> $hints Array of object hints
-     *
-     * @psalm-return PluginMap Array of hints to class strings filtered and sorted by object hints
-     */
-    public function matchPlugins(array $plugins, array $hints): array
-    {
-        $out = [];
-
-        foreach ($hints as $key => $_) {
-            if (isset($plugins[$key])) {
-                $out[$key] = $plugins[$key];
-            }
-        }
-
-        return $out;
-    }
-
     public static function sortPropertiesFull(Value $a, Value $b): int
     {
         $sort = Value::sortByAccess($a, $b);

diff --git a/src/Renderer/RichRenderer.php b/src/Renderer/RichRenderer.php
@@ -640,14 +640,14 @@ protected function renderTab(Value $o, Representation $rep): string
      */
     protected function getPlugin(array $plugins, array $hints): ?PluginInterface
     {
-        if ($plugins = $this->matchPlugins($plugins, $hints)) {
-            $plugin = \end($plugins);
+        if ($overlap = \array_intersect_key($hints, $plugins)) {
+            $plugin = $plugins[\array_key_last($overlap)];
 
             if (!isset($this->plugin_objs[$plugin]) && \is_a($plugin, PluginInterface::class, true)) {
                 $this->plugin_objs[$plugin] = new $plugin($this);
             }
 
-            return $this->plugin_objs[$plugin] ?? null;
+            return $this->plugin_objs[$plugin];
         }
 
         return null;

diff --git a/src/Renderer/TextRenderer.php b/src/Renderer/TextRenderer.php
@@ -388,8 +388,8 @@ protected function calledFrom(): string
      */
     protected function getPlugin(array $plugins, array $hints): ?PluginInterface
     {
-        if ($plugins = $this->matchPlugins($plugins, $hints)) {
-            $plugin = \end($plugins);
+        if ($overlap = \array_intersect_key($hints, $plugins)) {
+            $plugin = $plugins[\array_key_last($overlap)];
 
             if (!isset($this->plugin_objs[$plugin]) && \is_a($plugin, PluginInterface::class, true)) {
                 $this->plugin_objs[$plugin] = new $plugin($this);