Use __METHOD__ in _deprecated_function(); update comments

Author: westonruter

includes/embeds/class-amp-twitter-embed-handler.php

@@ -148,7 +148,7 @@ public function shortcode( $attr ) {
 	 * @return string Rendered oEmbed.
 	 */
 	public function oembed( $matches ) {
-		_deprecated_function( __FUNCTION__, '1.1' );
+		_deprecated_function( __METHOD__, '1.1' );
 		$id = false;
 
 		if ( isset( $matches['tweet'] ) && is_numeric( $matches['tweet'] ) ) {
@@ -239,12 +239,13 @@ public function sanitize_raw_embeds( $dom ) {
 	}
 
 	/**
-	 * Checks whether it's a twitter blockquote or not
+	 * Checks whether it's a twitter blockquote or not.
 	 *
 	 * @param DOMElement $node The DOMNode to adjust and replace.
 	 * @return bool Whether node is for raw embed.
 	 */
 	private function is_tweet_raw_embed( $node ) {
+		// Skip processing blockquotes that have already been passed through while being wrapped with <amp-twitter>.
 		if ( $node->parentNode && 'amp-twitter' === $node->parentNode->nodeName ) {
 			return false;
 		}

tests/php/test-amp-twitter-embed.php

@@ -190,7 +190,12 @@ public function get_scripts_data() {
 	}
 
 	/**
+	 * Test get_scripts().
+	 *
 	 * @dataProvider get_scripts_data
+	 *
+	 * @param string $source   Source content.
+	 * @param array  $expected Expected scripts.
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Twitter_Embed_Handler();
@@ -212,7 +217,7 @@ public function test__get_scripts( $source, $expected ) {
 	/**
 	 * Data for test__raw_embed_sanitizer.
 	 *
-	 * @return array
+	 * @return array Data.
 	 */
 	public function get_raw_embed_dataset() {
 		return [