Change @deprecated tag to be 'Moved to...'

This should be more descriptive. Also, delete the remove_all_filters() call.
ampproject · Nov 4, 2019 · 3e0e649 · 3e0e649
1 parent b64392b
commit 3e0e649
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/includes/embeds/class-amp-soundcloud-embed.php b/includes/embeds/class-amp-soundcloud-embed.php
@@ -121,7 +121,7 @@ private function parse_amp_component_from_iframe( $html, $url ) {
 	/**
 	 * Render shortcode.
 	 *
-	 * @deprecated 1.4.1 in favor of Jetpack_AMP_Soundcloud_Shortcode::filter_shortcode().
+	 * @deprecated 1.4.1 Moved to Jetpack_AMP_Soundcloud_Shortcode::filter_shortcode().
 	 *
 	 * @param array  $attr    Shortcode attributes.
 	 * @param string $content Shortcode content.

diff --git a/includes/embeds/class-amp-twitter-embed.php b/includes/embeds/class-amp-twitter-embed.php
@@ -76,7 +76,7 @@ public function unregister_embed() {
 	 *
 	 * Note that this shortcode is is defined in Jetpack.
 	 *
-	 * @deprecated 1.4.1 in favor of Jetpack_AMP_Tweet_Shortcode::filter_shortcode().
+	 * @deprecated 1.4.1 Moved to Jetpack_AMP_Tweet_Shortcode::filter_shortcode().
 	 *
 	 * @param array $attr The Twitter attributes.
 	 * @return string Twitter shortcode markup.

diff --git a/includes/embeds/class-amp-vimeo-embed.php b/includes/embeds/class-amp-vimeo-embed.php
@@ -86,7 +86,7 @@ public function unregister_embed() {
 	/**
 	 * Gets AMP-compliant markup for the Vimeo shortcode.
 	 *
-	 * @deprecated 1.4.1 in favor of Jetpack_AMP_Vimeo_Shortcode::filter_shortcode().
+	 * @deprecated 1.4.1 Moved to Jetpack_AMP_Vimeo_Shortcode::filter_shortcode().
 	 *
 	 * @param array $attr The Vimeo attributes.
 	 * @return string Vimeo shortcode markup.

diff --git a/tests/php/test-amp-vimeo-embed.php b/tests/php/test-amp-vimeo-embed.php
@@ -12,15 +12,6 @@
  */
 class AMP_Vimeo_Embed_Test extends WP_UnitTestCase {
 
-	/**
-	 * Tears down the environment after each test.
-	 *
-	 * @inheritDoc
-	 */
-	public function tearDown() {
-		remove_all_filters( 'do_shortcode_tag' );
-	}
-
 	/**
 	 * Get conversion data.
 	 *