Merge pull request #1535 from IanDelMar/yoda

Use Yoda condition checks and strict comparisons

admin/admin.php

@@ -607,7 +607,7 @@ function wpcf7_admin_updated_message( $page, $action, $object ) {
 add_filter( 'plugin_action_links', 'wpcf7_plugin_action_links', 10, 2 );
 
 function wpcf7_plugin_action_links( $links, $file ) {
-	if ( $file != WPCF7_PLUGIN_BASENAME ) {
+	if ( WPCF7_PLUGIN_BASENAME !== $file ) {
 		return $links;
 	}
 

includes/config-validator/mail.php

@@ -24,7 +24,7 @@ public function replace_mail_tags( $content, $options = '' ) {
 	 */
 	public function replace_mail_tags_with_minimum_input_callback( $matches ) {
 		// allow [[foo]] syntax for escaping a tag
-		if ( $matches[1] === '[' and $matches[4] === ']' ) {
+		if ( '[' === $matches[1] and ']' === $matches[4] ) {
 			return substr( $matches[0], 1, -1 );
 		}
 
@@ -536,7 +536,7 @@ public function detect_unsafe_email_without_protection( $section, $content ) {
 		$content = $this->replace_mail_tags( $content, array(
 			'callback' => function ( $matches ) use ( $example_email ) {
 				// allow [[foo]] syntax for escaping a tag
-				if ( $matches[1] === '[' and $matches[4] === ']' ) {
+				if ( '[' === $matches[1] and ']' === $matches[4] ) {
 					return substr( $matches[0], 1, -1 );
 				}
 

includes/form-tags-manager.php

@@ -230,8 +230,7 @@ public function normalize( $content ) {
 	 */
 	private function normalize_callback( $matches ) {
 		// allow [[foo]] syntax for escaping a tag
-		if ( $matches[1] == '['
-		and $matches[6] == ']' ) {
+		if ( '[' === $matches[1] and ']' === $matches[6] ) {
 			return $matches[0];
 		}
 
@@ -466,8 +465,7 @@ private function replace_callback( $matches ) {
 	 */
 	private function scan_callback( $matches, $replace = false ) {
 		// allow [[foo]] syntax for escaping a tag
-		if ( $matches[1] == '['
-		and $matches[6] == ']' ) {
+		if ( '[' === $matches[1] and ']' === $matches[6] ) {
 			return substr( $matches[0], 1, -1 );
 		}
 

includes/functions.php

@@ -406,8 +406,7 @@ function wpcf7_rmdir_p( $dir ) {
 
 	if ( $handle = opendir( $dir ) ) {
 		while ( false !== ( $file = readdir( $handle ) ) ) {
-			if ( $file == "."
-			or $file == ".." ) {
+			if ( '.' === $file or '..' === $file ) {
 				continue;
 			}
 

includes/html-formatter.php

@@ -189,7 +189,7 @@ public function pre_format( $chunks ) {
 				array( "\r\n", "\r" ), "\n", $chunk['content']
 			);
 
-			if ( $chunk['type'] === self::start_tag ) {
+			if ( self::start_tag === $chunk['type'] ) {
 				list( $chunk['content'] ) =
 					self::normalize_start_tag( $chunk['content'] );
 
@@ -222,7 +222,7 @@ public function concatenate_texts( $chunks ) {
 		foreach ( $chunks as $chunk ) {
 			$chunk['position'] = $position;
 
-			if ( $chunk['type'] === self::text ) {
+			if ( self::text === $chunk['type'] ) {
 				if ( isset( $text_left ) ) {
 					$text_left['content'] .= $chunk['content'];
 				} else {
@@ -263,19 +263,19 @@ public function format( $chunks ) {
 
 		foreach ( $chunks as $chunk ) {
 
-			if ( $chunk['type'] === self::text ) {
+			if ( self::text === $chunk['type'] ) {
 				$this->append_text( $chunk['content'] );
 			}
 
-			if ( $chunk['type'] === self::start_tag ) {
+			if ( self::start_tag === $chunk['type'] ) {
 				$this->start_tag( $chunk['content'] );
 			}
 
-			if ( $chunk['type'] === self::end_tag ) {
+			if ( self::end_tag === $chunk['type'] ) {
 				$this->end_tag( $chunk['content'] );
 			}
 
-			if ( $chunk['type'] === self::comment ) {
+			if ( self::comment === $chunk['type'] ) {
 				$this->append_comment( $chunk['content'] );
 			}
 		}

includes/mail.php

@@ -531,8 +531,7 @@ private function replace_tags_callback_html( $matches ) {
 	 */
 	private function replace_tags_callback( $matches, $html = false ) {
 		// allow [[foo]] syntax for escaping a tag
-		if ( $matches[1] == '['
-		and $matches[4] == ']' ) {
+		if ( '[' === $matches[1] and ']' === $matches[4] ) {
 			return substr( $matches[0], 1, -1 );
 		}