Changeset 51049

Timestamp:

05/31/2021 08:56:22 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Remove duplicates in the widget types endpoint.

Props noisysocks, spacedmonkey, imath, isabel_brison.
Fixes #53305.

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-widget-types-controller.php (modified) (2 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php

@@ -226 +226 @@
             $widget['classname'] = ltrim( $classname, '_' );
 
-            $widgets[] = $widget;
+            $widgets[ $widget['id'] ] = $widget;
         }
 

trunk/tests/phpunit/tests/rest-api/rest-widget-types-controller.php

@@ -62 +62 @@
     }
 
+    private function setup_widget( $id_base, $number, $settings ) {
+        global $wp_widget_factory;
+
+        $option_name = "widget_$id_base";
+        update_option(
+            $option_name,
+            array(
+                $number => $settings,
+            )
+        );
+
+        $widget_object = $wp_widget_factory->get_widget_object( $id_base );
+        $widget_object->_set( $number );
+        $widget_object->_register_one( $number );
+    }
+
     /**
      * @ticket 41683
@@ -107 +123 @@
             $this->check_widget_type_object( $widget_type, $item, $item['_links'] );
         }
-
+    }
+
+    /**
+     * @ticket 53305
+     */
+    public function test_get_items_removes_duplicates() {
+        wp_set_current_user( self::$admin_id );
+        $this->setup_widget(
+            'text',
+            1,
+            array(
+                'text' => 'Custom text test',
+            )
+        );
+        $this->setup_widget(
+            'text',
+            2,
+            array(
+                'text' => 'Custom text test',
+            )
+        );
+        $request      = new WP_REST_Request( 'GET', '/wp/v2/widget-types' );
+        $response     = rest_get_server()->dispatch( $request );
+        $data         = $response->get_data();
+        $text_widgets = array_filter(
+            $data,
+            function( $widget ) {
+                return 'text' === $widget['id'];
+            }
+        );
+        $this->assertCount( 1, $text_widgets );
     }