Remove meta type from delete method

Jonny Harris · Jonny Harris · commit 08bfed795586 · 2018-04-16T14:18:05.000+01:00
diff --git a/src/Comment_Meta_Command.php b/src/Comment_Meta_Command.php
@@ -37,7 +37,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {
 		return get_comment_meta( $object_id, $meta_key, $single );
 	}
 
-	protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
+	protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
 		return delete_comment_meta( $object_id, $meta_key, $meta_value, $delete_all );
 	}
 
diff --git a/src/Post_Meta_Command.php b/src/Post_Meta_Command.php
@@ -47,7 +47,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {
 		return get_post_meta( $object_id, $meta_key, $single );
 	}
 
-	protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
+	protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
 		return delete_post_meta( $object_id, $meta_key, $meta_value, $delete_all );
 	}
 }
diff --git a/src/Term_Meta_Command.php b/src/Term_Meta_Command.php
@@ -49,7 +49,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {
 		return get_term_meta( $object_id, $meta_key, $single );
 	}
 
-	protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
+	protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
 		return delete_term_meta( $object_id, $meta_key, $meta_value, $delete_all );
 	}
 
diff --git a/src/User_Meta_Command.php b/src/User_Meta_Command.php
@@ -238,7 +238,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {
 		return get_user_meta( $object_id, $meta_key, $single );
 	}
 
-	protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
+	protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
 		return delete_user_meta( $object_id, $meta_key, $meta_value, $delete_all );
 	}
 
diff --git a/src/WP_CLI/CommandWithMeta.php b/src/WP_CLI/CommandWithMeta.php
@@ -446,7 +446,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {
 		return get_metadata( $this->meta_type, $object_id, $meta_key, $single );
 	}
 
-	protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
+	protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
 		return delete_metadata( $this->meta_type, $object_id, $meta_key, $meta_value, $delete_all );
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {`
`37`	`37`	`return get_comment_meta( $object_id, $meta_key, $single );`
`38`	`38`	`}`
`39`	`39`
`40`		`- protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
	`40`	`+ protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
`41`	`41`	`return delete_comment_meta( $object_id, $meta_key, $meta_value, $delete_all );`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {`
`47`	`47`	`return get_post_meta( $object_id, $meta_key, $single );`
`48`	`48`	`}`
`49`	`49`
`50`		`- protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
	`50`	`+ protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
`51`	`51`	`return delete_post_meta( $object_id, $meta_key, $meta_value, $delete_all );`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {`
`49`	`49`	`return get_term_meta( $object_id, $meta_key, $single );`
`50`	`50`	`}`
`51`	`51`
`52`		`- protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
	`52`	`+ protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
`53`	`53`	`return delete_term_meta( $object_id, $meta_key, $meta_value, $delete_all );`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {`
`238`	`238`	`return get_user_meta( $object_id, $meta_key, $single );`
`239`	`239`	`}`
`240`	`240`
`241`		`- protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
	`241`	`+ protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
`242`	`242`	`return delete_user_meta( $object_id, $meta_key, $meta_value, $delete_all );`
`243`	`243`	`}`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ protected function get_metadata( $object_id, $meta_key = '', $single = false ) {`
`446`	`446`	`return get_metadata( $this->meta_type, $object_id, $meta_key, $single );`
`447`	`447`	`}`
`448`	`448`
`449`		`- protected function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
	`449`	`+ protected function delete_metadata( $object_id, $meta_key, $meta_value = '', $delete_all = false ) {`
`450`	`450`	`return delete_metadata( $this->meta_type, $object_id, $meta_key, $meta_value, $delete_all );`
`451`	`451`	`}`
`452`	`452`