From 3e0e649706533cbe6fbf96cb5c63710f32887d93 Mon Sep 17 00:00:00 2001 From: Ryan Kienstra Date: Mon, 4 Nov 2019 16:32:23 -0600 Subject: [PATCH] Change @deprecated tag to be 'Moved to...' This should be more descriptive. Also, delete the remove_all_filters() call. --- includes/embeds/class-amp-soundcloud-embed.php | 2 +- includes/embeds/class-amp-twitter-embed.php | 2 +- includes/embeds/class-amp-vimeo-embed.php | 2 +- tests/php/test-amp-vimeo-embed.php | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/includes/embeds/class-amp-soundcloud-embed.php b/includes/embeds/class-amp-soundcloud-embed.php index 5422095dc0c..e2433a68584 100644 --- 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 index 1501a02939f..3c314e91e3e 100644 --- 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 index fe861a82370..48b6ef03915 100644 --- 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 index e643fd48314..fa0914a7987 100644 --- 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. *