Adapt ordering of widget movement/addition

Author: schlessera

features/widget-reset.feature

@@ -138,7 +138,7 @@ Feature: Reset WordPress sidebars
     When I run `wp widget list sidebar-2 --format=ids`
     Then STDOUT should contain:
       """
-      search-1 calendar-1
+      calendar-1 search-1
       """
     When I run `wp widget list wp_inactive_widgets --format=ids`
     Then STDOUT should be empty

features/widget.feature

@@ -61,7 +61,7 @@ Feature: Manage widgets in WordPress sidebar
       | text     | text-1     | 1        |
       | calendar | calendar-1 | 2        |
 
-    When I run `wp widget delete archives-1 text-2`
+    When I run `wp widget delete archives-1 text-1`
     Then STDOUT should be:
       """
       Success: Deleted 2 of 2 widgets.
@@ -88,7 +88,7 @@ Feature: Manage widgets in WordPress sidebar
     When I run `wp widget list sidebar-1 --format=ids`
     Then STDOUT should be:
       """
-      search-1 archives-1 text-1
+      search-1 archives-1 text-2
       """
 
     When I run `wp widget list sidebar-1 --fields=name,position,options`

src/Widget_Command.php

@@ -130,11 +130,14 @@ public function list_( $args, $assoc_args ) {
 	 * @subcommand add
 	 */
 	public function add( $args, $assoc_args ) {
-
 		list( $name, $sidebar_id ) = $args;
-		$position                  = Utils\get_flag_value( $args, 2, 1 ) - 1;
+
 		$this->validate_sidebar( $sidebar_id );
 
+		$position = count( $args ) > 2
+			? $args[2] - 1
+			: count( $this->get_sidebar_widgets( $sidebar_id ) );
+
 		$widget = $this->get_widget_obj( $name );
 		if ( false === $widget ) {
 			WP_CLI::error( 'Invalid widget type.' );
@@ -300,7 +303,13 @@ public function deactivate( $args, $assoc_args ) {
 				continue;
 			}
 
-			$this->move_sidebar_widget( $widget_id, $sidebar_id, 'wp_inactive_widgets', $sidebar_index, 0 );
+			$this->move_sidebar_widget(
+				$widget_id,
+				$sidebar_id,
+				'wp_inactive_widgets',
+				$sidebar_index,
+				count( $this->get_sidebar_widgets( 'wp_inactive_widgets' ) )
+			);
 
 			$count++;
 
@@ -427,7 +436,13 @@ public function reset( $args, $assoc_args ) {
 				foreach ( $widgets as $widget ) {
 					$widget_id = $widget->id;
 					list( $name, $option_index, $new_sidebar_id, $sidebar_index ) = $this->get_widget_data( $widget_id );
-					$this->move_sidebar_widget( $widget_id, $new_sidebar_id, 'wp_inactive_widgets', $sidebar_index, 0 );
+					$this->move_sidebar_widget(
+						$widget_id,
+						$new_sidebar_id,
+						'wp_inactive_widgets',
+						$sidebar_index,
+						count( $this->get_sidebar_widgets( 'wp_inactive_widgets' ) )
+					);
 				}
 				WP_CLI::log( sprintf( "Sidebar '%s' reset.", $sidebar_id ) );
 				$count++;