Remove all reference widget logic from the endpoint and used ajax adm…

…in endpoint instead

lib/class-experimental-wp-widget-blocks-manager.php

@@ -121,16 +121,26 @@ public static function get_sidebar_as_blocks( $sidebar_id ) {
 		$wp_registered_sidebars = self::get_wp_registered_sidebars();
 
 		foreach ( $sidebars_items[ $sidebar_id ] as $item ) {
-			$widget_class = self::get_widget_class( $item );
-			$blocks[]     = array(
+			$widget_class            = self::get_widget_class( $item );
+			list( $object, $number ) = self::get_widget_info( $item );
+			$new_block               = array(
 				'blockName' => 'core/legacy-widget',
 				'attrs'     => array(
-					'widgetClass' => $widget_class,
-					'identifier'  => $item,
+					'widgetId'    => $item,
 					'instance'    => self::get_sidebar_widget_instance( $wp_registered_sidebars[ $sidebar_id ], $item ),
 				),
 				'innerHTML' => '',
 			);
+			if ( null !== $widget_class ) {
+				$new_block['attrs']['widgetClass'] = $widget_class;
+			}
+			if ( isset( $object->id_base ) ) {
+				$new_block['attrs']['idBase'] = $object->id_base;
+			}
+			if ( is_int( $number ) ) {
+				$new_block['attrs']['widgetNumber'] = $number;
+			}
+			$blocks[] = $new_block;
 		}
 		return $blocks;
 	}
@@ -177,7 +187,7 @@ private static function get_widget_class( $widget_id ) {
 	 * @param string $id Identifier of the widget instance.
 	 * @return array Array containing the widget instance.
 	 */
-	public static function get_sidebar_widget_instance( $sidebar, $id ) {
+	private static function get_sidebar_widget_instance( $sidebar, $id ) {
 		list( $object, $number, $name ) = self::get_widget_info( $id );
 		if ( ! $object ) {
 			return array();

lib/class-wp-rest-widget-forms.php

@@ -0,0 +1,186 @@
+<?php
+/**
+ * Start: Include for phase 2
+ * Widget Updater REST API: WP_REST_Widget_Forms class
+ *
+ * @package gutenberg
+ * @since 5.2.0
+ */
+
+/**
+ * Controller which provides REST endpoint for updating a widget.
+ *
+ * @since 5.2.0
+ *
+ * @see WP_REST_Controller
+ */
+class WP_REST_Widget_Forms extends WP_REST_Controller {
+
+	/**
+	 * Constructs the controller.
+	 *
+	 * @access public
+	 */
+	public function __construct() {
+		$this->namespace = '__experimental';
+		$this->rest_base = 'widget-forms';
+	}
+
+	/**
+	 * Registers the necessary REST API route.
+	 *
+	 * @access public
+	 */
+	public function register_routes() {
+			register_rest_route(
+				$this->namespace,
+				// Regex representing a PHP class extracted from http://php.net/manual/en/language.oop5.basic.php.
+				'/' . $this->rest_base . '/(?P<widget_class>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)/',
+				array(
+					'args' => array(
+						'widget_class'     => array(
+							'description'       => __( 'Class name of the widget.', 'gutenberg' ),
+							'type'              => 'string',
+							'required'          => true,
+							'validate_callback' => array( $this, 'is_valid_widget' ),
+						),
+						'instance'         => array(
+							'description' => __( 'Current widget instance', 'gutenberg' ),
+							'type'        => 'object',
+							'default'     => array(),
+						),
+						'instance_changes' => array(
+							'description' => __( 'Array of instance changes', 'gutenberg' ),
+							'type'        => 'object',
+							'default'     => array(),
+						),
+					),
+					array(
+						'methods'             => WP_REST_Server::EDITABLE,
+						'permission_callback' => array( $this, 'compute_new_widget_permissions_check' ),
+						'callback'            => array( $this, 'compute_new_widget' ),
+					),
+				)
+			);
+	}
+
+	/**
+	 * Checks if the user has permissions to make the request.
+	 *
+	 * @since 5.2.0
+	 * @access public
+	 *
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+	 */
+	public function compute_new_widget_permissions_check() {
+		// Verify if the current user has edit_theme_options capability.
+		// This capability is required to access the widgets screen.
+		if ( ! current_user_can( 'edit_theme_options' ) ) {
+			return new WP_Error(
+				'widgets_cannot_access',
+				__( 'Sorry, you are not allowed to access widgets on this site.', 'gutenberg' ),
+				array(
+					'status' => rest_authorization_required_code(),
+				)
+			);
+		}
+		return true;
+	}
+
+	/**
+	 * Checks if the widget being referenced is valid.
+	 *
+	 * @since 5.2.0
+	 * @param string $widget_class Name of the class the widget references.
+	 *
+	 * @return boolean| True if the widget being referenced exists and false otherwise.
+	 */
+	private function is_valid_widget( $widget_class ) {
+		global $wp_widget_factory, $wp_registered_widgets;
+		if ( ! $widget_class ) {
+			return false;
+		}
+		return isset( $wp_widget_factory->widgets[ $widget_class ] ) &&
+			( $wp_widget_factory->widgets[ $widget_class ] instanceof WP_Widget );
+	}
+
+	/**
+	 * Returns the new widget instance and the form that represents it.
+	 *
+	 * @since 5.7.0
+	 * @access public
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function compute_new_widget( $request ) {
+		$widget_class     = $request->get_param( 'widget_class' );
+		$instance         = $request->get_param( 'instance' );
+		$instance_changes = $request->get_param( 'instance_changes' );
+
+		global $wp_widget_factory;
+		$widget_obj = $wp_widget_factory->widgets[ $widget_class ];
+
+		$widget_obj->_set( -1 );
+		ob_start();
+
+		if ( ! empty( $instance_changes ) ) {
+			$old_instance = $instance;
+			$instance     = $widget_obj->update( $instance_changes, $old_instance );
+
+			/**
+			 * Filters a widget's settings before saving.
+			 *
+			 * Returning false will effectively short-circuit the widget's ability
+			 * to update settings. The old setting will be returned.
+			 *
+			 * @since 5.2.0
+			 *
+			 * @param array     $instance         The current widget instance's settings.
+			 * @param array     $instance_changes Array of new widget settings.
+			 * @param array     $old_instance     Array of old widget settings.
+			 * @param WP_Widget $widget_ob        The widget instance.
+			 */
+			$instance = apply_filters( 'widget_update_callback', $instance, $instance_changes, $old_instance, $widget_obj );
+			if ( false === $instance ) {
+				$instance = $old_instance;
+			}
+		}
+
+		$instance = apply_filters( 'widget_form_callback', $instance, $widget_obj );
+
+		$return = null;
+		if ( false !== $instance ) {
+			$return = $widget_obj->form( $instance );
+
+			/**
+			 * Fires at the end of the widget control form.
+			 *
+			 * Use this hook to add extra fields to the widget form. The hook
+			 * is only fired if the value passed to the 'widget_form_callback'
+			 * hook is not false.
+			 *
+			 * Note: If the widget has no form, the text echoed from the default
+			 * form method can be hidden using CSS.
+			 *
+			 * @since 5.2.0
+			 *
+			 * @param WP_Widget $widget_obj     The widget instance (passed by reference).
+			 * @param null      $return   Return null if new fields are added.
+			 * @param array     $instance An array of the widget's settings.
+			 */
+			do_action_ref_array( 'in_widget_form', array( &$widget_obj, &$return, $instance ) );
+		}
+		$form = ob_get_clean();
+
+		return rest_ensure_response(
+			array(
+				'instance' => $instance,
+				'form'     => $form,
+			)
+		);
+	}
+}
+/**
+ * End: Include for phase 2
+ */