From e968a6ccaa46f746fdcacef6eae1224dd0dacdf8 Mon Sep 17 00:00:00 2001
From: Henrique Mouta <henrique@automattic.com>
Date: Tue, 6 Jul 2021 16:32:44 +0100
Subject: [PATCH 1/3] Initial work on PHPCS cleanup

---
 .phpcs.xml.dist                               |   6 +-
 includes/class-syndication-admin-notices.php  | 134 +++--
 includes/class-syndication-client-factory.php |  63 ++-
 includes/class-syndication-event-counter.php  |  21 +-
 includes/class-syndication-logger-viewer.php  | 245 +++++----
 includes/class-syndication-logger.php         | 307 ++++++-----
 .../class-syndication-site-auto-retry.php     |  92 ++--
 ...class-syndication-site-failure-monitor.php |  16 +-
 includes/class-syndication-wp-rest-client.php | 329 ++++++-----
 includes/class-syndication-wp-rss-client.php  | 265 ++++-----
 includes/class-syndication-wp-xml-client.php  | 364 ++++++++-----
 .../class-syndication-wp-xmlrpc-client.php    | 514 ++++++++++--------
 ...lass-walker-category-dropdown-multiple.php |  31 +-
 includes/class-wp-cli.php                     | 206 ++++---
 includes/interface-syndication-client.php     |  61 ++-
 push-syndication.php                          |  17 +-
 16 files changed, 1550 insertions(+), 1121 deletions(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 301811c7..0b3aad08 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -48,7 +48,9 @@
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
 		<properties>
 			<property name="prefixes" type="array">
-				<element value="syndication"/>
+				<element value="push_syn"/>
+				<element value="pull_syn"/>
+				<element value="syn"/>
 			</property>
 		</properties>
 	</rule>
@@ -56,7 +58,7 @@
 	<rule ref="WordPress.WP.I18n">
 		<properties>
 			<property name="text_domain" type="array">
-				<element value="syndication"/>
+				<element value="push-syndication"/>
 			</property>
 		</properties>
 	</rule>
diff --git a/includes/class-syndication-admin-notices.php b/includes/class-syndication-admin-notices.php
index 06103407..0925a011 100644
--- a/includes/class-syndication-admin-notices.php
+++ b/includes/class-syndication-admin-notices.php
@@ -5,11 +5,14 @@
  */
 class Syndication_Logger_Admin_Notice {
 
-	private static $notice_option = 'syn_notices';
+	private static $notice_option         = 'syn_notices';
 	private static $notice_bundles_option = 'syn_notice_bundles';
 
 	private static $dismiss_parameter = 'syn_dismiss';
 
+	/**
+	 * Syndication_Logger_Admin_Notice constructor.
+	 */
 	public function __construct() {
 		add_action( 'admin_init', array( __CLASS__, 'handle_dismiss_syndication_notice' ) );
 		add_action( 'admin_notices', array( __CLASS__, 'display_valid_notices' ) );
@@ -17,24 +20,25 @@ public function __construct() {
 
 	/**
 	 * Create a admin notice
-	 * @param text    $message_text       The message you would like to show
-	 * @param string  $message_type       A message type, shown alongside with your message and used to categorize and bundle messages of the same type
-	 * @param string  $class              css class applied to the notice eg. 'updated', 'error', 'update-nag'
-	 * @param boolean $summarize_multiple setting this to true allows summarizing messages of the same message_type into one message. The message text is then passed through the syn_message_text_multiple filter and all messages of this type can be dismissed at once
+	 *
+	 * @param string  $message_text       The message you would like to show.
+	 * @param string  $message_type       A message type, shown alongside with your message and used to categorize and bundle messages of the same type.
+	 * @param string  $class              css class applied to the notice eg. 'updated', 'error', 'update-nag'.
+	 * @param boolean $summarize_multiple setting this to true allows summarizing messages of the same message_type into one message. The message text is then passed through the syn_message_text_multiple filter and all messages of this type can be dismissed at once.
 	 */
 	public static function add_notice( $message_text, $message_type = 'Syndication', $class = 'updated', $summarize_multiple = false ) {
 		$notices = get_option( self::$notice_option );
 
-		$changed = false;
+		$changed     = false;
 		$message_key = md5( $message_type . $message_text );
-		if ( ! is_array( $notices ) || ! isset( $notices[$message_type] ) || ! isset( $notices[$message_type][$message_key] ) ) {
-			$notices[$message_type][$message_key] = array(
-				'message_text' => sanitize_text_field( $message_text ),
-				'summarize_multiple' => (boolean) $summarize_multiple,
-				'message_type' => sanitize_text_field( $message_type ),
-				'class' => sanitize_text_field( $class ),
+		if ( ! is_array( $notices ) || ! isset( $notices[ $message_type ] ) || ! isset( $notices[ $message_type ][ $message_key ] ) ) {
+			$notices[ $message_type ][ $message_key ] = array(
+				'message_text'       => sanitize_text_field( $message_text ),
+				'summarize_multiple' => (bool) $summarize_multiple,
+				'message_type'       => sanitize_text_field( $message_type ),
+				'class'              => sanitize_text_field( $class ),
 			);
-			$changed = true;
+			$changed                                  = true;
 		}
 
 		if ( true === $changed ) {
@@ -50,40 +54,40 @@ public static function add_notice( $message_text, $message_type = 'Syndication',
 	public static function display_valid_notices() {
 		$capability = apply_filters( 'syn_syndicate_cap', 'manage_options' );
 
-		$messages = get_option( self::$notice_option );
-		$notice_bundles = get_option( self::$notice_bundles_option );
-		$messages_to_display = array();
+		$messages               = get_option( self::$notice_option );
+		$notice_bundles         = get_option( self::$notice_bundles_option );
+		$messages_to_display    = array();
 		$notice_bundles_changed = false;
 
-		if ( !is_array( $messages ) || empty( $messages ) ) {
+		if ( ! is_array( $messages ) || empty( $messages ) ) {
 			return;
 		}
 
-		foreach( $messages as $message_type => $message_values ) {
-			foreach( $message_values as $message_key => $message_data ) {
+		foreach ( $messages as $message_type => $message_values ) {
+			foreach ( $message_values as $message_key => $message_data ) {
 				if ( isset( $message_data['summarize_multiple'] ) && true === $message_data['summarize_multiple'] ) {
 					$message_text = apply_filters( 'syn_message_text_multiple', $message_data['message_text'], $message_data );
 				} else {
 					$message_text = apply_filters( 'syn_message_text', $message_data['message_text'], $message_data );
 				}
 
-				$new_message_key = md5( $message_type . $message_text );
+				$new_message_key  = md5( $message_type . $message_text );
 				$new_message_data = array(
-					'message_text' => sanitize_text_field( $message_text ),
-					'summarize_multiple' => (boolean) $message_data['summarize_multiple'],
-					'message_type' => sanitize_text_field( $message_data['message_type'] ),
-					'class' => sanitize_text_field( $message_data['class'] )
+					'message_text'       => sanitize_text_field( $message_text ),
+					'summarize_multiple' => (bool) $message_data['summarize_multiple'],
+					'message_type'       => sanitize_text_field( $message_data['message_type'] ),
+					'class'              => sanitize_text_field( $message_data['class'] ),
 				);
 
 				if ( $new_message_key != $message_key ) {
-					if ( ! isset( $notice_bundles[$new_message_key] ) || ! in_array( $message_key, $notice_bundles[$new_message_key] ) ) {
-						$notice_bundles[$new_message_key][] = $message_key;
-						$notice_bundles_changed = true;
+					if ( ! isset( $notice_bundles[ $new_message_key ] ) || ! in_array( $message_key, $notice_bundles[ $new_message_key ] ) ) {
+						$notice_bundles[ $new_message_key ][] = $message_key;
+						$notice_bundles_changed               = true;
 					}
 				}
 
 				if ( current_user_can( $capability ) ) {
-					$messages_to_display[$message_type][$new_message_key] = $new_message_data;
+					$messages_to_display[ $message_type ][ $new_message_key ] = $new_message_data;
 				}
 			}
 		}
@@ -92,11 +96,23 @@ public static function display_valid_notices() {
 			update_option( self::$notice_bundles_option, $notice_bundles );
 		}
 
-		foreach( $messages_to_display as $message_type => $message_values ) {
-			foreach( $message_values as $message_key => $message_data ) {
+		foreach ( $messages_to_display as $message_type => $message_values ) {
+			foreach ( $message_values as $message_key => $message_data ) {
 				$dismiss_nonce = wp_create_nonce( esc_attr( $message_key ) );
 				printf( '<div class="%s"><p>', esc_attr( $message_data['class'] ) );
-				printf( __('%1$s : %2$s <a href="%3$s">Hide Notice</a>'), esc_html( $message_type ), wp_kses_post( $message_data['message_text'] ), add_query_arg( array( self::$dismiss_parameter => esc_attr( $message_key ), 'syn_dismiss_nonce' => esc_attr( $dismiss_nonce ) ) ) );
+				printf(
+					__( '%1$s : %2$s <a href="%3$s">Hide Notice</a>' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					esc_html( $message_type ),
+					wp_kses_post( $message_data['message_text'] ),
+					esc_url(
+						add_query_arg(
+							array(
+								self::$dismiss_parameter => esc_attr( $message_key ),
+								'syn_dismiss_nonce'      => esc_attr( $dismiss_nonce ),
+							)
+						)
+					)
+				);
 				printf( '</p></div>' );
 			}
 		}
@@ -108,49 +124,63 @@ public static function display_valid_notices() {
 	public static function handle_dismiss_syndication_notice() {
 		$capability = apply_filters( 'syn_syndicate_cap', 'manage_options' );
 
-		// add nonce
-		if ( isset( $_GET[self::$dismiss_parameter] ) && current_user_can( $capability ) ) {
-
-			$dismiss_key = esc_attr( $_GET[self::$dismiss_parameter] );
-			$dismiss_nonce = esc_attr( $_GET['syn_dismiss_nonce'] );
+		// add nonce.
+		if ( isset( $_GET[ self::$dismiss_parameter ] ) && current_user_can( $capability ) ) {
+			$dismiss_key   = esc_attr( $_GET[ self::$dismiss_parameter ] );  // phpcs:ignore
+			$dismiss_nonce = esc_attr( isset( $_GET['syn_dismiss_nonce'] ) ? $_GET['syn_dismiss_nonce'] : '' ); // phpcs:ignore
 			if ( ! wp_verify_nonce( $dismiss_nonce, $dismiss_key ) ) {
-				wp_die( __( "Invalid security check" ) );
+				wp_die( esc_html__( 'Invalid security check' ) ); // phpcs:ignore WordPress.WP.I18n.MissingArgDomain
 			}
-			$messages = get_option( self::$notice_option );
+			$messages       = get_option( self::$notice_option );
 			$notice_bundles = get_option( self::$notice_bundles_option );
 
 			$dismiss_items = array();
-			if ( isset( $notice_bundles[$dismiss_key] ) ) {
-				$dismiss_items = $notice_bundles[$dismiss_key];
+			if ( isset( $notice_bundles[ $dismiss_key ] ) ) {
+				$dismiss_items = $notice_bundles[ $dismiss_key ];
 			} else {
 				$dismiss_items = array( $dismiss_key );
 			}
 
-			foreach( $messages as $message_type => $message_values ) {
+			foreach ( $messages as $message_type => $message_values ) {
 				$message_keys = array_keys( $message_values );
-				$dismiss_it = array_intersect( $message_keys, $dismiss_items );
-				foreach( $dismiss_it as $dismiss_it_key ) {
-					unset( $messages[$message_type][$dismiss_it_key] );
+				$dismiss_it   = array_intersect( $message_keys, $dismiss_items );
+				foreach ( $dismiss_it as $dismiss_it_key ) {
+					unset( $messages[ $message_type ][ $dismiss_it_key ] );
 				}
 			}
 
-			if ( isset( $notice_bundles[$dismiss_key] ) ) {
-				unset( $notice_bundles[$dismiss_key] );
+			if ( isset( $notice_bundles[ $dismiss_key ] ) ) {
+				unset( $notice_bundles[ $dismiss_key ] );
 			}
 
 			update_option( self::$notice_option, $messages );
 			update_option( self::$notice_bundles_option, $notice_bundles );
-
 		}
 	}
 }
 
-add_filter( 'syn_message_text_multiple', 'syn_handle_multiple_error_notices', 10, 2 );
-function syn_handle_multiple_error_notices( $message, $message_data ) {
-	return __( 'There have been multiple errors. Please validate your syndication logs' );
+/**
+ * @param $message
+ * @param $message_data
+ *
+ * @return string|void
+ */
+function syn_handle_multiple_error_notices( $message, $message_data ) { //phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals
+	return esc_html__( 'There have been multiple errors. Please validate your syndication logs', 'push-syndication' );
 }
+add_filter( 'syn_message_text_multiple', 'syn_handle_multiple_error_notices', 10, 2 );
 
-add_action( 'push_syndication_site_disabled', 'syn_add_site_disabled_notice', 10, 2 );
+/**
+ * @param $site_id
+ * @param $count
+ */
 function syn_add_site_disabled_notice( $site_id, $count ) {
-	Syndication_Logger_Admin_Notice::add_notice( $message_text = sprintf( __( 'Site %d disabled after %d pull failure(s).', 'push-syndication' ), (int) $site_id, (int) $count ), $message_type = 'Syndication site disabled', $class = 'error', $summarize_multiple = false );
+	Syndication_Logger_Admin_Notice::add_notice(
+		sprintf( __( 'Site %1$d disabled after %2$d pull failure(s).', 'push-syndication' ), (int) $site_id, (int) $count ),
+		'Syndication site disabled',
+		'error',
+		false
+	);
 }
+add_action( 'push_syndication_site_disabled', 'syn_add_site_disabled_notice', 10, 2 );
+
diff --git a/includes/class-syndication-client-factory.php b/includes/class-syndication-client-factory.php
index f2e755ba..51d9aa40 100644
--- a/includes/class-syndication-client-factory.php
+++ b/includes/class-syndication-client-factory.php
@@ -1,45 +1,68 @@
 <?php
 
-include_once( dirname( __FILE__ ) . '/class-syndication-wp-xmlrpc-client.php' );
-include_once( dirname( __FILE__ ) . '/class-syndication-wp-xml-client.php' );
-include_once( dirname( __FILE__ ) . '/class-syndication-wp-rest-client.php' );
-include_once( dirname( __FILE__ ) . '/class-syndication-wp-rss-client.php' );
-
+require_once dirname( __FILE__ ) . '/class-syndication-wp-xmlrpc-client.php';
+require_once dirname( __FILE__ ) . '/class-syndication-wp-xml-client.php';
+require_once dirname( __FILE__ ) . '/class-syndication-wp-rest-client.php';
+require_once dirname( __FILE__ ) . '/class-syndication-wp-rss-client.php';
+
+/**
+ * Class Syndication_Client_Factory
+ */
 class Syndication_Client_Factory {
 
-	public static function get_client( $transport_type, $site_ID ) {
-
+	/**
+	 * @param $transport_type
+	 * @param $site_id
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public static function get_client( $transport_type, $site_id ) {
 		$class = self::get_transport_type_class( $transport_type );
-		if( class_exists( $class ) ) {
-			return new $class( $site_ID );
+		if ( class_exists( $class ) ) {
+			return new $class( $site_id );
 		}
 
-		throw new Exception(' transport class not found' );
-
+		throw new Exception( ' transport class not found' );
 	}
 
+	/**
+	 * @param $site
+	 * @param $transport_type
+	 *
+	 * @return false|mixed
+	 * @throws Exception
+	 */
 	public static function display_client_settings( $site, $transport_type ) {
-
 		$class = self::get_transport_type_class( $transport_type );
-		if( class_exists( $class ) ) {
+		if ( class_exists( $class ) ) {
 			return call_user_func( array( $class, 'display_settings' ), $site );
 		}
 
-		throw new Exception( 'transport class not found: '. $class );
-
+		throw new Exception( 'transport class not found: ' . $class );
 	}
 
-	public static function save_client_settings( $site_ID, $transport_type ) {
-
+	/**
+	 * @param $site_id
+	 * @param $transport_type
+	 *
+	 * @return false|mixed
+	 * @throws Exception
+	 */
+	public static function save_client_settings( $site_id, $transport_type ) {
 		$class = self::get_transport_type_class( $transport_type );
-		if( class_exists( $class ) ) {
-			return call_user_func( array( $class, 'save_settings' ), $site_ID );
+		if ( class_exists( $class ) ) {
+			return call_user_func( array( $class, 'save_settings' ), $site_id );
 		}
 
 		throw new Exception( 'transport class not found' );
-
 	}
 
+	/**
+	 * @param $transport_type
+	 *
+	 * @return string
+	 */
 	public static function get_transport_type_class( $transport_type ) {
 		return 'Syndication_' . $transport_type . '_Client';
 	}
diff --git a/includes/class-syndication-event-counter.php b/includes/class-syndication-event-counter.php
index dd7722f5..df3ae17a 100644
--- a/includes/class-syndication-event-counter.php
+++ b/includes/class-syndication-event-counter.php
@@ -1,10 +1,11 @@
 <?php
+
+
 /**
  * Event Counter
  *
  * This allows for generic events to be captured and counted. Use the push_syndication_event and push_syndication_reset_event actions to capture and reset counters. Use push_syndication_after_event to handle events once they've occurred, and to see the number of times the event has occurred.
  */
-
 class Syndication_Event_Counter {
 
 	/**
@@ -19,18 +20,18 @@ public function __construct() {
 	/**
 	 * Increments an event counter.
 	 *
-	 * @param string $event_slug An identifier for the event.
+	 * @param string     $event_slug An identifier for the event.
 	 * @param string|int $event_object_id An identifier for the object the event is associated with. Should be unique across all objects associated with the given $event_slug.
 	 */
 	public function count_event( $event_slug, $event_object_id = null ) {
 		// Coerce the slug and ID to strings. PHP will fire appropriate warnings if the given slug and ID are not coercible.
-		$event_slug = (string) $event_slug;
+		$event_slug      = (string) $event_slug;
 		$event_object_id = (string) $event_object_id;
 
 		// Increment the event counter.
-		$option_name = $this->_get_safe_option_name( $event_slug, $event_object_id );
-		$count = get_option( $option_name, 0 );
-		$count = $count + 1;
+		$option_name = $this->get_safe_option_name( $event_slug, $event_object_id );
+		$count       = get_option( $option_name, 0 );
+		$count       = ++$count;
 		update_option( $option_name, $count );
 
 		/**
@@ -61,10 +62,10 @@ public function count_event( $event_slug, $event_object_id = null ) {
 	 */
 	public function reset_event( $event_slug, $event_object_id ) {
 		// Coerce the slug and ID to strings. PHP will fire appropriate warnings if the given slug and ID are not coercible.
-		$event_slug = (string) $event_slug;
+		$event_slug      = (string) $event_slug;
 		$event_object_id = (string) $event_object_id;
 
-		delete_option( $this->_get_safe_option_name( $event_slug, $event_object_id ) );
+		delete_option( $this->get_safe_option_name( $event_slug, $event_object_id ) );
 	}
 
 	/**
@@ -76,7 +77,7 @@ public function reset_event( $event_slug, $event_object_id ) {
 	 * @param $event_object_id
 	 * @return string
 	 */
-	protected function _get_safe_option_name( $event_slug, $event_object_id ) {
+	protected function get_safe_option_name( $event_slug, $event_object_id ) {
 		return 'push_syndication_event_counter_' . md5( $event_slug . $event_object_id );
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/class-syndication-logger-viewer.php b/includes/class-syndication-logger-viewer.php
index 240c7d48..ae150ef3 100644
--- a/includes/class-syndication-logger-viewer.php
+++ b/includes/class-syndication-logger-viewer.php
@@ -1,9 +1,14 @@
 <?php
 
-if( ! class_exists( 'WP_List_Table' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+if ( ! class_exists( 'WP_List_Table' ) ) {
+	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
+//@TODO: phpcs - break this file into multiple files, one for each class
+
+/**
+ * Class Syndication_Logger_List_Table
+ */
 class Syndication_Logger_List_Table extends WP_List_Table {
 
 	public $prepared_data = array();
@@ -16,22 +21,29 @@ class Syndication_Logger_List_Table extends WP_List_Table {
 
 	protected $_max_date = null;
 
-	public function __construct(){
+	/**
+	 * Syndication_Logger_List_Table constructor.
+	 */
+	public function __construct() {
 		global $status, $page;
 
-		parent::__construct( array(
-			'singular'  => __( 'log', 'push-syndication' ),
-			'plural'    => __( 'logs', 'push-syndication' ),
-			'ajax'      => false
-		) );
+		parent::__construct(
+			array(
+				'singular' => __( 'log', 'push-syndication' ),
+				'plural'   => __( 'logs', 'push-syndication' ),
+				'ajax'     => false,
+			)
+		);
 
 		add_action( 'admin_head', array( $this, 'admin_header' ) );
 	}
 
 	public function admin_header() {
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		$current_page = ( isset( $_GET['page'] ) ) ? (int) $_GET['page'] : false;
-		if( 'syndication_dashboard' != $current_page )
+		if ( 'syndication_dashboard' != $current_page ) {
 			return;
+		}
 
 		?>
 		<style type="text/css">
@@ -45,12 +57,13 @@ public function admin_header() {
 		<?php
 	}
 
+
 	public function no_items() {
-		_e( 'No log entries found.' );
+		esc_html_e( 'No log entries found.', 'push-syndication' );
 	}
 
 	public function column_default( $item, $column_name ) {
-		switch( $column_name ) {
+		switch ( $column_name ) {
 			case 'object_id':
 			case 'log_id':
 			case 'time':
@@ -60,43 +73,43 @@ public function column_default( $item, $column_name ) {
 				return $item[ $column_name ];
 
 			default:
-				return print_r( $item, true );
+				return print_r( $item, true ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
 		}
 	}
 
 	public function get_sortable_columns() {
 		$sortable_columns = array(
-			'object_id' => array( 'object_id',	false ),
-			'log_id'	=> array( 'log_id', 	false ),
-			'time'		=> array( 'time', 		false ),
-			'msg_type' 	=> array( 'msg_type',	false ),
-			'message'  	=> array( 'message', 	false ),
-			'status'   	=> array( 'status',		false )
-			);
+			'object_id' => array( 'object_id', false ),
+			'log_id'    => array( 'log_id', false ),
+			'time'      => array( 'time', false ),
+			'msg_type'  => array( 'msg_type', false ),
+			'message'   => array( 'message', false ),
+			'status'    => array( 'status', false ),
+		);
 		return $sortable_columns;
 	}
 
-	public function get_columns(){
+	public function get_columns() {
 		$columns = array(
-			'object_id'	=> __( 'Object ID', 'push-syndication' ),
-			'log_id'	=> __( 'Log ID', 	'push-syndication' ),
-			'time'		=> __( 'Time', 		'push-syndication' ),
-			'msg_type'	=> __( 'Type', 		'push-syndication' ),
-			'status'	=> __( 'Status', 	'push-syndication' ),
-			'message'	=> __( 'Message', 	'push-syndication' ),
-			);
+			'object_id' => __( 'Object ID', 'push-syndication' ),
+			'log_id'    => __( 'Log ID', 'push-syndication' ),
+			'time'      => __( 'Time', 'push-syndication' ),
+			'msg_type'  => __( 'Type', 'push-syndication' ),
+			'status'    => __( 'Status', 'push-syndication' ),
+			'message'   => __( 'Message', 'push-syndication' ),
+		);
 		return $columns;
 	}
 
 	public function usort_reorder( $a, $b ) {
-		$orderby = ( ! empty( $_GET['orderby'] ) ) ? esc_attr( $_GET['orderby'] ) : 'time';
-		$order = ( ! empty($_GET['order'] ) ) ? esc_attr( $_GET['order'] ) : 'desc';
-		$result = strcmp( $a[$orderby], $b[$orderby] );
-		return ( $order === 'asc' ) ? $result : -$result;
+		$orderby = ( ! empty( $_GET['orderby'] ) ) ? esc_attr( $_GET['orderby'] ) : 'time'; // phpcs:ignore
+		$order   = ( ! empty( $_GET['order'] ) ) ? esc_attr( $_GET['order'] ) : 'desc'; // phpcs:ignore
+		$result  = strcmp( $a[ $orderby ], $b[ $orderby ] );
+		return ( 'asc' === $order ) ? $result : -$result;
 	}
 
-	public function column_log_id($item){
-		return sprintf('%1$s', substr( $item['log_id'], 0, 3 ) . '&hellip;' . substr( $item['log_id'], -3 ) );
+	public function column_log_id( $item ) {
+		return sprintf( '%1$s', substr( $item['log_id'], 0, 3 ) . '&hellip;' . substr( $item['log_id'], -3 ) );
 	}
 
 	public function get_bulk_actions() {
@@ -108,80 +121,91 @@ public function get_bulk_actions() {
 	 *
 	 */
 	public function prepare_items() {
-		$columns  = $this->get_columns();
-		$hidden   = array();
-		$sortable = $this->get_sortable_columns();
+		$columns               = $this->get_columns();
+		$hidden                = array();
+		$sortable              = $this->get_sortable_columns();
 		$this->_column_headers = array( $columns, $hidden, $sortable );
 
-		$log_id = ( isset( $_REQUEST['log_id'] ) ) ? esc_attr( $_REQUEST['log_id'] ) : null;
-		$msg_type = null;
-		$object_id = null;
-		$object_type = 'post';
-		$log_status = null;
-		$date_start = null;
-		$date_end = null;
-		$message = null;
+		$log_id       = ( isset( $_REQUEST['log_id'] ) ) ? esc_attr( $_REQUEST['log_id'] ) : null; // phpcs:ignore
+		$msg_type     = null;
+		$object_id    = null;
+		$object_type  = 'post';
+		$log_status   = null;
+		$date_start   = null;
+		$date_end     = null;
+		$message      = null;
 		$storage_type = 'object';
 
 		$log_data = Syndication_Logger::instance()->get_messages(
-				$log_id,
-				$msg_type,
-				$object_id,
-				$object_type,
-				$log_status,
-				$date_start,
-				$date_end,
-				$message,
-				$storage_type
+			$log_id,
+			$msg_type,
+			$object_id,
+			$object_type,
+			$log_status,
+			$date_start,
+			$date_end,
+			$message,
+			$storage_type
 		);
 
-		foreach( $log_data as $site_id => $log_items ) {
+		foreach ( $log_data as $site_id => $log_items ) {
 			$this->prepared_data = array_merge( $this->prepared_data, $log_items );
 		}
 		usort( $this->prepared_data, array( $this, 'usort_reorder' ) );
 
-		$per_page = $this->get_items_per_page( 'per_page' );
+		$per_page     = $this->get_items_per_page( 'per_page' );
 		$current_page = $this->get_pagenum();
-		$total_items = count( $this->prepared_data );
+		$total_items  = count( $this->prepared_data );
 
-		$this->found_data = array_slice( $this->prepared_data,( ( $current_page-1 )* $per_page ), $per_page );
+		$this->found_data = array_slice( $this->prepared_data, ( ( $current_page - 1 ) * $per_page ), $per_page );
 
 
 		// Populate min/max dates.
 		if ( $this->found_data ) {
 			$items_sorted_by_time = $this->found_data;
 
-			usort( $items_sorted_by_time, function ( $a, $b  ) {
-				return strtotime( $a['time'] ) - strtotime( $b['time'] );
-			} );
+			usort(
+				$items_sorted_by_time,
+				function ( $a, $b ) {
+					return strtotime( $a['time'] ) - strtotime( $b['time'] );
+				}
+			);
 
 			$this->_max_date = strtotime( end( $items_sorted_by_time )['time'] );
 			$this->_min_date = strtotime( reset( $items_sorted_by_time )['time'] );
 		}
 
 
-		// Filter by month
-		$requested_month = isset( $_REQUEST['month'] ) ? esc_attr( $_REQUEST['month'] ) : null;
+		// Filter by month.
+		$requested_month = isset( $_REQUEST['month'] ) ? esc_attr( $_REQUEST['month'] ) : null; // phpcs:ignore
 		if ( $requested_month ) {
-			$this->found_data = array_filter( $this->found_data, function ( $item ) use ( $requested_month ) {
-				return date( 'Y-m', strtotime( $item['time'] ) ) === $requested_month;
-			} );
+			$this->found_data = array_filter(
+				$this->found_data,
+				function ( $item ) use ( $requested_month ) {
+					return gmdate( 'Y-m', strtotime( $item['time'] ) ) === $requested_month;
+				}
+			);
 		}
 
 
-		// Filter by type
-		$requested_type = isset( $_REQUEST['type'] ) ? esc_attr( $_REQUEST['type'] ) : null;
+		// Filter by type.
+		$requested_type = isset( $_REQUEST['type'] ) ? esc_attr( $_REQUEST['type'] ) : null; // phpcs:ignore
 		if ( $requested_type ) {
-			$this->found_data = array_filter( $this->found_data, function ( $item  ) use ( $requested_type ) {
-				return $requested_type === $item['msg_type'];
-			} );
+			$this->found_data = array_filter(
+				$this->found_data,
+				function ( $item ) use ( $requested_type ) {
+					return $requested_type === $item['msg_type'];
+				}
+			);
 		}
 
 
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,
-			'per_page'    => $per_page
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $total_items,
+				'per_page'    => $per_page,
+			)
+		);
 		$this->items = $this->found_data;
 	}
 
@@ -189,13 +213,18 @@ protected function extra_tablenav( $which ) {
 		?>
 		<div class="alignleft actions">
 			<?php
-			if ( 'top' == $which && !is_singular() ) {
-
+			if ( 'top' == $which && ! is_singular() ) {
 				$this->create_log_id_dropdown();
-				$this->_create_months_dropdown();
-				$this->_create_types_dropdown();
-
-				submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+				$this->create_months_dropdown();
+				$this->create_types_dropdown();
+
+				submit_button(
+					esc_attr__( 'Filter', 'push-syndication' ),
+					'button',
+					'filter_action',
+					false,
+					array( 'id' => 'post-query-submit' )
+				);
 			}
 
 			?>
@@ -204,20 +233,22 @@ protected function extra_tablenav( $which ) {
 	}
 
 	private function create_log_id_dropdown() {
-		$requested_log_id = isset( $_REQUEST['log_id'] ) ? esc_attr( $_REQUEST['log_id'] ) : 0;
+		$requested_log_id = isset( $_REQUEST['log_id'] ) ? esc_attr( $_REQUEST['log_id'] ) : 0; // phpcs:ignore
 		?>
-		<label class="screen-reader-text" for="filter-by-log-id"><?php _e( 'Filter by Log ID' ); ?></label>
+		<label class="screen-reader-text" for="filter-by-log-id"><?php esc_html_e( 'Filter by Log ID', 'push-syndication' ); ?></label>
 		<select name="log_id" id="filter-by-log-id">
-			<option<?php selected( $requested_log_id, 0 ); ?> value="0"><?php _e( 'All logs' ); ?></option>
+			<option<?php selected( $requested_log_id, 0 ); ?> value="0"><?php esc_html_e( 'All logs', 'push-syndication' ); ?></option>
 			<?php
 			$log_ids = array();
 			foreach ( $this->prepared_data as $row ) {
-				if ( 0 == $row['log_id'] )
+				if ( 0 == $row['log_id'] ) {
 					continue;
+				}
 
 				$log_id = esc_attr( $row['log_id'] );
-				if ( ! isset( $log_ids[$log_id] ) ) {
-					$log_ids[$log_id] = sprintf( "<option %s value='%s'>%s</option>\n",
+				if ( ! isset( $log_ids[ $log_id ] ) ) {
+					$log_ids[ $log_id ] = sprintf(
+						"<option %s value='%s'>%s</option>\n",
 						selected( $requested_log_id, $log_id, false ),
 						esc_attr( $log_id ),
 						esc_attr( $this->column_log_id( $row ) )
@@ -225,6 +256,7 @@ private function create_log_id_dropdown() {
 				}
 			}
 
+			// phpcs:ignore
 			echo implode( "\n", $log_ids ); // sanitization happens right above
 			?>
 		</select>
@@ -232,8 +264,8 @@ private function create_log_id_dropdown() {
 		<?php
 	}
 
-	protected function _create_months_dropdown() {
-		$requested_month = isset( $_REQUEST['month'] ) ? esc_attr( $_REQUEST['month'] ) : null;
+	protected function create_months_dropdown() {
+		$requested_month = isset( $_REQUEST['month'] ) ? esc_attr( $_REQUEST['month'] ) : null; // phpcs:ignore
 		?>
 		<label class="screen-reader-text" for="filter-by-month">Filter by month</label>
 		<select name="month" id="filter-by-month">
@@ -242,11 +274,11 @@ protected function _create_months_dropdown() {
 			<?php
 			if ( $this->_min_date && $this->_max_date ) {
 				$month_pointer = new DateTime( '@' . $this->_min_date );
-				$max_month = new DateTime( '@' . $this->_max_date );
+				$max_month     = new DateTime( '@' . $this->_max_date );
 
-				while ( $month_pointer <= $max_month ) { ?>
-					<option
-						value='<?php echo esc_attr( $month_pointer->format( 'Y-m' ) ); ?>' <?php selected( $requested_month, $month_pointer->format( 'Y-m' ) ); ?>><?php echo esc_html( $month_pointer->format( 'F Y' ) ); ?></option>
+				while ( $month_pointer <= $max_month ) {
+					?>
+					<option	value='<?php echo esc_attr( $month_pointer->format( 'Y-m' ) ); ?>' <?php selected( $requested_month, $month_pointer->format( 'Y-m' ) ); ?>><?php echo esc_html( $month_pointer->format( 'F Y' ) ); ?></option>
 					<?php
 					$month_pointer->modify( '+1 month' );
 				}
@@ -256,13 +288,19 @@ protected function _create_months_dropdown() {
 		<?php
 	}
 
-	protected function _create_types_dropdown() {
-		$requested_type = isset( $_REQUEST['month'] ) ? esc_attr( $_REQUEST['type'] ) : null;
+	protected function create_types_dropdown() {
+		$requested_type = isset( $_REQUEST['month'] ) ? esc_attr( $_REQUEST['type'] ) : null; // phpcs:ignore
 		?>
 		<label class="screen-reader-text" for="filter-by-type">Filter by type</label>
 		<select name="type" id="filter-by-type">
 			<option value="">All types</option>
-			<?php foreach( array( 'success' => 'Success', 'info' => 'Information', 'error' => 'Error' ) as $key => $label ): ?>
+			<?php
+			foreach ( array(
+				'success' => 'Success',
+				'info'    => 'Information',
+				'error'   => 'Error',
+			) as $key => $label ) :
+				?>
 				<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $requested_type, $key ); ?>><?php echo esc_html( $label ); ?></option>
 			<?php endforeach; ?>
 		</select>
@@ -270,31 +308,38 @@ protected function _create_types_dropdown() {
 	}
 }
 
-
+/**
+ * Class Syndication_Logger_Viewer
+ */
 class Syndication_Logger_Viewer {
 
 	public $syndication_logger_table;
 
+	/**
+	 * Syndication_Logger_Viewer constructor.
+	 */
 	public function __construct() {
 		add_action( 'admin_menu', array( $this, 'add_menu_items' ) );
 	}
 
-	public function add_menu_items(){
+	public function add_menu_items() {
 		$hook = add_submenu_page( 'edit.php?post_type=syn_site', 'Logs', 'Logs', 'activate_plugins', 'syndication_dashboard', array( $this, 'render_list_page' ) );
 		add_action( "load-$hook", array( $this, 'initialize_list_table' ) );
 	}
 
 	public function initialize_list_table() {
+		// phpcs:ignore
 		if ( ! empty( $_POST['log_id'] ) && ( empty( $_GET['log_id'] ) || esc_attr( $_GET['log_id'] ) != esc_attr( $_POST['log_id'] ) ) ) {
-			wp_safe_redirect( add_query_arg( array( 'log_id' => esc_attr( $_REQUEST['log_id'] ) ), wp_unslash($_SERVER['REQUEST_URI'] ) ) );
+			// phpcs:ignore
+			wp_safe_redirect( add_query_arg( array( 'log_id' => esc_attr( $_REQUEST['log_id'] ) ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
 			exit;
 		}
 		$this->syndication_logger_table = new Syndication_Logger_List_Table();
 	}
 
-	public function render_list_page(){
+	public function render_list_page() {
 		?>
-		<div class="wrap"><h2><?php _e( "Syndication Logs", "syndication" ); ?></h2>
+		<div class="wrap"><h2><?php _e( 'Syndication Logs', 'push-syndication' ); ?></h2>
 			<?php
 			$this->syndication_logger_table->prepare_items();
 			?>
diff --git a/includes/class-syndication-logger.php b/includes/class-syndication-logger.php
index ab5f8340..ba05b06d 100644
--- a/includes/class-syndication-logger.php
+++ b/includes/class-syndication-logger.php
@@ -8,42 +8,51 @@
 class Syndication_Logger {
 
 	/**
-	 * singleton handle
+	 * Singleton handle
+	 *
 	 * @var object
 	 */
-	private static $__instance = null;
+	private static $__instance = null; // phpcs:ignore
 
 	/**
-	 * maximum amount of rows to keep for single object log entries
+	 * Maximum amount of rows to keep for single object log entries
+	 *
 	 * @var integer
 	 */
 	private $log_entry_limit = 150;
 
 	/**
-	 * level of information to log. Can be info for all and default for errors/success
+	 * Level of information to log. Can be info for all and default for errors/success
+	 *
 	 * @var string
 	 */
 	private $debug_level = null;
 
 	/**
-	 * if true log messages will also be sent to php error log
+	 * If true log messages will also be sent to php error log
+	 *
 	 * @var boolean
 	 */
 	private $use_php_error_logging = null;
 
 	/**
-	 * filter variables for retrieving log messages
+	 * Filter variables for retrieving log messages
+	 *
 	 * @var array
 	 */
 	private $log_filter = array();
 
 	/**
-	 * a unique identifier for each page load / logging session
+	 * A unique identifier for each page load / logging session
+	 *
 	 * @var string
 	 */
 	private $log_id = null;
 
-	public function __construct() {
+	/**
+	 * Syndication_Logger constructor.
+	 */
+	private function __construct() {
 		add_action( 'syn_post_pull_new_post', array( __CLASS__, 'log_new' ), 10, 5 );
 		add_action( 'syn_post_pull_edit_post', array( __CLASS__, 'log_update' ), 10, 5 );
 		add_action( 'syn_post_push_delete_post', array( __CLASS__, 'log_delete' ), 10, 6 );
@@ -55,9 +64,9 @@ public function __construct() {
 
 		if ( false === $this->debug_level ) {
 			if ( defined( 'WP_DEBUG' ) && true === WP_DEBUG ) {
-				$this->debug_level = 'info';	// log everything
+				$this->debug_level = 'info';    // log everything.
 			} else {
-				$this->debug_level = 'default';	// log only errors + success
+				$this->debug_level = 'default'; // log only errors + success.
 			}
 		}
 
@@ -66,9 +75,9 @@ public function __construct() {
 
 		if ( false === $this->use_php_error_logging ) {
 			if ( defined( 'WP_DEBUG' ) && true === WP_DEBUG ) {
-				$this->use_php_error_logging = true;	// log also with error_log()
+				$this->use_php_error_logging = true;    // log also with error_log().
 			} else {
-				$this->use_php_error_logging = false;	// log only in db
+				$this->use_php_error_logging = false;   // log only in db.
 			}
 		}
 	}
@@ -79,20 +88,22 @@ public function __construct() {
 	public static function init() {
 		self::instance()->log_id = md5( uniqid() . microtime() );
 
-		require_once( dirname( __FILE__ ) . '/class-syndication-admin-notices.php' );
-		new Syndication_Logger_Admin_Notice;
+		require_once dirname( __FILE__ ) . '/class-syndication-admin-notices.php';
+		new Syndication_Logger_Admin_Notice();
 
 		if ( is_admin() ) {
-			require_once( dirname( __FILE__ ) . '/class-syndication-logger-viewer.php' );
-			$viewer = new Syndication_Logger_Viewer;
+			require_once dirname( __FILE__ ) . '/class-syndication-logger-viewer.php';
+			$viewer = new Syndication_Logger_Viewer();
 		}
 	}
 
-	/*
+	/**
 	 * Use this singleton to address non-static methods
+	 *
+	 * @return Syndication_Logger
 	 */
 	public static function instance() {
-		if ( self::$__instance == null ) {
+		if ( null === self::$__instance ) {
 			self::$__instance = new self();
 		}
 		return self::$__instance;
@@ -105,11 +116,11 @@ public static function instance() {
 	 * do_action( 'syn_post_pull_new_post', $result, $post, $site, $transport_type, $client );
 	 * do_action( 'syn_post_push_new_post', $result, $post_ID, $site, $transport_type, $client, $info );
 	 *
-	 * @param  mixed  $result         Result object of previous wp_insert_post action
-	 * @param  mixed  $post           Post object or post_id
-	 * @param  object $site           Post object for the site doing the syndication
-	 * @param  string $transport_type Post meta syn_transport_type for site
-	 * @param  object $client         Syndication_Client class
+	 * @param  mixed  $result         Result object of previous wp_insert_post action.
+	 * @param  mixed  $post           Post object or post_id.
+	 * @param  object $site           Post object for the site doing the syndication.
+	 * @param  string $transport_type Post meta syn_transport_type for site.
+	 * @param  object $client         Syndication_Client class.
 	 */
 	public static function log_new( $result, $post, $site, $transport_type, $client ) {
 		self::instance()->log_post_event( 'new', $result, $post, $site, $transport_type, $client );
@@ -121,11 +132,11 @@ public static function log_new( $result, $post, $site, $transport_type, $client
 	 * do_action( 'syn_post_pull_edit_post', $result, $post, $site, $transport_type, $client );
 	 * do_action( 'syn_post_push_edit_post', $result, $post_ID, $site, $transport_type, $client, $info );
 	 *
-	 * @param  mixed  $result         Result object of previous wp_insert_post action
-	 * @param  mixed  $post           Post object or post_id
-	 * @param  object $site           Post object for the site doing the syndication
-	 * @param  string $transport_type Post meta syn_transport_type for site
-	 * @param  object $client         Syndication_Client class
+	 * @param  mixed  $result         Result object of previous wp_insert_post action.
+	 * @param  mixed  $post           Post object or post_id.
+	 * @param  object $site           Post object for the site doing the syndication.
+	 * @param  string $transport_type Post meta syn_transport_type for site.
+	 * @param  object $client         Syndication_Client class.
 	 */
 	public static function log_update( $result, $post, $site, $transport_type, $client ) {
 		self::instance()->log_post_event( 'update', $result, $post, $site, $transport_type, $client );
@@ -136,12 +147,12 @@ public static function log_update( $result, $post, $site, $transport_type, $clie
 	 * usually implemented via action hook
 	 * do_action( 'syn_post_push_delete_post', $result, $ext_ID, $post_ID, $site_ID, $transport_type, $client );
 	 *
-	 * @param  mixed  $result         Result object of previous wp_insert_post action
- 	 * @param  mixed  $external_id    External post post_id
-	 * @param  mixed  $post           Post object or post_id
-	 * @param  object $site           Post object for the site doing the syndication
-	 * @param  string $transport_type Post meta syn_transport_type for site
-	 * @param  object $client         Syndication_Client class
+	 * @param  mixed  $result         Result object of previous wp_insert_post action.
+	 * @param  mixed  $external_id    External post post_id.
+	 * @param  mixed  $post           Post object or post_id.
+	 * @param  object $site           Post object for the site doing the syndication.
+	 * @param  string $transport_type Post meta syn_transport_type for site.
+	 * @param  object $client         Syndication_Client class.
 	 */
 	public static function log_delete( $result, $external_id, $post, $site, $transport_type, $client ) {
 		self::instance()->log_post_event( 'delete', $result, $post, $site, $transport_type, $client );
@@ -149,12 +160,13 @@ public static function log_delete( $result, $external_id, $post, $site, $transpo
 
 	/**
 	 * Prepares data for the post level log events
-	 * @param  string $event          Type of event new/update/delete
-	 * @param  mixed  $result         Result object of previous wp_insert_post action
- 	 * @param  mixed  $post           Post object or post_id
- 	 * @param  object $site           Post object for the site doing the syndication
- 	 * @param  string $transport_type Post meta syn_transport_type for site
- 	 * @param  object $client         Syndication_Client class
+	 *
+	 * @param  string $event          Type of event new/update/delete.
+	 * @param  mixed  $result         Result object of previous wp_insert_post action.
+	 * @param  mixed  $post           Post object or post_id.
+	 * @param  object $site           Post object for the site doing the syndication.
+	 * @param  string $transport_type Post meta syn_transport_type for site.
+	 * @param  object $client         Syndication_Client class.
 	 */
 	private function log_post_event( $event, $result, $post, $site, $transport_type, $client ) {
 		if ( is_int( $post ) ) {
@@ -168,10 +180,10 @@ private function log_post_event( $event, $result, $post, $site, $transport_type,
 		}
 
 		$extra = array(
-			'post' 			 => $post,
-			'result' 		 => $result,
+			'post'           => $post,
+			'result'         => $result,
 			'transpost_type' => $transport_type,
-			'client' 		 => $client
+			'client'         => $client,
 		);
 
 		if ( false == $result || is_wp_error( $result ) ) {
@@ -180,20 +192,23 @@ private function log_post_event( $event, $result, $post, $site, $transport_type,
 			} else {
 				$message = 'fail';
 			}
-			Syndication_Logger::log_post_error( $site->ID, $status = __( esc_attr( $event ), 'push-syndication' ), $message, $log_time, $extra );
+			//phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText
+			self::log_post_error( $site->ID, esc_attr__( $event, 'push-syndication' ), $message, $log_time, $extra );
 		} else {
 			$message = sprintf( '%s,%d', sanitize_text_field( $post['post_guid'] ), intval( $result ) );
-			Syndication_Logger::log_post_success( $site->ID, $status = __( esc_attr( $event ), 'push-syndication' ), $message, $log_time, $extra );
+			//phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText
+			self::log_post_success( $site->ID, esc_attr__( $event, 'push-syndication' ), $message, $log_time, $extra );
 		}
 	}
 
 	/**
 	 * Log a faulty post level event
-	 * @param  int 	  $post_id  post_id to attach the log entry to
-	 * @param  string $status   status entry
-	 * @param  string $message  log message
-	 * @param  string $log_time time of event
-	 * @param  array  $extra    additional data
+	 *
+	 * @param  int    $post_id  post_id to attach the log entry to.
+	 * @param  string $status   status entry.
+	 * @param  string $message  log message.
+	 * @param  string $log_time time of event.
+	 * @param  array  $extra    additional data.
 	 */
 	public static function log_post_error( $post_id, $status = 'error', $message = '', $log_time = '', $extra = array() ) {
 		self::instance()->log_post( 'error', $post_id, $status, $message, $log_time, $extra );
@@ -201,11 +216,12 @@ public static function log_post_error( $post_id, $status = 'error', $message = '
 
 	/**
 	 * Log a successful post level event
-	 * @param  int 	  $post_id  post_id to attach the log entry to
-	 * @param  string $status   status entry
-	 * @param  string $message  log message
-	 * @param  string $log_time time of event
-	 * @param  array  $extra    additional data
+	 *
+	 * @param  int    $post_id  post_id to attach the log entry to.
+	 * @param  string $status   status entry.
+	 * @param  string $message  log message.
+	 * @param  string $log_time time of event.
+	 * @param  array  $extra    additional data.
 	 */
 	public function log_post_success( $post_id, $status = 'ok', $message = '', $log_time = '', $extra = array() ) {
 		self::instance()->log_post( 'success', $post_id, $status, $message, $log_time, $extra );
@@ -213,11 +229,12 @@ public function log_post_success( $post_id, $status = 'ok', $message = '', $log_
 
 	/**
 	 * Log a post level informal event
-	 * @param  int 	  $post_id  post_id to attach the log entry to
-	 * @param  string $status   status entry
-	 * @param  string $message  log message
-	 * @param  string $log_time time of event
-	 * @param  array  $extra    additional data
+	 *
+	 * @param  int    $post_id  post_id to attach the log entry to.
+	 * @param  string $status   status entry.
+	 * @param  string $message  log message.
+	 * @param  string $log_time time of event.
+	 * @param  array  $extra    additional data.
 	 */
 	public static function log_post_info( $post_id, $status = '', $message = '', $log_time = '', $extra = array() ) {
 		self::instance()->log_post( 'info', $post_id, $status, $message, $log_time, $extra );
@@ -225,38 +242,40 @@ public static function log_post_info( $post_id, $status = '', $message = '', $lo
 
 	/**
 	 * Pass post level events to logger function
-	 * @param  string $msg_type event type success/error/info
-	 * @param  int 	  $post_id  post_id to attach the log entry to
- 	 * @param  string $status   status entry
- 	 * @param  string $message  log message
- 	 * @param  string $log_time time of event
- 	 * @param  array  $extra    additional data
+	 *
+	 * @param  string $msg_type event type success/error/info.
+	 * @param  int    $post_id  post_id to attach the log entry to.
+	 * @param  string $status   status entry.
+	 * @param  string $message  log message.
+	 * @param  string $log_time time of event.
+	 * @param  array  $extra    additional data.
 	 */
 	private function log_post( $msg_type, $post_id, $status, $message, $log_time, $extra ) {
-		$this->log( $storage_type = 'object', $msg_type, $object_type = 'post', $object_id = $post_id, $status, $message, $log_time, $extra );
+		$this->log( 'object', $msg_type, 'post', $post_id, $status, $message, $log_time, $extra );
 	}
 
 	/**
 	 * Log an entry to the database
-	 * @param  string $storage_type Where the log entry will be stored. object / option
- 	 * @param  string $msg_type 	event type success/error/info
-	 * @param  string $object_type  Type of object to attach log entry to. Currently only "post" is supported
- 	 * @param  int 	  $object_id  	object_id (post_id) to attach the log entry to
-  	 * @param  string $status   	status entry
-  	 * @param  string $message  	log message
-  	 * @param  string $log_time 	time of event
-  	 * @param  array  $extra    	additional data
+	 *
+	 * @param  string $storage_type Where the log entry will be stored. object / option.
+	 * @param  string $msg_type     event type success/error/info.
+	 * @param  string $object_type  Type of object to attach log entry to. Currently only "post" is supported.
+	 * @param  int    $object_id    object_id (post_id) to attach the log entry to.
+	 * @param  string $status       status entry.
+	 * @param  string $message      log message.
+	 * @param  string $log_time     time of event.
+	 * @param  array  $extra        additional data.
 	 * @return mixed                true or WP_Error
 	 */
 	private function log( $storage_type, $msg_type, $object_type = 'post', $object_id = '', $status, $message, $log_time, $extra ) {
-		// Don't log infos depending on debug level
+		// Don't log infos depending on debug level.
 		if ( 'info' == $msg_type && 'info' != $this->debug_level ) {
 			return;
 		}
 
 		$log_entry = array(
-			'log_id' 	=> $this->log_id,
-			'msg_type'  => $msg_type,
+			'log_id'   => $this->log_id,
+			'msg_type' => $msg_type,
 		);
 
 		if ( ! empty( $object_type ) ) {
@@ -276,9 +295,9 @@ private function log( $storage_type, $msg_type, $object_type = 'post', $object_i
 		}
 
 		if ( ! empty( $log_time ) ) {
-			$log_entry['time'] = date('Y-m-d H:i:s', strtotime( $log_time ) );
+			$log_entry['time'] = gmdate( 'Y-m-d H:i:s', strtotime( $log_time ) );
 		} else {
-			$log_entry['time'] = current_time('mysql');
+			$log_entry['time'] = current_time( 'mysql' );
 		}
 
 		if ( ! empty( $extra ) && is_array( $extra ) ) {
@@ -288,32 +307,41 @@ private function log( $storage_type, $msg_type, $object_type = 'post', $object_i
 
 
 		if ( true === $this->use_php_error_logging ) {
+			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
 			error_log( $this->format_log_message( $msg_type, $log_entry ) );
 		}
 
 		if ( 'object' == $storage_type ) {
-			// Storing the log alongside the object
+			// Storing the log alongside the object.
 
 			if ( 'post' == $object_type ) {
-
 				if ( ! is_integer( $object_id ) ) {
-					return new WP_Error( 'logger_no_post_id', __( 'You need to provide a valid post_id or use log_option instead', 'push-syndication' ) );
+					return new WP_Error(
+						'logger_no_post_id',
+						__(
+							'You need to provide a valid post_id or use log_option instead',
+							'push-syndication'
+						)
+					);
 				}
 
 				$post = get_post( $object_id );
 				if ( ! $post ) {
-					return new WP_Error( 'logger_no_post', __( 'The post_id provided does not exist.', 'push-syndication' ) );
+					return new WP_Error(
+						'logger_no_post',
+						__( 'The post_id provided does not exist.', 'push-syndication' )
+					);
 				}
 
-				$log = get_post_meta( $post->ID, 'syn_log', true);
+				$log = get_post_meta( $post->ID, 'syn_log', true );
 
 				if ( empty( $log ) ) {
 					$log[0] = $log_entry;
 				} else {
 					if ( count( $log ) >= $this->log_entry_limit ) {
-						// Slice the array to keep the log size in the limits
-						$offset = count ( $log ) - $this->log_entry_limit;
-						$log = array_slice( $log, $offset + 1 );
+						// Slice the array to keep the log size in the limits.
+						$offset = count( $log ) - $this->log_entry_limit;
+						$log    = array_slice( $log, $offset + 1 );
 					}
 
 					$log[] = $log_entry;
@@ -322,33 +350,32 @@ private function log( $storage_type, $msg_type, $object_type = 'post', $object_i
 
 				if ( 'success' == $msg_type ) {
 					update_post_meta( $post->ID, 'syn_log_errors', 0 );
-				} else if ( 'error' == $msg_type ) {
-					// track failures since last success
+				} elseif ( 'error' == $msg_type ) {
+					// track failures since last success.
 					$errors = get_post_meta( $post->ID, 'syn_log_errors', true );
 					$errors = (int) $errors + 1;
 					update_post_meta( $post->ID, 'syn_log_errors', $errors );
-					// track overall failures
+					// track overall failures.
 					$errors = get_post_meta( $post->ID, 'syn_log_errors_overall', true );
 					$errors = (int) $errors + 1;
 					update_post_meta( $post->ID, 'syn_log_errors_overall', $errors );
 				}
 
 				// @TODO log error counter
-			} else if ( 'term' == $object_type ) {
+			} elseif ( 'term' == $object_type ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedElseif
 				// @TODO implement if needed
 			}
-
-		} else if ( 'option' == $storage_type ) {
-			// Storing the log in an option value
+		} elseif ( 'option' == $storage_type ) {
+			// Storing the log in an option value.
 
 			$log = get_option( 'syn_log', true );
 			if ( empty( $log ) ) {
 				$log[0] = $log_entry;
 			} else {
 				if ( count( $log ) >= $this->log_entry_limit ) {
-					// Slice the array to keep the log size in the limits
-					$offset = count ( $log ) - $this->log_entry_limit;
-					$log = array_slice( $log, $offset + 1 );
+					// Slice the array to keep the log size in the limits.
+					$offset = count( $log ) - $this->log_entry_limit;
+					$log    = array_slice( $log, $offset + 1 );
 				}
 
 				$log[] = $log_entry;
@@ -357,12 +384,12 @@ private function log( $storage_type, $msg_type, $object_type = 'post', $object_i
 
 			if ( 'success' == $msg_type ) {
 				update_option( 'syn_log_errors', 0 );
-			} else if ( 'error' == $msg_type ) {
-				// track failures since last success
+			} elseif ( 'error' == $msg_type ) {
+				// track failures since last success.
 				$errors = get_option( 'syn_log_errors' );
 				$errors = (int) $errors + 1;
 				update_option( 'syn_log_errors', $errors );
-				// track overall failures
+				// track overall failures.
 				$errors = get_option( 'syn_log_errors_overall' );
 				$errors = (int) $errors + 1;
 				update_option( 'syn_log_errors_overall', $errors );
@@ -373,36 +400,50 @@ private function log( $storage_type, $msg_type, $object_type = 'post', $object_i
 
 	/**
 	 * Format log message for error_log()
-	 * @param  string $msg_type  Type of message
-	 * @param  array  $log_entry Prepared log_entry array
+	 *
+	 * @param  string $msg_type  Type of message.
+	 * @param  array  $log_entry Prepared log_entry array.
 	 * @return string            Formatted log message
 	 */
 	private function format_log_message( $msg_type, $log_entry ) {
-		$msg = apply_filters( 'syn_error_log_message_format', sprintf( 'SYN_%s:%s,%d,%s%s', strtoupper( $msg_type ), $log_entry['object_type'], $log_entry['object_id'], $log_entry['status'], $log_entry['message'] ? ',' . $log_entry['message'] : '' ), $msg_type, $log_entry );
+		$msg = apply_filters(
+			'syn_error_log_message_format', //phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+			sprintf(
+				'SYN_%s:%s,%d,%s%s',
+				strtoupper( $msg_type ),
+				$log_entry['object_type'],
+				$log_entry['object_id'],
+				$log_entry['status'],
+				$log_entry['message'] ? ',' . $log_entry['message'] : ''
+			),
+			$msg_type,
+			$log_entry
+		);
 		return $msg;
 	}
 
 	/**
 	 * Retrieve and filter log messages from database
- 	 * @param  string $log_id		unique log session id
- 	 * @param  string $msg_type 	event type success/error/info
- 	 * @param  int 	  $object_id  	object_id (post_id) to attach the log entry to
-	 * @param  string $object_type  Type of object to attach log entry to. Currently only "post" is supported
-  	 * @param  string $status   	status entry
-	 * @param  string $date_start   Date string for starting date filter
-	 * @param  string $date_end     Date string for starting date filter
-	 * @param  string $message      regular expression for message text matching
-	 * @param  string $storage_type Where the log entry will be stored. object / option
-  	 * @return array                Array of matching log entries
+	 *
+	 * @param  string $log_id       unique log session id.
+	 * @param  string $msg_type     event type success/error/info.
+	 * @param  int    $object_id    object_id (post_id) to attach the log entry to.
+	 * @param  string $object_type  Type of object to attach log entry to. Currently only "post" is supported.
+	 * @param  string $status       status entry.
+	 * @param  string $date_start   Date string for starting date filter.
+	 * @param  string $date_end     Date string for starting date filter.
+	 * @param  string $message      regular expression for message text matching.
+	 * @param  string $storage_type Where the log entry will be stored. object / option.
+	 * @return array                Array of matching log entries
 	 */
-	public static function get_messages( $log_id = null, $msg_type = null, $object_id = null, $object_type = 'post', $status = null, $date_start = null, $date_end = null, $message = null, $storage_type = 'object' ) {
-
+	public static function get_messages( $log_id = null, $msg_type = null, $object_id = null, $object_type = 'post',
+		$status = null, $date_start = null, $date_end = null, $message = null, $storage_type = 'object' ) {
 		$log_entries = array();
 
 		if ( 'object' == $storage_type ) {
 			if ( 'post' == $object_type ) {
 				if ( ! empty( $object_id ) ) {
-					$log_entries[$object_id] = get_post_meta( $object_id, 'syn_log' );
+					$log_entries[ $object_id ] = get_post_meta( $object_id, 'syn_log' );
 				} else {
 					global $wpdb;
 					/**
@@ -410,33 +451,40 @@ public static function get_messages( $log_id = null, $msg_type = null, $object_i
 					 * This call may return objects larger than 1 MB and is usually only called infrequently
 					 * from the admin dashboard. Implementing a segmented object caching for this result seems
 					 * unnecessary.
+					 *
 					 * @TODO implement walker
 					 */
-					$all_log_entries = $wpdb->get_results( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = 'syn_log' GROUP BY post_id ORDER BY meta_id DESC LIMIT 0, 100" ); // cache pass (see note above)
-					foreach( $all_log_entries as $log_entry ) {
-						$log_entries[$log_entry->post_id] = unserialize( $log_entry->meta_value );
+					// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
+					$all_log_entries = $wpdb->get_results(
+						"SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = 'syn_log' GROUP BY post_id ORDER BY meta_id DESC LIMIT 0, 100"
+					); // cache pass (see note above).
+
+					foreach ( $all_log_entries as $log_entry ) {
+						//@TODO: phpcs - replace unserialize with json_decode
+						$log_entries[ $log_entry->post_id ] = unserialize( $log_entry->meta_value );
 					}
 				}
 			}
 		}
 
 		$filter = array();
-		foreach( array( 'log_id', 'msg_type', 'object_type', 'status', 'date_start', 'date_end', 'message' ) as $filter_key ) {
+		foreach ( array( 'log_id', 'msg_type', 'object_type', 'status', 'date_start', 'date_end', 'message' ) as $filter_key ) {
 			if ( ! empty( ${$filter_key} ) ) {
-				$filter[$filter_key] = ${$filter_key};
+				$filter[ $filter_key ] = ${$filter_key};
 			}
 		}
 		self::instance()->log_filter = $filter;
 
-		foreach( $log_entries as $object_id => $entries ) {
-			$entries = array_filter( $entries, array( self::instance(), 'filter_log_entries' ) );
-			$log_entries[$object_id] = $entries;
+		foreach ( $log_entries as $object_id => $entries ) {
+			$entries                   = array_filter( $entries, array( self::instance(), 'filter_log_entries' ) );
+			$log_entries[ $object_id ] = $entries;
 		}
 		return $log_entries;
 	}
 
 	/**
 	 * Retrieve log_filter variable
+	 *
 	 * @return array Log filter conditions
 	 */
 	public function get_log_filter() {
@@ -445,20 +493,21 @@ public function get_log_filter() {
 
 	/**
 	 * Filter retrieved log entries by log_filter conditions
+	 *
 	 * @uses array_filter()
-	 * @param  array $data Array Element
+	 * @param  array $data Array Element.
 	 * @return boolean     True to keep the entry, false to skip it
 	 */
 	public function filter_log_entries( $data ) {
 		$filter = $this->get_log_filter();
 
-		foreach( $filter as $key => $value ) {
-			switch( $key ) {
+		foreach ( $filter as $key => $value ) {
+			switch ( $key ) {
 				case 'log_id':
 				case 'msg_type':
 				case 'object_type':
 				case 'status':
-					if ( ! isset( $data[$key] ) || $data[$key] <> $value ) {
+					if ( ! isset( $data[ $key ] ) || $data[ $key ] <> $value ) {
 						return false;
 					}
 					break;
diff --git a/includes/class-syndication-site-auto-retry.php b/includes/class-syndication-site-auto-retry.php
index e11a9ab1..0a3236c2 100644
--- a/includes/class-syndication-site-auto-retry.php
+++ b/includes/class-syndication-site-auto-retry.php
@@ -16,116 +16,135 @@
  *
  * @uses Syndication_Logger
  */
-
 class Failed_Syndication_Auto_Retry {
-
+	// @TODO: phpcs - rename class?
 	/**
 	 * Hook into WordPress
 	 */
 	public function __construct() {
 
-		// Watch the push_syndication_event action for site pull failures
+		// Watch the push_syndication_event action for site pull failures.
 		add_action( 'push_syndication_after_event_pull_failure', array( $this, 'handle_pull_failure_event' ), 10, 2 );
 
-		// Watch the push_syndication_event action for site pull successes
+		// Watch the push_syndication_event action for site pull successes.
 		add_action( 'push_syndication_after_event_pull_success', array( $this, 'handle_pull_success_event' ), 10, 2 );
 	}
 
 	/**
 	 * Handle a site pull failure event
 	 *
-	 * @param $site_id         int    The post id of the site we need to retry
-	 * @param $failed_attempts int    The number of pull failures this site has experienced
+	 * @param int $site_id             The post id of the site we need to retry.
+	 * @param int $failed_attempts     The number of pull failures this site has experienced.
 	 *
 	 * @return null
 	 */
 	public function handle_pull_failure_event( $site_id = 0, $failed_attempts = 0 ) {
-
 		$site_auto_retry_count = 0;
 		$site_id               = (int) $site_id;
 		$failed_attempts       = (int) $failed_attempts;
 		$cleanup               = false;
 
-		// Fetch the allowable number of max pull attempts before the site is marked as 'disabled'
+		// Fetch the allowable number of max pull attempts before the site is marked as 'disabled'.
 		$max_pull_attempts = (int) get_option( 'push_syndication_max_pull_attempts', 0 );
 
-		// Bail if we've already met the max pull attempt count
+		// Bail if we've already met the max pull attempt count.
 		if ( ! $max_pull_attempts ) {
 			return;
 		}
 
-		// Only proceed if we have a valid site id
+		// Only proceed if we have a valid site id.
 		if ( 0 !== $site_id ) {
 
-			// Fetch the site post
+			// Fetch the site post.
 			$site = get_post( $site_id );
 
-			// Fetch the site url
+			// Fetch the site url.
 			$site_url = get_post_meta( $site->ID, 'syn_feed_url', true );
 
-			// Fetch the number of times we've tried to auto-retry
+			// Fetch the number of times we've tried to auto-retry.
 			$site_auto_retry_count = (int) get_post_meta( $site_id, 'syn_failed_auto_retry_attempts', true );
 
-			// Only proceed if we haven't hit the pull attempt ceiling
+			// Only proceed if we haven't hit the pull attempt ceiling.
 			if ( $failed_attempts < $max_pull_attempts ) {
 
 				// Allow the default auto retry to be filtered
-				// By default, only auto retry 3 times
+				// By default, only auto retry 3 times.
 				$auto_retry_limit = apply_filters( 'pull_syndication_failure_auto_retry_limit', 3 );
 
-				// Store the current time for repeated use below
+				// Store the current time for repeated use below.
 				$time_now = time();
 
 				// Create a string time to be sent to the logger
 				// Add 1 so our log items appear to occur a second later
 				// and hence order better in the log viewer
 				// without this, sometimes when the pull occurs quickly
-				// these log items appear to occur at the same time as the failure
-				$log_time = date( 'Y-m-d H:i:s', $time_now + 1 );
+				// these log items appear to occur at the same time as the failure.
+				$log_time = gmdate( 'Y-m-d H:i:s', $time_now + 1 );
 
 				// Are we still below the auto retry limit?
 				if ( $site_auto_retry_count < $auto_retry_limit ) {
 
 					// Yes we are..
 
-					// Run in one minute by default
+					// Run in one minute by default.
 					$auto_retry_interval = apply_filters( 'syndication_failure_auto_retry_interval', $time_now + MINUTE_IN_SECONDS );
 
-					Syndication_Logger::log_post_info( $site->ID, $status = 'start_auto_retry', $message = sprintf( __( 'Connection retry %d of %d to %s in %s..', 'push-syndication' ), $site_auto_retry_count + 1, $auto_retry_limit, $site_url, human_time_diff( $time_now, $auto_retry_interval ) ), $log_time, $extra = array() );
+					Syndication_Logger::log_post_info(
+						$site->ID,
+						'start_auto_retry',
+						sprintf(
+							esc_html__( 'Connection retry %1$d of %2$d to %3$s in %4$s..', 'push-syndication' ),
+							$site_auto_retry_count + 1,
+							$auto_retry_limit,
+							$site_url,
+							human_time_diff( $time_now, $auto_retry_interval )
+						),
+						$log_time,
+						array()
+					);
 
-					// Schedule a pull retry for one minute in the future
+					// Schedule a pull retry for one minute in the future.
 					wp_schedule_single_event(
-						$auto_retry_interval,     // retry in X time
-						'syn_pull_content',       // fire the syndication_auto_retry hook
-						array( array( $site ) )   // the site which failed to pull
+						$auto_retry_interval,     // retry in X time.
+						'syn_pull_content',       // fire the syndication_auto_retry hook.
+						array( array( $site ) )   // the site which failed to pull.
 					);
 
-					// Increment our auto retry counter
+					// Increment our auto retry counter.
 					$site_auto_retry_count++;
 
-					// And update the post meta auto retry count
+					// And update the post meta auto retry count.
 					update_post_meta( $site->ID, 'syn_failed_auto_retry_attempts', $site_auto_retry_count );
-
 				} else {
 
 					// Auto Retry limit met
-					// Let's cleanup after ourselves
-					$cleanup = true ;
+					// Let's cleanup after ourselves.
+					$cleanup = true;
 				}
 			} else {
 
 				// Retry attempt limit met
-				// The site has been disabled, let's cleanup after ourselves
+				// The site has been disabled, let's cleanup after ourselves.
 				$cleanup = true;
 			}
 
 			// Should we cleanup after ourselves?
 			if ( $cleanup ) {
 
-				// Remove the auto retry if there was one
+				// Remove the auto retry if there was one.
 				delete_post_meta( $site->ID, 'syn_failed_auto_retry_attempts' );
 
-				Syndication_Logger::log_post_error( $site->ID, $status = 'end_auto_retry', $message = sprintf( __( 'Failed %d times to reconnect to %s', 'push-syndication' ), $site_auto_retry_count, $site_url ), $log_time, $extra = array() );
+				Syndication_Logger::log_post_error(
+					$site->ID,
+					'end_auto_retry',
+					sprintf(
+						esc_html__( 'Failed %1$d times to reconnect to %2$s', 'push-syndication' ),
+						$site_auto_retry_count,
+						$site_url
+					),
+					$log_time,
+					array()
+				);
 			}
 		}
 	}
@@ -133,13 +152,14 @@ public function handle_pull_failure_event( $site_id = 0, $failed_attempts = 0 )
 	/**
 	 * Handle a site pull success event
 	 *
-	 * @param $site_id         int    The post id of the site which just successfully pulled
-	 * @param $failed_attempts int    The number of pull failures this site has experienced
-	 * @return null
+	 * @param int $site_id             The post id of the site which just successfully pulled.
+	 * @param int $failed_attempts    The number of pull failures this site has experienced.
+	 *
+	 * @return void
 	 */
 	public function handle_pull_success_event( $site_id = 0, $failed_attempts = 0 ) {
 
 		// Remove the auto retry if there was one
 		delete_post_meta( $site_id, 'syn_failed_auto_retry_attempts' );
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/class-syndication-site-failure-monitor.php b/includes/class-syndication-site-failure-monitor.php
index 28b54758..207c3954 100644
--- a/includes/class-syndication-site-failure-monitor.php
+++ b/includes/class-syndication-site-failure-monitor.php
@@ -19,8 +19,8 @@ public function __construct() {
 	/**
 	 * Handle the pull failure event. If the number of failures exceeds the maximum attempts set in the options, then disable the site.
 	 *
-	 * @param $site_id
-	 * @param $count
+	 * @param int $site_id The site id.
+	 * @param int $count   The number of attempts.
 	 */
 	public function handle_pull_failure_event( $site_id, $count ) {
 		$site_id = (int) $site_id;
@@ -36,10 +36,20 @@ public function handle_pull_failure_event( $site_id, $count ) {
 			update_post_meta( $site_id, 'syn_site_enabled', false );
 
 			// Reset the event counter.
+
 			do_action( 'push_syndication_reset_event', 'pull_failure', $site_id );
 
 			// Log what happened.
-			Syndication_Logger::log_post_error( $site_id, 'error', sprintf( __( 'Site %d disabled after %d pull failure(s).', 'push-syndication' ), (int) $site_id, (int) $count ) );
+			Syndication_Logger::log_post_error(
+				$site_id,
+				'error',
+				sprintf(
+					__( 'Site %1$d disabled after %2$d pull failure(s).', 'push-syndication' ),
+					(int) $site_id,
+					(int) $count
+				)
+			);
+
 
 			do_action( 'push_syndication_site_disabled', $site_id, $count );
 		}
diff --git a/includes/class-syndication-wp-rest-client.php b/includes/class-syndication-wp-rest-client.php
index c24958d0..29f5777b 100644
--- a/includes/class-syndication-wp-rest-client.php
+++ b/includes/class-syndication-wp-rest-client.php
@@ -1,63 +1,86 @@
 <?php
 
-include_once(dirname(__FILE__) . '/interface-syndication-client.php');
-include_once( dirname( __FILE__ ) . '/push-syndicate-encryption.php' );
+require_once dirname( __FILE__ ) . '/interface-syndication-client.php';
+require_once dirname( __FILE__ ) . '/push-syndicate-encryption.php';
 
+/**
+ * Class Syndication_WP_REST_Client
+ */
 class Syndication_WP_REST_Client implements Syndication_Client {
 
 	private $access_token;
-	private $blog_ID;
+	private $blog_id;
 
 	private $port;
 	private $useragent;
 	private $timeout;
 
-	function __construct( $site_ID, $port = 80, $timeout = 45 ) {
-
-		$this->access_token = push_syndicate_decrypt( get_post_meta( $site_ID, 'syn_site_token', true) );
-		$this->blog_ID	  = get_post_meta( $site_ID, 'syn_site_id', true);
-		$this->timeout	  = $timeout;
-		$this->useragent	= 'push-syndication-plugin';
-		$this->port		 = $port;
-
+	/**
+	 * Syndication_WP_REST_Client constructor.
+	 *
+	 * @param int	  $site_id
+	 * @param int     $port
+	 * @param int     $timeout
+	 */
+	public function __construct( $site_id, $port = 80, $timeout = 45 ) {
+		$this->access_token = push_syndicate_decrypt( get_post_meta( $site_id, 'syn_site_token', true ) );
+		$this->blog_id      = get_post_meta( $site_id, 'syn_site_id', true );
+		$this->timeout      = $timeout;
+		$this->useragent    = 'push-syndication-plugin';
+		$this->port         = $port;
 	}
 
+	/**
+	 * @return array
+	 */
 	public static function get_client_data() {
-		return array( 'id' => 'WP_REST', 'modes' => array( 'push' ), 'name' => 'WordPress.com REST' );
+		return array(
+			'id'    => 'WP_REST',
+			'modes' => array( 'push' ),
+			'name'  => 'WordPress.com REST',
+		);
 	}
-	
-	public function new_post( $post_ID ) {
-
-		$post = (array)get_post( $post_ID );
 
-		// This filter can be used to exclude or alter posts during a content push
-		$post = apply_filters( 'syn_rest_push_filter_new_post', $post, $post_ID );
-		if ( false === $post )
+	/**
+	 * @param int $post_id
+	 *
+	 * @return array|bool|WP_Error
+	 */
+	public function new_post( $post_id ) {
+		$post = (array) get_post( $post_id );
+
+		// This filter can be used to exclude or alter posts during a content push.
+		$post = apply_filters( 'syn_rest_push_filter_new_post', $post, $post_id );
+		if ( false === $post ) {
 			return true;
+		}
 
-		$body = array (
-			'title'		 => $post['post_title'],
-			'content'	   => $post['post_content'],
-			'excerpt'	   => $post['post_excerpt'],
-			'status'		=> $post['post_status'],
-			'password'	  => $post['post_password'],
-			'date'		  => $post['post_date_gmt'],
-			'categories'	=> $this->_prepare_terms( wp_get_object_terms( $post_ID, 'category', array('fields' => 'names') ) ),
-			'tags'		  => $this->_prepare_terms( wp_get_object_terms( $post_ID, 'post_tag', array('fields' => 'names') ) )
+		$body = array(
+			'title'      => $post['post_title'],
+			'content'    => $post['post_content'],
+			'excerpt'    => $post['post_excerpt'],
+			'status'     => $post['post_status'],
+			'password'   => $post['post_password'],
+			'date'       => $post['post_date_gmt'],
+			'categories' => $this->prepare_terms( wp_get_object_terms( $post_id, 'category', array( 'fields' => 'names' ) ) ),
+			'tags'       => $this->prepare_terms( wp_get_object_terms( $post_id, 'post_tag', array( 'fields' => 'names' ) ) ),
 		);
 
-		$body = apply_filters( 'syn_rest_push_filter_new_post_body', $body, $post_ID );
-
-		$response = wp_remote_post( 'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_ID . '/posts/new/', array(
-			'timeout'	   => $this->timeout,
-			'user-agent'	=> $this->useragent,
-			'sslverify'	 => false,
-			'headers'	   => array (
-				'authorization' => 'Bearer ' . $this->access_token,
-				'Content-Type'  => 'application/x-www-form-urlencoded'
-			),
-			'body' => $body,
-		) );
+		$body = apply_filters( 'syn_rest_push_filter_new_post_body', $body, $post_id );
+
+		$response = wp_remote_post(
+			'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_id . '/posts/new/',
+			array(
+				'timeout'    => $this->timeout,
+				'user-agent' => $this->useragent,
+				'sslverify'  => false,
+				'headers'    => array(
+					'authorization' => 'Bearer ' . $this->access_token,
+					'Content-Type'  => 'application/x-www-form-urlencoded',
+				),
+				'body'       => $body,
+			)
+		);
 
 		if ( is_wp_error( $response ) ) {
 			return $response;
@@ -65,46 +88,54 @@ public function new_post( $post_ID ) {
 
 		$response = json_decode( wp_remote_retrieve_body( $response ) );
 
-		if( empty( $response->error ) ) {
+		if ( empty( $response->error ) ) {
 			return $response->ID;
 		} else {
 			return new WP_Error( 'rest-push-new-fail', $response->message );
 		}
-
 	}
 
-	public function edit_post( $post_ID, $ext_ID ) {
-
-		$post = (array)get_post( $post_ID );
-
-		// This filter can be used to exclude or alter posts during a content push
-		$post = apply_filters( 'syn_rest_push_filter_edit_post', $post, $post_ID );
-		if ( false === $post )
+	/**
+	 * @param int $post_id
+	 * @param int $ext_id
+	 *
+	 * @return array|bool|int|WP_Error
+	 */
+	public function edit_post( $post_id, $ext_id ) {
+		$post = (array) get_post( $post_id );
+
+		// This filter can be used to exclude or alter posts during a content push.
+		$post = apply_filters( 'syn_rest_push_filter_edit_post', $post, $post_id );
+		if ( false === $post ) {
 			return true;
+		}
 
-		$body = array (
-			'title'		 => $post['post_title'],
-			'content'	   => $post['post_content'],
-			'excerpt'	   => $post['post_excerpt'],
-			'status'		=> $post['post_status'],
-			'password'	  => $post['post_password'],
-			'date'		  => $post['post_date_gmt'],
-			'categories'	=> $this->_prepare_terms( wp_get_object_terms( $post_ID, 'category', array('fields' => 'names') ) ),
-			'tags'		  => $this->_prepare_terms( wp_get_object_terms( $post_ID, 'post_tag', array('fields' => 'names') ) )
+		$body = array(
+			'title'      => $post['post_title'],
+			'content'    => $post['post_content'],
+			'excerpt'    => $post['post_excerpt'],
+			'status'     => $post['post_status'],
+			'password'   => $post['post_password'],
+			'date'       => $post['post_date_gmt'],
+			'categories' => $this->prepare_terms( wp_get_object_terms( $post_id, 'category', array( 'fields' => 'names' ) ) ),
+			'tags'       => $this->prepare_terms( wp_get_object_terms( $post_id, 'post_tag', array( 'fields' => 'names' ) ) ),
 		);
 
-		$body = apply_filters( 'syn_rest_push_filter_edit_post_body', $body, $post_ID );
-
-		$response = wp_remote_post( 'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_ID . '/posts/' . $ext_ID . '/', array(
-			'timeout'	   => $this->timeout,
-			'user-agent'	=> $this->useragent,
-			'sslverify'	 => false,
-			'headers'	   => array (
-				'authorization' => 'Bearer ' . $this->access_token,
-				'Content-Type'  => 'application/x-www-form-urlencoded'
-			),
-			'body' => $body,
-		) );
+		$body = apply_filters( 'syn_rest_push_filter_edit_post_body', $body, $post_id );
+
+		$response = wp_remote_post(
+			'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_id . '/posts/' . $ext_id . '/',
+			array(
+				'timeout'    => $this->timeout,
+				'user-agent' => $this->useragent,
+				'sslverify'  => false,
+				'headers'    => array(
+					'authorization' => 'Bearer ' . $this->access_token,
+					'Content-Type'  => 'application/x-www-form-urlencoded',
+				),
+				'body'       => $body,
+			)
+		);
 
 		if ( is_wp_error( $response ) ) {
 			return $response;
@@ -112,37 +143,47 @@ public function edit_post( $post_ID, $ext_ID ) {
 
 		$response = json_decode( wp_remote_retrieve_body( $response ) );
 
-		if( empty( $response->error ) ) {
-			return $post_ID;
+		if ( empty( $response->error ) ) {
+			return $post_id;
 		} else {
 			return new WP_Error( 'rest-push-edit-fail', $response->message );
 		}
-
 	}
 
-	// get an array of values and convert it to CSV
-	function _prepare_terms( $terms ) {
-
+	/**
+	 * Get an array of values and convert it to CSV
+	 *
+	 * @param $terms
+	 *
+	 * @return string
+	 */
+	private function prepare_terms( $terms ) {
 		$terms_csv = '';
 
-		foreach( $terms as $term ) {
+		foreach ( $terms as $term ) {
 			$terms_csv .= $term . ',';
 		}
 
 		return $terms_csv;
-
 	}
 
-	public function delete_post( $ext_ID ) {
-
-		$response = wp_remote_post( 'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_ID . '/posts/' . $ext_ID . '/delete', array(
-			'timeout'	   => $this->timeout,
-			'user-agent'	=> $this->useragent,
-			'sslverify'	 => false,
-			'headers'	   => array (
-				'authorization' => 'Bearer ' . $this->access_token,
-			),
-		) );
+	/**
+	 * @param int $ext_id
+	 *
+	 * @return array|bool|WP_Error
+	 */
+	public function delete_post( $ext_id ) {
+		$response = wp_remote_post(
+			'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_id . '/posts/' . $ext_id . '/delete',
+			array(
+				'timeout'    => $this->timeout,
+				'user-agent' => $this->useragent,
+				'sslverify'  => false,
+				'headers'    => array(
+					'authorization' => 'Bearer ' . $this->access_token,
+				),
+			)
+		);
 
 		if ( is_wp_error( $response ) ) {
 			return $response;
@@ -150,50 +191,61 @@ public function delete_post( $ext_ID ) {
 
 		$response = json_decode( wp_remote_retrieve_body( $response ) );
 
-		if( empty( $response->error ) ) {
+		if ( empty( $response->error ) ) {
 			return true;
 		} else {
 			return new WP_Error( 'rest-push-delete-fail', $response->message );
 		}
-
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function test_connection() {
 		// @TODo find a better method
-		$response = wp_remote_get( 'https://public-api.wordpress.com/rest/v1/me/?pretty=1', array(
-			'timeout'	   => $this->timeout,
-			'user-agent'	=> $this->useragent,
-			'sslverify'	 => false,
-			'headers'	   => array (
-				'authorization' => 'Bearer ' . $this->access_token,
-			),
-		) );
-
-		// TODO: return WP_Error
+		$response = wp_remote_get(
+			'https://public-api.wordpress.com/rest/v1/me/?pretty=1',
+			array(
+				'timeout'    => $this->timeout,
+				'user-agent' => $this->useragent,
+				'sslverify'  => false,
+				'headers'    => array(
+					'authorization' => 'Bearer ' . $this->access_token,
+				),
+			)
+		);
+
+		// TODO: return WP_Error.
 		if ( is_wp_error( $response ) ) {
 			return false;
 		}
 
 		$response = json_decode( wp_remote_retrieve_body( $response ) );
 
-		if( empty( $response->error ) ) {
+		if ( empty( $response->error ) ) {
 			return true;
 		} else {
 			return false;
 		}
-
 	}
 
-	public function is_post_exists( $post_ID ) {
-
-		$response = wp_remote_get( 'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_ID . '/posts/' . $post_ID . '/?pretty=1', array(
-			'timeout'	   => $this->timeout,
-			'user-agent'	=> $this->useragent,
-			'sslverify'	 => false,
-			'headers'	   => array (
-				'authorization' => 'Bearer ' . $this->access_token,
-			),
-		) );
+	/**
+	 * @param int $post_id
+	 *
+	 * @return bool
+	 */
+	public function is_post_exists( $post_id ) {
+		$response = wp_remote_get( //phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.wp_remote_get_wp_remote_get
+			'https://public-api.wordpress.com/rest/v1/sites/' . $this->blog_id . '/posts/' . $post_id . '/?pretty=1',
+			array(
+				'timeout'    => $this->timeout,
+				'user-agent' => $this->useragent,
+				'sslverify'  => false,
+				'headers'    => array(
+					'authorization' => 'Bearer ' . $this->access_token,
+				),
+			)
+		);
 
 		if ( is_wp_error( $response ) ) {
 			return false;
@@ -201,19 +253,20 @@ public function is_post_exists( $post_ID ) {
 
 		$response = json_decode( wp_remote_retrieve_body( $response ) );
 
-		if( empty($response->error) ) {
+		if ( empty( $response->error ) ) {
 			return true;
 		} else {
 			return false;
 		}
-
 	}
 
+	/**
+	 * @param object $site
+	 */
 	public static function display_settings( $site ) {
-
-		$site_token = push_syndicate_decrypt( get_post_meta( $site->ID, 'syn_site_token', true) );
-		$site_id	= get_post_meta( $site->ID, 'syn_site_id', true);
-		$site_url   = get_post_meta( $site->ID, 'syn_site_url', true);
+		$site_token = push_syndicate_decrypt( get_post_meta( $site->ID, 'syn_site_token', true ) );
+		$site_id    = get_post_meta( $site->ID, 'syn_site_id', true );
+		$site_url   = get_post_meta( $site->ID, 'syn_site_url', true );
 
 		// @TODO refresh UI
 
@@ -221,7 +274,7 @@ public static function display_settings( $site ) {
 
 		<p>
 			<?php echo esc_html__( 'To generate the following information automatically please visit the ', 'push-syndication' ); ?>
-			<a href="<?php echo get_admin_url(); ?>/options-general.php?page=push-syndicate-settings" target="_blank"><?php echo esc_html__( 'settings page', 'push-syndication' ); ?></a>
+			<a href="<?php echo esc_url( get_admin_url() ); ?>/options-general.php?page=push-syndicate-settings" target="_blank"><?php echo esc_html__( 'settings page', 'push-syndication' ); ?></a>
 		</p>
 		<p>
 			<label for=site_token><?php echo esc_html__( 'Enter API Token', 'push-syndication' ); ?></label>
@@ -247,23 +300,41 @@ public static function display_settings( $site ) {
 		do_action( 'syn_after_site_form', $site );
 	}
 
-	public static function save_settings( $site_ID ) {
-
-		update_post_meta( $site_ID, 'syn_site_token', push_syndicate_encrypt( sanitize_text_field( $_POST['site_token'] ) ) );
-		update_post_meta( $site_ID, 'syn_site_id', sanitize_text_field( $_POST['site_id'] ) );
-		update_post_meta( $site_ID, 'syn_site_url', sanitize_text_field( $_POST['site_url'] ) );
+	/**
+	 * @param int $site_id
+	 *
+	 * @return bool
+	 */
+	public static function save_settings( $site_id ) {
+		// @TODO: nonce validation
 
+		if ( isset( $_POST['site_token'] ) ) {
+			update_post_meta( $site_id, 'syn_site_token', push_syndicate_encrypt( sanitize_text_field( $_POST['site_token'] ) ) );
+		}
+		if ( isset( $_POST['site_id'] ) ) {
+			update_post_meta( $site_id, 'syn_site_id', sanitize_text_field( $_POST['site_id'] ) );
+		}
+		if ( isset( $_POST['site_url'] ) ) {
+			update_post_meta( $site_id, 'syn_site_url', sanitize_text_field( $_POST['site_url'] ) );
+		}
 		return true;
-
 	}
 
-	public function get_post( $ext_ID )
-	{
+	/**
+	 * @param int $ext_id
+	 *
+	 * @return bool|void
+	 */
+	public function get_post( $ext_id ) {
 		// TODO: Implement get_post() method.
 	}
 
-	public function get_posts( $args = array() )
-	{
+	/**
+	 * @param array $args
+	 *
+	 * @return bool|void
+	 */
+	public function get_posts( $args = array() ) {
 		// TODO: Implement get_posts() method.
 	}
 }
diff --git a/includes/class-syndication-wp-rss-client.php b/includes/class-syndication-wp-rss-client.php
index f10d188c..6526177c 100644
--- a/includes/class-syndication-wp-rss-client.php
+++ b/includes/class-syndication-wp-rss-client.php
@@ -1,8 +1,11 @@
 <?php
 
-include_once( ABSPATH . 'wp-includes/class-simplepie.php' );
-include_once( dirname(__FILE__) . '/interface-syndication-client.php' );
+require_once ABSPATH . 'wp-includes/class-simplepie.php';
+require_once dirname( __FILE__ ) . '/interface-syndication-client.php';
 
+/**
+ * Class Syndication_WP_RSS_Client
+ */
 class Syndication_WP_RSS_Client extends SimplePie implements Syndication_Client {
 
 	private $default_post_type;
@@ -11,17 +14,19 @@ class Syndication_WP_RSS_Client extends SimplePie implements Syndication_Client
 	private $default_ping_status;
 	private $default_cat_status;
 
-	private $site_ID;
+	private $site_id;
 
-	function __construct( $site_ID ) {
-
-		switch( SIMPLEPIE_VERSION ) {
+	/**
+	 * Syndication_WP_RSS_Client constructor.
+	 *
+	 * @param int $site_id
+	 */
+	public function __construct( $site_id ) {
+		switch ( SIMPLEPIE_VERSION ) {
 			case '1.2.1':
-				parent::SimplePie();
+				parent::SimplePie(); // phpcs:ignore
 				break;
 			case '1.3':
-				parent::__construct();
-				break;
 			default:
 				parent::__construct();
 				break;
@@ -29,17 +34,17 @@ function __construct( $site_ID ) {
 
 		parent::__construct();
 
-		$this->site_ID = $site_ID;
+		$this->site_id = $site_id;
+
+		$this->set_feed_url( get_post_meta( $site_id, 'syn_feed_url', true ) );
 
-		$this->set_feed_url( get_post_meta( $site_ID, 'syn_feed_url', true ) );
-		
 		$this->set_cache_class( 'WP_Feed_Cache' );
 
-		$this->default_post_type        = get_post_meta( $site_ID, 'syn_default_post_type', true );
-		$this->default_post_status      = get_post_meta( $site_ID, 'syn_default_post_status', true );
-		$this->default_comment_status   = get_post_meta( $site_ID, 'syn_default_comment_status', true );
-		$this->default_ping_status      = get_post_meta( $site_ID, 'syn_default_ping_status', true );
-		$this->default_cat_status       = get_post_meta( $site_ID, 'syn_default_cat_status', true );
+		$this->default_post_type      = get_post_meta( $site_id, 'syn_default_post_type', true );
+		$this->default_post_status    = get_post_meta( $site_id, 'syn_default_post_status', true );
+		$this->default_comment_status = get_post_meta( $site_id, 'syn_default_comment_status', true );
+		$this->default_ping_status    = get_post_meta( $site_id, 'syn_default_ping_status', true );
+		$this->default_cat_status     = get_post_meta( $site_id, 'syn_default_cat_status', true );
 
 		add_action( 'syn_post_pull_new_post', array( __CLASS__, 'save_meta' ), 10, 5 );
 		add_action( 'syn_post_pull_new_post', array( __CLASS__, 'save_tax' ), 10, 5 );
@@ -48,21 +53,25 @@ function __construct( $site_ID ) {
 	}
 
 	public static function get_client_data() {
-		return array( 'id' => 'WP_RSS', 'modes' => array( 'pull' ), 'name' => 'RSS' );
+		return array(
+			'id'    => 'WP_RSS',
+			'modes' => array( 'pull' ),
+			'name'  => 'RSS',
+		);
 	}
 
-	public function new_post($post_ID) {
-		// Not supported
+	public function new_post( $post_id ) {
+		// Not supported.
 		return false;
 	}
 
-	public function edit_post($post_ID, $ext_ID) {
-		// Not supported
+	public function edit_post( $post_id, $ext_id ) {
+		// Not supported.
 		return false;
 	}
 
-	public function delete_post($ext_ID) {
-		// Not supported
+	public function delete_post( $ext_id ) {
+		// Not supported.
 		return false;
 	}
 
@@ -71,19 +80,18 @@ public function test_connection() {
 		return true;
 	}
 
-	public function is_post_exists($ext_ID) {
-		// Not supported
+	public function is_post_exists( $ext_id ) {
+		// Not supported.
 		return false;
 	}
 
-	public static function display_settings($site) {
-
-		$feed_url                   = get_post_meta( $site->ID, 'syn_feed_url', true );
-		$default_post_type          = get_post_meta( $site->ID, 'syn_default_post_type', true );
-		$default_post_status        = get_post_meta( $site->ID, 'syn_default_post_status', true );
-		$default_comment_status     = get_post_meta( $site->ID, 'syn_default_comment_status', true );
-		$default_ping_status        = get_post_meta( $site->ID, 'syn_default_ping_status', true );
-		$default_cat_status         = get_post_meta( $site->ID, 'syn_default_cat_status', true );
+	public static function display_settings( $site ) {
+		$feed_url               = get_post_meta( $site->ID, 'syn_feed_url', true );
+		$default_post_type      = get_post_meta( $site->ID, 'syn_default_post_type', true );
+		$default_post_status    = get_post_meta( $site->ID, 'syn_default_post_status', true );
+		$default_comment_status = get_post_meta( $site->ID, 'syn_default_comment_status', true );
+		$default_ping_status    = get_post_meta( $site->ID, 'syn_default_ping_status', true );
+		$default_cat_status     = get_post_meta( $site->ID, 'syn_default_cat_status', true );
 
 		?>
 
@@ -103,8 +111,8 @@ public static function display_settings($site) {
 
 			$post_types = get_post_types();
 
-			foreach( $post_types as $post_type ) {
-				echo '<option value="' . esc_attr( $post_type ) . '"' . selected( $post_type, $default_post_type ) . '>' . esc_html( $post_type )  . '</option>';
+			foreach ( $post_types as $post_type ) {
+				echo '<option value="' . esc_attr( $post_type ) . '"' . selected( $post_type, $default_post_type ) . '>' . esc_html( $post_type ) . '</option>';
 			}
 
 			?>
@@ -119,10 +127,10 @@ public static function display_settings($site) {
 
 			<?php
 
-			$post_statuses  = get_post_statuses();
+			$post_statuses = get_post_statuses();
 
-			foreach( $post_statuses as $key => $value ) {
-				echo '<option value="' . esc_attr( $key ) . '"' . selected( $key, $default_post_status ) . '>' . esc_html( $key )  . '</option>';
+			foreach ( $post_statuses as $key => $value ) {
+				echo '<option value="' . esc_attr( $key ) . '"' . selected( $key, $default_post_status ) . '>' . esc_html( $key ) . '</option>';
 			}
 
 			?>
@@ -134,8 +142,8 @@ public static function display_settings($site) {
 		</p>
 		<p>
 			<select name="default_comment_status" id="default_comment_status" />
-				<option value="open" <?php selected( 'open', $default_comment_status )  ?> >open</option>
-				<option value="closed" <?php selected( 'closed', $default_comment_status )  ?> >closed</option>
+				<option value="open" <?php selected( 'open', $default_comment_status ); ?> >open</option>
+				<option value="closed" <?php selected( 'closed', $default_comment_status ); ?> >closed</option>
 			</select>
 		</p>
 		<p>
@@ -143,8 +151,8 @@ public static function display_settings($site) {
 		</p>
 		<p>
 			<select name="default_ping_status" id="default_ping_status" />
-			<option value="open" <?php selected( 'open', $default_ping_status )  ?> >open</option>
-			<option value="closed" <?php selected( 'closed', $default_ping_status )  ?> >closed</option>
+			<option value="open" <?php selected( 'open', $default_ping_status ); ?> >open</option>
+			<option value="closed" <?php selected( 'closed', $default_ping_status ); ?> >closed</option>
 			</select>
 		</p>
 		<p>
@@ -152,8 +160,8 @@ public static function display_settings($site) {
 		</p>
 		<p>
 			<select name="default_cat_status" id="default_cat_status" />
-			<option value="yes" <?php selected( 'yes', $default_cat_status )  ?> ><?php echo esc_html__( 'import categories', 'push-syndication' ); ?></option>
-			<option value="no" <?php selected( 'no', $default_cat_status )  ?> ><?php echo esc_html__( 'ignore categories', 'push-syndication' ); ?></option>
+			<option value="yes" <?php selected( 'yes', $default_cat_status ); ?> ><?php echo esc_html__( 'import categories', 'push-syndication' ); ?></option>
+			<option value="no" <?php selected( 'no', $default_cat_status ); ?> ><?php echo esc_html__( 'ignore categories', 'push-syndication' ); ?></option>
 			</select>
 		</p>
 
@@ -162,84 +170,99 @@ public static function display_settings($site) {
 		do_action( 'syn_after_site_form', $site );
 	}
 
-	public static function save_settings( $site_ID ) {
-
-		update_post_meta( $site_ID, 'syn_feed_url', esc_url_raw( $_POST['feed_url'] ) );
-		update_post_meta( $site_ID, 'syn_default_post_type', sanitize_text_field( $_POST['default_post_type'] ) );
-		update_post_meta( $site_ID, 'syn_default_post_status', sanitize_text_field( $_POST['default_post_status'] ) );
-		update_post_meta( $site_ID, 'syn_default_comment_status', sanitize_text_field($_POST['default_comment_status'] ) );
-		update_post_meta( $site_ID, 'syn_default_ping_status', sanitize_text_field( $_POST['default_ping_status'] ) );
-		update_post_meta( $site_ID, 'syn_default_cat_status', sanitize_text_field( $_POST['default_cat_status'] ) );
+	public static function save_settings( $site_id ) {
+		// @TODO: add nonces
+		update_post_meta( $site_id, 'syn_feed_url', esc_url_raw( isset( $_POST['feed_url'] ) ? $_POST['feed_url'] : '' ) );
+		update_post_meta( $site_id, 'syn_default_post_type', sanitize_text_field( isset( $_POST['default_post_type'] ) ? $_POST['default_post_type'] : '' ) );
+		update_post_meta( $site_id, 'syn_default_post_status', sanitize_text_field( isset( $_POST['default_post_status'] ) ? $_POST['default_post_status'] : '' ) );
+		update_post_meta( $site_id, 'syn_default_comment_status', sanitize_text_field( isset( $_POST['default_comment_status'] ) ? $_POST['default_comment_status'] : '' ) );
+		update_post_meta( $site_id, 'syn_default_ping_status', sanitize_text_field( isset( $_POST['default_ping_status'] ) ? $_POST['default_ping_status'] : '' ) );
+		update_post_meta( $site_id, 'syn_default_cat_status', sanitize_text_field( isset( $_POST['default_cat_status'] ) ? $_POST['default_ping_status'] : '' ) );
 		return true;
-
 	}
 
-	public function get_post( $ext_ID ) {
+	public function get_post( $ext_id ) {
 		// TODO: Implement get_post() method.
 	}
 
 	public function get_posts( $args = array() ) {
-
-		$site_post = get_post( $this->site_ID );
+		$site_post = get_post( $this->site_id );
 
 		$rss_init = $this->init();
 
 		if ( false === $rss_init ) {
-			Syndication_Logger::log_post_error( $this->site_ID, $status = 'error', $message = sprintf( __( 'Failed to parse feed at: %s', 'push-syndication' ), $this->feed_url ), $log_time = isset( $site_post->postmeta['is_update'] ) ? $site_post->postmeta['is_update'] : null, $extra = array( 'error' => $this->error() ) );
+			Syndication_Logger::log_post_error(
+				$this->site_id,
+				$status   = 'error',
+				$message  = sprintf( __( 'Failed to parse feed at: %s', 'push-syndication' ), $this->feed_url ),
+				$log_time = isset( $site_post->postmeta['is_update'] ) ? $site_post->postmeta['is_update'] : null,
+				$extra    = array( 'error' => $this->error() )
+			);
 
 			// Track the event.
-			do_action( 'push_syndication_event', 'pull_failure', $this->site_ID );
+			do_action( 'push_syndication_event', 'pull_failure', $this->site_id );
 		} else {
-			Syndication_Logger::log_post_info( $this->site_ID, $status = 'fetch_feed', $message = sprintf( __( 'fetched feed with %d bytes', 'push-syndication' ), strlen( $this->get_raw_data() ) ), $log_time = null, $extra = array() );
+			Syndication_Logger::log_post_info(
+				$this->site_id,
+				$status   = 'fetch_feed',
+				$message  = sprintf( __( 'fetched feed with %d bytes', 'push-syndication' ), strlen( $this->get_raw_data() ) ),
+				$log_time = null,
+				$extra    = array()
+			);
 
 			// Track the event.
-			do_action( 'push_syndication_event', 'pull_success', $this->site_ID );
+			do_action( 'push_syndication_event', 'pull_success', $this->site_id );
 		}
 
 		$this->handle_content_type();
 
-		// hold all the posts
-		$posts = array();
-		$taxonomy = array( 'cats' => array(), 'tags' => array() );
+		// hold all the posts.
+		$posts    = array();
+		$taxonomy = array(
+			'cats' => array(),
+			'tags' => array(),
+		);
 
-		foreach( $this->get_items() as $item ) {
+		foreach ( $this->get_items() as $item ) {
 			if ( 'yes' == $this->default_cat_status ) {
 				$taxonomy = $this->set_taxonomy( $item );
 			}
 
 			$post = array(
-				'post_title'        => $item->get_title(),
-				'post_content'      => $item->get_content(),
-				'post_excerpt'      => $item->get_description(),
-				'post_type'         => $this->default_post_type,
-				'post_status'       => $this->default_post_status,
-				'post_date'         => date( 'Y-m-d H:i:s', strtotime( $item->get_date() ) ),
-				'comment_status'    => $this->default_comment_status,
-				'ping_status'       => $this->default_ping_status,
-				'post_guid'         => $item->get_id(),
-				'post_category'     => $taxonomy['cats'],
-				'tags_input'        => $taxonomy['tags']
+				'post_title'     => $item->get_title(),
+				'post_content'   => $item->get_content(),
+				'post_excerpt'   => $item->get_description(),
+				'post_type'      => $this->default_post_type,
+				'post_status'    => $this->default_post_status,
+				'post_date'      => gmdate( 'Y-m-d H:i:s', strtotime( $item->get_date() ) ),
+				'comment_status' => $this->default_comment_status,
+				'ping_status'    => $this->default_ping_status,
+				'post_guid'      => $item->get_id(),
+				'post_category'  => $taxonomy['cats'],
+				'tags_input'     => $taxonomy['tags'],
 			);
-			// This filter can be used to exclude or alter posts during a pull import
+			// This filter can be used to exclude or alter posts during a pull import.
 			$post = apply_filters( 'syn_rss_pull_filter_post', $post, $args, $item );
-			if ( false === $post )
+
+			if ( false === $post ) {
 				continue;
+			}
+
 			$posts[] = $post;
 		}
 
 		return $posts;
-
 	}
 
 	public function set_taxonomy( $item ) {
 		$cats = $item->get_categories();
-		$ids = array(
-			'cats'    => array(),
-			'tags'            => array()
+		$ids  = array(
+			'cats' => array(),
+			'tags' => array(),
 		);
 
 		foreach ( $cats as $cat ) {
-			// checks if term exists
+			// checks if term exists.
 			if ( $result = get_term_by( 'name', $cat->term, 'category' ) ) {
 				if ( isset( $result->term_id ) ) {
 					$ids['cats'][] = $result->term_id;
@@ -249,7 +272,7 @@ public function set_taxonomy( $item ) {
 					$ids['tags'][] = $result->term_id;
 				}
 			} else {
-				// creates if not
+				// creates if not.
 				$result = wp_insert_term( $cat->term, 'category' );
 				if ( isset( $result->term_id ) ) {
 					$ids['cats'][] = $result->term_id;
@@ -257,7 +280,7 @@ public function set_taxonomy( $item ) {
 			}
 		}
 
-		// returns array ready for post creation
+		// returns array ready for post creation.
 		return $ids;
 	}
 
@@ -266,28 +289,28 @@ public static function save_meta( $result, $post, $site, $transport_type, $clien
 			return false;
 		}
 		$categories = $post['post_category'];
-		wp_set_post_terms($result, $categories, 'category', true);
+		wp_set_post_terms( $result, $categories, 'category', true );
 		$metas = $post['postmeta'];
 
-		//handle enclosures separately first
-		$enc_field = isset( $metas['enc_field'] ) ? $metas['enc_field'] : null;
+		// handle enclosures separately first.
+		$enc_field  = isset( $metas['enc_field'] ) ? $metas['enc_field'] : null;
 		$enclosures = isset( $metas['enclosures'] ) ? $metas['enclosures'] : null;
-		if ( isset( $enclosures ) && isset ( $enc_field ) ) {
-			// first remove all enclosures for the post (for updates) if any
-			delete_post_meta( $result, $enc_field);
-			foreach( $enclosures as $enclosure ) {
-				if (defined('ENCLOSURES_AS_STRINGS') && constant('ENCLOSURES_AS_STRINGS')) {
-					$enclosure = implode("\n", $enclosure);
+		if ( isset( $enclosures ) && isset( $enc_field ) ) {
+			// first remove all enclosures for the post (for updates) if any.
+			delete_post_meta( $result, $enc_field );
+			foreach ( $enclosures as $enclosure ) {
+				if ( defined( 'ENCLOSURES_AS_STRINGS' ) && constant( 'ENCLOSURES_AS_STRINGS' ) ) {
+					$enclosure = implode( "\n", $enclosure );
 				}
-				add_post_meta($result, $enc_field, $enclosure, false);
+				add_post_meta( $result, $enc_field, $enclosure, false );
 			}
 
-			// now remove them from the rest of the metadata before saving the rest
-			unset($metas['enclosures']);
+			// now remove them from the rest of the metadata before saving the rest.
+			unset( $metas['enclosures'] );
 		}
 
-		foreach ($metas as $meta_key => $meta_value) {
-			add_post_meta($result, $meta_key, $meta_value, true);
+		foreach ( $metas as $meta_key => $meta_value ) {
+			add_post_meta( $result, $meta_key, $meta_value, true );
 		}
 	}
 
@@ -296,28 +319,28 @@ public static function update_meta( $result, $post, $site, $transport_type, $cli
 			return false;
 		}
 		$categories = $post['post_category'];
-		wp_set_post_terms($result, $categories, 'category', true);
+		wp_set_post_terms( $result, $categories, 'category', true );
 		$metas = $post['postmeta'];
 
-		// handle enclosures separately first
-		$enc_field = isset( $metas['enc_field'] ) ? $metas['enc_field'] : null;
+		// handle enclosures separately first.
+		$enc_field  = isset( $metas['enc_field'] ) ? $metas['enc_field'] : null;
 		$enclosures = isset( $metas['enclosures'] ) ? $metas['enclosures'] : null;
 		if ( isset( $enclosures ) && isset( $enc_field ) ) {
-			// first remove all enclosures for the post (for updates)
-			delete_post_meta( $result, $enc_field);
-			foreach( $enclosures as $enclosure ) {
-				if (defined('ENCLOSURES_AS_STRINGS') && constant('ENCLOSURES_AS_STRINGS')) {
-					$enclosure = implode("\n", $enclosure);
+			// first remove all enclosures for the post (for updates).
+			delete_post_meta( $result, $enc_field );
+			foreach ( $enclosures as $enclosure ) {
+				if ( defined( 'ENCLOSURES_AS_STRINGS' ) && constant( 'ENCLOSURES_AS_STRINGS' ) ) {
+					$enclosure = implode( "\n", $enclosure );
 				}
-				add_post_meta($result, $enc_field, $enclosure, false);
+				add_post_meta( $result, $enc_field, $enclosure, false );
 			}
 
-			// now remove them from the rest of the metadata before saving the rest
-			unset($metas['enclosures']);
+			// now remove them from the rest of the metadata before saving the rest.
+			unset( $metas['enclosures'] );
 		}
 
-		foreach ($metas as $meta_key => $meta_value) {
-			update_post_meta($result, $meta_key, $meta_value);
+		foreach ( $metas as $meta_key => $meta_value ) {
+			update_post_meta( $result, $meta_key, $meta_value );
 		}
 	}
 
@@ -327,11 +350,11 @@ public static function save_tax( $result, $post, $site, $transport_type, $client
 		}
 		$taxonomies = $post['tax'];
 		foreach ( $taxonomies as $tax_name => $tax_value ) {
-			// post cannot be used to create new taxonomy
+			// post cannot be used to create new taxonomy.
 			if ( ! taxonomy_exists( $tax_name ) ) {
 				continue;
 			}
-			wp_set_object_terms($result, (string)$tax_value, $tax_name, true);
+			wp_set_object_terms( $result, (string) $tax_value, $tax_name, true );
 		}
 	}
 
@@ -339,20 +362,20 @@ public static function update_tax( $result, $post, $site, $transport_type, $clie
 		if ( ! $result || is_wp_error( $result ) || ! isset( $post['tax'] ) ) {
 			return false;
 		}
-		$taxonomies = $post['tax'];
+		$taxonomies       = $post['tax'];
 		$replace_tax_list = array();
 		foreach ( $taxonomies as $tax_name => $tax_value ) {
-			//post cannot be used to create new taxonomy
+			// post cannot be used to create new taxonomy.
 			if ( ! taxonomy_exists( $tax_name ) ) {
 				continue;
 			}
-			if ( !in_array($tax_name, $replace_tax_list ) ) {
-				//if we haven't processed this taxonomy before, replace any terms on the post with the first new one
-				wp_set_object_terms($result, (string)$tax_value, $tax_name );
+			if ( ! in_array( $tax_name, $replace_tax_list ) ) {
+				// if we haven't processed this taxonomy before, replace any terms on the post with the first new one.
+				wp_set_object_terms( $result, (string) $tax_value, $tax_name );
 				$replace_tax_list[] = $tax_name;
 			} else {
-				//if we've already added one term for this taxonomy, append any others
-				wp_set_object_terms($result, (string)$tax_value, $tax_name, true);
+				// if we've already added one term for this taxonomy, append any others.
+				wp_set_object_terms( $result, (string) $tax_value, $tax_name, true );
 			}
 		}
 	}
diff --git a/includes/class-syndication-wp-xml-client.php b/includes/class-syndication-wp-xml-client.php
index 3e26bc8e..0cbebd03 100644
--- a/includes/class-syndication-wp-xml-client.php
+++ b/includes/class-syndication-wp-xml-client.php
@@ -17,12 +17,12 @@
 /**
  * Load the {@see Walker_CategoryDropdownMultiple}
  */
-include_once( dirname( __FILE__ ) . '/class-walker-category-dropdown-multiple.php' );
+require_once dirname( __FILE__ ) . '/class-walker-category-dropdown-multiple.php';
 
 /**
  * Load the {@see Syndication_Client} interface.
  */
-include_once( dirname( __FILE__ ) . '/interface-syndication-client.php' );
+require_once dirname( __FILE__ ) . '/interface-syndication-client.php';
 
 /**
  * Class Syndication_WP_XML_Client
@@ -32,7 +32,7 @@ class Syndication_WP_XML_Client implements Syndication_Client {
 	/**
 	 * @var int
 	 */
-	private $site_ID;
+	private $site_id;
 
 	/**
 	 * @var string
@@ -87,20 +87,20 @@ class Syndication_WP_XML_Client implements Syndication_Client {
 	/**
 	 * Class constructor.
 	 *
-	 * @param int $site_ID The ID of the site to pull feeds from.
+	 * @param int $site_id The ID of the site to pull feeds from.
 	 */
-	function __construct( $site_ID ) {
-		$this->site_ID = $site_ID;
-		$this->set_feed_url( get_post_meta( $site_ID, 'syn_feed_url', true ) );
-
-		$this->default_post_type      = get_post_meta( $site_ID, 'syn_default_post_type', true );
-		$this->default_post_status    = get_post_meta( $site_ID, 'syn_default_post_status', true );
-		$this->default_comment_status = get_post_meta( $site_ID, 'syn_default_comment_status', true );
-		$this->default_ping_status    = get_post_meta( $site_ID, 'syn_default_ping_status', true );
-		$this->nodes_to_post          = get_post_meta( $site_ID, 'syn_node_config', false );
-		$this->id_field               = get_post_meta( $site_ID, 'syn_id_field', true );
-		$this->enc_field              = get_post_meta( $site_ID, 'syn_enc_field', true );
-		$this->enc_is_photo           = get_post_meta( $site_ID, 'syn_enc_is_photo', true );
+	function __construct( $site_id ) {
+		$this->site_id = $site_id;
+		$this->set_feed_url( get_post_meta( $site_id, 'syn_feed_url', true ) );
+
+		$this->default_post_type      = get_post_meta( $site_id, 'syn_default_post_type', true );
+		$this->default_post_status    = get_post_meta( $site_id, 'syn_default_post_status', true );
+		$this->default_comment_status = get_post_meta( $site_id, 'syn_default_comment_status', true );
+		$this->default_ping_status    = get_post_meta( $site_id, 'syn_default_ping_status', true );
+		$this->nodes_to_post          = get_post_meta( $site_id, 'syn_node_config', false );
+		$this->id_field               = get_post_meta( $site_id, 'syn_id_field', true );
+		$this->enc_field              = get_post_meta( $site_id, 'syn_enc_field', true );
+		$this->enc_is_photo           = get_post_meta( $site_id, 'syn_enc_is_photo', true );
 
 		add_action( 'syn_post_pull_new_post', array( __CLASS__, 'save_meta' ), 10, 5 );
 		add_action( 'syn_post_pull_new_post', array( __CLASS__, 'save_tax' ), 10, 5 );
@@ -115,13 +115,12 @@ function __construct( $site_ID ) {
 	 * @param string $url The URL of the feed to pull.
 	 */
 	private function set_feed_url( $url ) {
-
 		$url = apply_filters( 'syn_feed_url', $url );
 
-		if ( parse_url( $url ) ) {
+		if ( wp_parse_url( $url ) ) {
 			$this->feed_url = $url;
 		} else {
-			$this->error_message = sprintf( __( 'Feed URL not set for this feed: %s', 'push-syndication' ), $this->site_ID );
+			$this->error_message = sprintf( __( 'Feed URL not set for this feed: %s', 'push-syndication' ), $this->site_id );
 		}
 	}
 
@@ -131,62 +130,70 @@ private function set_feed_url( $url ) {
 	 * @return array
 	 */
 	public static function get_client_data() {
-		return array( 'id' => 'WP_XML', 'modes' => array( 'pull' ), 'name' => 'XML' );
+		return array(
+			'id'    => 'WP_XML',
+			'modes' => array( 'pull' ),
+			'name'  => 'XML',
+		);
 	}
 
 	/**
 	 * Required by the interface, but not used here.
 	 *
-	 * @param int $post_ID
+	 * @param int $post_id
+	 *
 	 * @return bool
 	 */
-	public function new_post( $post_ID ) {
-		return false; // Not supported
+	public function new_post( $post_id ) {
+		return false; // Not supported.
 	}
 
 	/**
 	 * Required by the interface, but not used here.
 	 *
-	 * @param int $post_ID
-	 * @param int $ext_ID
+	 * @param int $post_id
+	 * @param int $ext_id
+	 *
 	 * @return bool
 	 */
-	public function edit_post( $post_ID, $ext_ID ) {
-		return false; // Not supported
+	public function edit_post( $post_id, $ext_id ) {
+		return false; // Not supported.
 	}
 
 	/**
 	 * Required by the interface, but not used here.
 	 *
-	 * @param int $ext_ID
+	 * @param int $ext_id
+	 *
 	 * @return bool
 	 */
-	public function delete_post( $ext_ID ) {
-		return false; // Not supported
+	public function delete_post( $ext_id ) {
+		return false; // Not supported.
 	}
 
 	/**
 	 * Required by the interface, but not used here.
 	 *
-	 * @param int $ext_ID
+	 * @param int $ext_id
+	 *
 	 * @return bool
 	 */
-	public function get_post( $ext_ID ) {
-		return false; // Not supported
+	public function get_post( $ext_id ) {
+		return false; // Not supported.
 	}
 
 	/**
 	 * Retrieves a list of posts from a remote site.
 	 *
 	 * @param   array $args Arguments when retrieving posts.
-	 * @return  boolean true on success false on failure.
+	 * @return  array true on success false on failure.
 	 */
 	public function get_posts( $args = array() ) {
 		// create $post with values from $this::node_to_post
-		// create $post_meta with values from $this::node_to_meta
+		// create $post_meta with values from $this::node_to_meta.
 
-		//TODO: required fields for post
-		//TODO: handle categories
+		// TODO: required fields for post
+		// TODO: handle categories.
 
 		$abs_nodes       = array();
 		$item_nodes      = array();
@@ -215,16 +222,16 @@ public function get_posts( $args = array() ) {
 		$enclosures_as_strings = isset( $nodes['enclosures_as_strings'] ) ? true : false;
 		unset( $nodes['enclosures_as_strings'] );
 
-		//TODO: add checkbox on feed config to allow enclosures to be saved as strings as SI does
-		//TODO: add tags here and in feed set up UI
+		// TODO: add checkbox on feed config to allow enclosures to be saved as strings as SI does
+		// TODO: add tags here and in feed set up UI.
 		foreach ( $nodes['nodes'] as $key => $storage_locations ) {
 			foreach ( $storage_locations as $storage_location ) {
 				$storage_location['xpath'] = $key;
 				if ( $storage_location['is_item'] ) {
 					$item_nodes[] = $storage_location;
-				} else if ( $storage_location['is_photo'] ) {
+				} elseif ( $storage_location['is_photo'] ) {
 					$enc_nodes[] = $storage_location;
-				} else if ( $storage_location['is_tax'] && $storage_location['is_item'] ) {
+				} elseif ( $storage_location['is_tax'] && $storage_location['is_item'] ) {
 					$tax_nodes[] = $storage_location;
 				} else {
 					$abs_nodes[] = $storage_location;
@@ -235,37 +242,55 @@ public function get_posts( $args = array() ) {
 		$feed = $this->fetch_feed();
 
 		// Catch attempts to pull content from a file which doesn't exist.
-		// TODO: kill feed client if too many failures
-		$site_post = get_post( $this->site_ID );
+		// TODO: kill feed client if too many failures.
+		$site_post = get_post( $this->site_id );
 		if ( is_wp_error( $feed ) ) {
-			Syndication_Logger::log_post_error( $this->site_ID, $status = 'error', $message = sprintf( __( 'Could not reach feed at: %s | Error: %s', 'push-syndication' ), $this->feed_url, $feed->get_error_message() ), $log_time = null, $extra = array() );
+			Syndication_Logger::log_post_error(
+				$this->site_id,
+				'error',
+				sprintf( __( 'Could not reach feed at: %1$s | Error: %2$s', 'push-syndication' ), $this->feed_url, $feed->get_error_message() ),
+				null,
+				array()
+			);
 
 			// Track the event.
-			do_action( 'push_syndication_event', 'pull_failure', $this->site_ID );
+			do_action( 'push_syndication_event', 'pull_failure', $this->site_id );
 
 			return array();
 		} else {
-			Syndication_Logger::log_post_info( $this->site_ID, $status = 'fetch_feed', $message = sprintf( __( 'fetched feed with %d bytes', 'push-syndication' ), strlen( $feed ) ), $log_time = null, $extra = array() );
+			Syndication_Logger::log_post_info(
+				$this->site_id,
+				'fetch_feed',
+				sprintf( __( 'fetched feed with %d bytes', 'push-syndication' ), strlen( $feed ) ),
+				null,
+				array()
+			);
 
 			// Track the event.
-			do_action( 'push_syndication_event', 'pull_success', $this->site_ID );
+			do_action( 'push_syndication_event', 'pull_success', $this->site_id );
 		}
 
 		/** @var SimpleXMLElement $xml */
 		$xml = simplexml_load_string( $feed, null, 0, $namespace, false );
 
 		if ( false === $xml ) {
-			Syndication_Logger::log_post_error( $this->site_ID, $status = 'error', $message = sprintf( __( 'Failed to parse feed at: %s', 'push-syndication' ), $this->feed_url ), $log_time = $site_post->postmeta['is_update'], $extra = array() );
+			Syndication_Logger::log_post_error(
+				$this->site_id,
+				'error',
+				sprintf( __( 'Failed to parse feed at: %s', 'push-syndication' ), $this->feed_url ),
+				$site_post->postmeta['is_update'],
+				array()
+			);
 
 			// Track the event.
-			do_action( 'push_syndication_event', 'pull_failure', $this->site_ID );
+			do_action( 'push_syndication_event', 'pull_failure', $this->site_id );
 
 			return array();
 		}
 
 		$abs_post_fields['enclosures_as_strings'] = $enclosures_as_strings;
 
-		// TODO: handle constant strings in XML
+		// TODO: handle constant strings in XML.
 		foreach ( $abs_nodes as $abs_node ) {
 			$value_array = array();
 			try {
@@ -277,15 +302,14 @@ public function get_posts( $args = array() ) {
 
 				if ( $abs_node['is_meta'] ) {
 					$abs_meta_data[ $abs_node['field'] ] = (string) $value_array[0];
-				} else if ( $abs_node['is_tax'] ) {
+				} elseif ( $abs_node['is_tax'] ) {
 					$abs_tax_data[ $abs_node['field'] ] = (string) $value_array[0];
 				} else {
 					$abs_post_fields[ $abs_node['field'] ] = (string) $value_array[0];
 				}
-			}
-			catch ( Exception $e ) {
-				//TODO: catch value not found here and alert for error
-				//TODO: catch multiple values returned here and alert for error
+			} catch ( Exception $e ) {
+				// TODO: catch value not found here and alert for error
+				// TODO: catch multiple values returned here and alert for error.
 				return array();
 			}
 		}
@@ -294,10 +318,22 @@ public function get_posts( $args = array() ) {
 		$items         = $xml->xpath( $post_root );
 
 		if ( empty( $items ) ) {
-			Syndication_Logger::log_post_error( $this->site_ID, $status = 'error', $message = printf( __( 'No post nodes found using XPath "%s" in feed', 'push-syndication' ), $post_root ), $log_time = $site_post->postmeta['is_update'], $extra = array() );
+			Syndication_Logger::log_post_error(
+				$this->site_id,
+				'error',
+				sprintf( __( 'No post nodes found using XPath "%s" in feed', 'push-syndication' ), $post_root ),
+				$site_post->postmeta['is_update'],
+				array()
+			);
 			return array();
 		} else {
-			Syndication_Logger::log_post_info( $this->site_ID, $status = 'simplexml_load_string', $message = sprintf( __( 'parsed feed, received %d items', 'push-syndication' ), count( $items ) ), $log_time = null, $extra = array() );
+			Syndication_Logger::log_post_info(
+				$this->site_id,
+				'simplexml_load_string',
+				sprintf( __( 'parsed feed, received %d items', 'push-syndication' ), count( $items ) ),
+				null,
+				array()
+			);
 		}
 
 		foreach ( $items as $item ) {
@@ -310,7 +346,7 @@ public function get_posts( $args = array() ) {
 
 			$item_fields['post_type'] = $this->default_post_type;
 
-			//save photos as enclosures in meta
+			// save photos as enclosures in meta.
 			if ( ( isset( $enc_parent ) && strlen( $enc_parent ) ) && ! empty( $enc_nodes ) ) {
 				$meta_data['enclosures'] = $this->get_encs( $item->xpath( $enc_parent ), $enc_nodes );
 			}
@@ -323,27 +359,26 @@ public function get_posts( $args = array() ) {
 						$value_array = $item->xpath( stripslashes( $save_location['xpath'] ) );
 					}
 					if ( isset( $save_location['is_meta'] ) && $save_location['is_meta'] ) {
-						//SimpleXMLElement::xpath returns either an array or false if an element isn't returned
-						//checking $value_array first avoids the warning we get if the field isn't found
+						// SimpleXMLElement::xpath returns either an array or false if an element isn't returned
+						// checking $value_array first avoids the warning we get if the field isn't found.
 						if ( $value_array && ( count( $value_array ) > 1 ) ) {
-							$value_array = array_map( 'strval', $value_array );
+							$value_array                          = array_map( 'strval', $value_array );
 							$meta_data[ $save_location['field'] ] = $value_array;
-						} else if ( $value_array ) {
-							//return a string if $value_array contains only a single element
+						} elseif ( $value_array ) {
+							// return a string if $value_array contains only a single element.
 							$meta_data[ $save_location['field'] ] = (string) $value_array[0];
 						}
-					} else if ( isset( $save_location['is_tax'] ) && $save_location['is_tax'] ) {
-						//for some taxonomies, multiple values may be supplied in the field
+					} elseif ( isset( $save_location['is_tax'] ) && $save_location['is_tax'] ) {
+						// for some taxonomies, multiple values may be supplied in the field.
 						foreach ( $value_array as $value ) {
 							$tax_data[ $save_location['field'] ] = (string) $value;
 						}
 					} else {
 						$item_fields[ $save_location['field'] ] = (string) $value_array[0];
 					}
-				}
-				catch ( Exception $e ) {
+				} catch ( Exception $e ) {
 					// TODO: catch value not found here and alert for error
-					// TODO: catch multiple values returned here and alert for error
+					// TODO: catch multiple values returned here and alert for error.
 					return array();
 				}
 			}
@@ -375,10 +410,15 @@ public function get_posts( $args = array() ) {
 			$post_position++;
 		}
 
-		Syndication_Logger::log_post_info( $this->site_ID, $status = 'posts_received', $message = sprintf( __( '%d posts were prepared', 'push-syndication' ), count( $posts ) ), $log_time = null, $extra = array() );
+		Syndication_Logger::log_post_info(
+			$this->site_id,
+			'posts_received',
+			sprintf( __( '%d posts were prepared', 'push-syndication' ), count( $posts ) ),
+			null,
+			array()
+		);
 
 		return $posts;
-
 	}
 
 	/**
@@ -415,13 +455,12 @@ private function get_encs( $feed_enclosures = array(), $enc_nodes = array() ) {
 						$enc_value = $enc->xpath( stripslashes( $post_value['xpath'] ) );
 					}
 					$enc_array[ $post_value['field'] ] = esc_attr( (string) $enc_value[0] );
-				}
-				catch ( Exception $e ) {
-					//TODO: catch value not found here and alert for error or not
+				} catch ( Exception $e ) {
+					// TODO: catch value not found here and alert for error or not.
 					return true;
 				}
 			}
-			// if position is not provided in the feed, use the order in which they appear in the feed
+			// if position is not provided in the feed, use the order in which they appear in the feed.
 			if ( empty( $enc_array['position'] ) ) {
 				$enc_array['position'] = $count;
 			}
@@ -443,11 +482,12 @@ public function test_connection() {
 	/**
 	 * Required by the interface, but not used here.
 	 *
-	 * @param int $ext_ID External post ID to check.
+	 * @param int $ext_id External post ID to check.
+	 *
 	 * @return bool
 	 */
-	public function is_post_exists( $ext_ID ) {
-		return false; // Not supported
+	public function is_post_exists( $ext_id ) {
+		return false; // Not supported.
 	}
 
 	/**
@@ -456,24 +496,24 @@ public function is_post_exists( $ext_ID ) {
 	 * @param   object $site The site object to display settings.
 	 */
 	public static function display_settings( $site ) {
-		//TODO: JS if is_meta show text box, if is_photo show photo select with numbers as values, else show select of post fields
-		//TODO: JS Validation
-		//TODO: deal with ability to select, i.e. media:group/media:thumbnail[@width="75"]/@url (can't be unserialized as is with quotes around 75)
-		$feed_url					= get_post_meta( $site->ID, 'syn_feed_url', true );
-		$default_post_type			= get_post_meta( $site->ID, 'syn_default_post_type', true );
-		$default_post_status		= get_post_meta( $site->ID, 'syn_default_post_status', true );
-		$default_comment_status		= get_post_meta( $site->ID, 'syn_default_comment_status', true );
-		$default_ping_status		= get_post_meta( $site->ID, 'syn_default_ping_status', true );
-		$node_config				= get_post_meta( $site->ID, 'syn_node_config', true );
-		$id_field					= get_post_meta( $site->ID, 'syn_id_field', true );
-		$enc_field					= get_post_meta( $site->ID, 'syn_enc_field', true );
-		$enc_is_photo				= get_post_meta( $site->ID, 'syn_enc_is_photo', true);
-
-		if ( isset( $node_config['namespace'] )) {
+		// TODO: JS if is_meta show text box, if is_photo show photo select with numbers as values, else show select of post fields
+		// TODO: JS Validation
+		// TODO: deal with ability to select, i.e. media:group/media:thumbnail[@width="75"]/@url (can't be unserialized as is with quotes around 75).
+		$feed_url               = get_post_meta( $site->ID, 'syn_feed_url', true );
+		$default_post_type      = get_post_meta( $site->ID, 'syn_default_post_type', true );
+		$default_post_status    = get_post_meta( $site->ID, 'syn_default_post_status', true );
+		$default_comment_status = get_post_meta( $site->ID, 'syn_default_comment_status', true );
+		$default_ping_status    = get_post_meta( $site->ID, 'syn_default_ping_status', true );
+		$node_config            = get_post_meta( $site->ID, 'syn_node_config', true );
+		$id_field               = get_post_meta( $site->ID, 'syn_id_field', true );
+		$enc_field              = get_post_meta( $site->ID, 'syn_enc_field', true );
+		$enc_is_photo           = get_post_meta( $site->ID, 'syn_enc_is_photo', true );
+
+		if ( isset( $node_config['namespace'] ) ) {
 			$namespace = $node_config['namespace'];
 		}
 
-		//unset is outside of isset() test to remove the item from the array if the key is there with no value
+		// unset is outside of isset() test to remove the item from the array if the key is there with no value.
 		$namespace = isset( $node_config['namespace'] ) ? $node_config['namespace'] : null;
 		unset( $node_config['namespace'] );
 
@@ -492,7 +532,7 @@ public static function display_settings( $site ) {
 			<label for="feed_url"><?php esc_html_e( 'Enter feed URL', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" name="feed_url" id="feed_url" size="100" value="<?php esc_attr_e( $feed_url ); ?>" />
+			<input type="text" name="feed_url" id="feed_url" size="100" value="<?php echo esc_url_raw( $feed_url ); ?>" />
 		</p>
 		<p>
 			<label for="default_post_type"><?php esc_html_e( 'Select post type', 'push-syndication' ); ?></label>
@@ -504,7 +544,7 @@ public static function display_settings( $site ) {
 
 			foreach ( $post_types as $post_type ) {
 				?>
-				<option value="<?php esc_attr_e( $post_type ); ?>" <?php selected( $post_type, $default_post_type ); ?>><?php esc_html_e( $post_type ); ?></option>
+				<option value="<?php echo esc_attr( $post_type ); ?>" <?php selected( $post_type, $default_post_type ); ?>><?php echo esc_html( $post_type ); ?></option>
 			<?php } ?>
 			</select>
 		</p>
@@ -518,7 +558,7 @@ public static function display_settings( $site ) {
 
 			foreach ( $post_statuses as $key => $value ) {
 				?>
-				<option value="<?php esc_attr_e( $key ); ?>" <?php selected( $key, $default_post_status ); ?>><?php esc_html_e( $key ); ?></option>
+				<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $default_post_status ); ?>><?php echo esc_html( $key ); ?></option>
 			<?php } ?>
 			</select>
 		</p>
@@ -527,8 +567,8 @@ public static function display_settings( $site ) {
 		</p>
 		<p>
 			<select name="default_comment_status" id="default_comment_status">
-			<option value="open" <?php selected( 'open', $default_comment_status ); ?>><?php _e( 'open', 'push-syndication' ); ?></option>
-			<option value="closed" <?php selected( 'closed', $default_comment_status ); ?>><?php _e( 'closed', 'push-syndication' ); ?></option>
+			<option value="open" <?php selected( 'open', $default_comment_status ); ?>><?php esc_html_e( 'open', 'push-syndication' ); ?></option>
+			<option value="closed" <?php selected( 'closed', $default_comment_status ); ?>><?php esc_html_e( 'closed', 'push-syndication' ); ?></option>
 			</select>
 		</p>
 		<p>
@@ -536,8 +576,8 @@ public static function display_settings( $site ) {
 		</p>
 		<p>
 			<select name="default_ping_status" id="default_ping_status">
-			<option value="open" <?php selected( 'open', $default_ping_status ); ?>><?php _e( 'open', 'push-syndication' ); ?></option>
-			<option value="closed" <?php selected( 'closed', $default_ping_status ); ?>><?php _e( 'closed', 'push-syndication' ); ?></option>
+			<option value="open" <?php selected( 'open', $default_ping_status ); ?>><?php esc_html_e( 'open', 'push-syndication' ); ?></option>
+			<option value="closed" <?php selected( 'closed', $default_ping_status ); ?>><?php esc_html_e( 'closed', 'push-syndication' ); ?></option>
 			</select>
 		</p>
 
@@ -545,35 +585,35 @@ public static function display_settings( $site ) {
 			<label for="namespace"><?php esc_html_e( 'Enter XML namespace', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" size="75" name="namespace" id="namespace" value="<?php esc_attr_e( $namespace ); ?>" />
+			<input type="text" size="75" name="namespace" id="namespace" value="<?php echo esc_attr( $namespace ); ?>" />
 		</p>
 
 		<p>
 			<label for="post_root"><?php esc_html_e( 'Enter XPath to post root', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" name="post_root" id="post_root" value="<?php esc_attr_e( $post_root ); ?>" />
+			<input type="text" name="post_root" id="post_root" value="<?php echo esc_attr( $post_root ); ?>" />
 		</p>
 
 		<p>
 			<label for="id_field"><?php esc_html_e( 'Enter post meta key for unique post identifier', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" name="id_field" id="id_field" value="<?php esc_attr_e( $id_field ); ?>" />
+			<input type="text" name="id_field" id="id_field" value="<?php echo esc_attr( $id_field ); ?>" />
 		</p>
 
 		<p>
 			<label for="enc_parent"><?php esc_html_e( 'Enter parent element for enclosures', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" name="enc_parent" id="enc_parent" value="<?php esc_attr_e( $enc_parent ); ?>" />
+			<input type="text" name="enc_parent" id="enc_parent" value="<?php echo esc_attr( $enc_parent ); ?>" />
 		</p>
 
 		<p>
 			<label for="enc_field"><?php esc_html_e( 'Enter meta name for enclosures', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" name="enc_field" id="enc_field" value="<?php esc_attr_e( $enc_field ); ?>" />
+			<input type="text" name="enc_field" id="enc_field" value="<?php echo esc_attr( $enc_field ); ?>" />
 		</p>
 
 		<p>
@@ -590,20 +630,34 @@ public static function display_settings( $site ) {
 		<p>
 			<?php
 				add_filter( 'wp_dropdown_cats', array( __CLASS__, 'make_multiple_categories_dropdown' ) );
-				wp_dropdown_categories( array(
-						'hide_empty' => false,
-						'hierarchical' => true,
+				wp_dropdown_categories(
+					array(
+						'hide_empty'     => false,
+						'hierarchical'   => true,
 						'selected_array' => $categories,
-						'walker' => new Walker_CategoryDropdownMultiple,
-						'name' => 'categories[]'
-				) );
+						'walker'         => new Walker_CategoryDropdownMultiple(),
+						'name'           => 'categories[]',
+					)
+				);
 				remove_filter( 'wp_dropdown_cats', array( __CLASS__, 'make_multiple_categories_dropdown' ) );
 			?>
 		</p>
 
 		<h2><?php _e( 'XPath-to-Data Mapping', 'push-syndication' ); ?></h2>
 
-		<p><?php printf( __( '<strong>PLEASE NOTE:</strong> %s are required. If you want a link to another site, %s is required. To include a static string, enclose the string as "%s(your_string_here)" &mdash; no quotes.', 'push-syndication' ), 'post_title, post_guid, guid', 'is_permalink', 'string' ); ?></p>
+		<p>
+		<?php
+		printf(
+			wp_kses(
+				__( '<strong>PLEASE NOTE:</strong> %1$s are required. If you want a link to another site, %2$s is required. To include a static string, enclose the string as "%3$s(your_string_here)" &mdash; no quotes.', 'push-syndication' ),
+				array( 'strong' => array() )
+			),
+			'post_title, post_guid, guid',
+			'is_permalink',
+			'string'
+		);
+		?>
+				</p>
 
 		<ul class='syn-xml-client-xpath-head syn-xml-client-list-head'>
 			<li class="text">
@@ -630,7 +684,8 @@ public static function display_settings( $site ) {
 		$rowcount = 0;
 		if ( ! empty( $custom_nodes ) ) :
 			foreach ( $custom_nodes as $key => $storage_locations ) :
-				foreach ( $storage_locations as $storage_location ) : ?>
+				foreach ( $storage_locations as $storage_location ) :
+					?>
 					<ul class='syn-xml-client-xpath-form syn-xml-client-xpath-list syn-xml-client-list' data-row-count="<?php echo (int) $rowcount; ?>">
 					<li class="text">
 						<input type="text" name="node[<?php echo (int) $rowcount; ?>][xpath]" id="node-<?php echo (int) $rowcount; ?>-xpath" value="<?php echo htmlspecialchars( stripslashes( $key ) ); ?>" />
@@ -695,16 +750,16 @@ public static function display_settings( $site ) {
 					e.preventDefault();
 
 					var $lastForm = $( '.syn-xml-client-xpath-form:last' ),
-					    $newForm = $lastForm.clone(),
-					    originalRowCount = parseInt( $lastForm.attr( 'data-row-count' ) ),
-					    newRowCount = originalRowCount + 1;
+						$newForm = $lastForm.clone(),
+						originalRowCount = parseInt( $lastForm.attr( 'data-row-count' ) ),
+						newRowCount = originalRowCount + 1;
 
 					$newForm.attr( 'data-row-count', newRowCount );
 
 					$newForm.find( 'input' ).each( function () {
 						var $this = $( this ),
-						    name = $this.attr( 'name' ),
-						    type = $this.attr( 'type' );
+							name = $this.attr( 'name' ),
+							type = $this.attr( 'type' );
 
 						if ( 'radio' === type || 'checkbox' === type ) {
 							$this.attr( 'checked', false );
@@ -732,7 +787,8 @@ public static function display_settings( $site ) {
 
 	/**
 	 * Rewrite wp_dropdown_categories output to enable a multiple select
-	 * @param  string $result rendered category dropdown list
+	 *
+	 * @param  string $result rendered category dropdown list.
 	 * @return string altered category dropdown list
 	 */
 	public static function make_multiple_categories_dropdown( $result ) {
@@ -743,39 +799,42 @@ public static function make_multiple_categories_dropdown( $result ) {
 	/**
 	 * Save the client settings for the remote site.
 	 *
-	 * @param   int $site_ID The site ID to save settings.
+	 * @param   int $site_id The site ID to save settings.
+	 *
 	 * @return  bool True on success; false on failure.
 	 */
-	public static function save_settings( $site_ID ) {
+	public static function save_settings( $site_id ) {
 		// TODO: adjust to save all settings required by XML feed
 		// TODO: validate saved values (e.g. valid post_type? valid status?)
-		// TODO: actually check if saving was successful or not and return a proper bool
+		// TODO: actually check if saving was successful or not and return a proper bool.
 
-		update_post_meta( $site_ID, 'syn_feed_url', esc_url_raw( $_POST['feed_url'] ) );
-		update_post_meta( $site_ID, 'syn_default_post_type', sanitize_text_field( $_POST['default_post_type'] ) );
-		update_post_meta( $site_ID, 'syn_default_post_status', sanitize_text_field( $_POST['default_post_status'] ) );
-		update_post_meta( $site_ID, 'syn_default_comment_status', sanitize_text_field( $_POST['default_comment_status'] ) );
-		update_post_meta( $site_ID, 'syn_default_ping_status', sanitize_text_field( $_POST['default_ping_status'] ) );
-		update_post_meta( $site_ID, 'syn_id_field', sanitize_text_field( $_POST['id_field'] ) );
-		update_post_meta( $site_ID, 'syn_enc_field', sanitize_text_field( $_POST['enc_field'] ) );
-		update_post_meta( $site_ID, 'syn_enc_is_photo', isset( $_POST['enc_is_photo'] ) ? sanitize_text_field( $_POST['enc_is_photo'] ) : null );
+		update_post_meta( $site_id, 'syn_feed_url', isset( $_POST['feed_url'] ) ? esc_url_raw( $_POST['feed_url'] ) : '' );
+		update_post_meta( $site_id, 'syn_default_post_type', isset( $_POST['default_post_type'] ) ? sanitize_text_field( $_POST['default_post_type'] ) : '' );
+		update_post_meta( $site_id, 'syn_default_post_status', isset( $_POST['default_post_status'] ) ? sanitize_text_field( $_POST['default_post_status'] ) : '' );
+		update_post_meta( $site_id, 'syn_default_comment_status', isset( $_POST['default_comment_status'] ) ? sanitize_text_field( $_POST['default_comment_status'] ) : '' );
+		update_post_meta( $site_id, 'syn_default_ping_status', isset( $_POST['default_ping_status'] ) ? sanitize_text_field( $_POST['default_ping_status'] ) : '' );
+		update_post_meta( $site_id, 'syn_id_field', isset( $_POST['id_field'] ) ? sanitize_text_field( $_POST['id_field'] ) : '' );
+		update_post_meta( $site_id, 'syn_enc_field', isset( $_POST['enc_field'] ) ? sanitize_text_field( $_POST['enc_field'] ) : '' );
+		update_post_meta( $site_id, 'syn_enc_is_photo', isset( $_POST['enc_is_photo'] ) ? sanitize_text_field( $_POST['enc_is_photo'] ) : null );
 
 
-		$node_changes = $_POST['node'];
+		$node_changes = $_POST['node']; // phpcs:ignore
 		$node_config  = array();
 		$custom_nodes = array();
 		if ( isset( $node_changes ) ) {
 			foreach ( $node_changes as $row ) {
 				$row_data = array();
 
-				//if no new has been added to the empty row at the end, ignore it
+				// if no new has been added to the empty row at the end, ignore it.
 				if ( ! empty( $row['xpath'] ) ) {
-
 					foreach ( array( 'is_item', 'is_meta', 'is_tax', 'is_photo' ) as $field ) {
-						$row_data[ $field ] = isset( $row[ $field ] ) && in_array( $row[ $field ], array(
+						$row_data[ $field ] = isset( $row[ $field ] ) && in_array(
+							$row[ $field ],
+							array(
 								'true',
-								'on'
-							) ) ? 1 : 0;
+								'on',
+							)
+						) ? 1 : 0;
 					}
 					$xpath = html_entity_decode( $row['xpath'] );
 
@@ -792,12 +851,13 @@ public static function save_settings( $site_ID ) {
 			}
 		}
 
-		$node_config['namespace']  = sanitize_text_field( $_POST['namespace'] );
-		$node_config['post_root']  = sanitize_text_field( $_POST['post_root'] );
-		$node_config['enc_parent'] = sanitize_text_field( $_POST['enc_parent'] );
+		$node_config['namespace']  = isset( $_POST['namespace'] ) ? sanitize_text_field( $_POST['namespace'] ) : '';
+		$node_config['post_root']  = isset( $_POST['post_root'] ) ? sanitize_text_field( $_POST['post_root'] ) : '';
+		$node_config['enc_parent'] = isset( $_POST['enc_parent'] ) ? sanitize_text_field( $_POST['enc_parent'] ) : '';
+		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
 		$node_config['categories'] = is_array( $_POST['categories'] ) ? array_map( 'intval', $_POST['categories'] ) : array();
 		$node_config['nodes']      = $custom_nodes;
-		update_post_meta( $site_ID, 'syn_node_config', $node_config );
+		update_post_meta( $site_id, 'syn_node_config', $node_config );
 		return true;
 	}
 
@@ -832,11 +892,11 @@ public static function save_meta( $result, $post, $site, $transport_type, $clien
 		wp_set_post_terms( $result, $categories, 'category', true );
 		$metas = $post['postmeta'];
 
-		//handle enclosures separately first
+		// handle enclosures separately first.
 		$enc_field  = isset( $metas['enc_field'] ) ? $metas['enc_field'] : null;
 		$enclosures = isset( $metas['enclosures'] ) ? $metas['enclosures'] : null;
-		if ( isset( $enclosures ) && isset ( $enc_field ) ) {
-			// first remove all enclosures for the post (for updates) if any
+		if ( isset( $enclosures ) && isset( $enc_field ) ) {
+			// first remove all enclosures for the post (for updates) if any.
 			delete_post_meta( $result, $enc_field );
 			foreach ( $enclosures as $enclosure ) {
 				if ( defined( 'ENCLOSURES_AS_STRINGS' ) && constant( 'ENCLOSURES_AS_STRINGS' ) ) {
@@ -845,7 +905,7 @@ public static function save_meta( $result, $post, $site, $transport_type, $clien
 				add_post_meta( $result, $enc_field, $enclosure, false );
 			}
 
-			// now remove them from the rest of the metadata before saving the rest
+			// now remove them from the rest of the metadata before saving the rest.
 			unset( $metas['enclosures'] );
 		}
 
@@ -872,11 +932,11 @@ public static function update_meta( $result, $post, $site, $transport_type, $cli
 		wp_set_post_terms( $result, $categories, 'category', true );
 		$metas = $post['postmeta'];
 
-		// handle enclosures separately first
+		// handle enclosures separately first.
 		$enc_field  = isset( $metas['enc_field'] ) ? $metas['enc_field'] : null;
 		$enclosures = isset( $metas['enclosures'] ) ? $metas['enclosures'] : null;
 		if ( isset( $enclosures ) && isset( $enc_field ) ) {
-			// first remove all enclosures for the post (for updates)
+			// first remove all enclosures for the post (for updates).
 			delete_post_meta( $result, $enc_field );
 			foreach ( $enclosures as $enclosure ) {
 				if ( defined( 'ENCLOSURES_AS_STRINGS' ) && constant( 'ENCLOSURES_AS_STRINGS' ) ) {
@@ -885,7 +945,7 @@ public static function update_meta( $result, $post, $site, $transport_type, $cli
 				add_post_meta( $result, $enc_field, $enclosure, false );
 			}
 
-			// now remove them from the rest of the metadata before saving the rest
+			// now remove them from the rest of the metadata before saving the rest.
 			unset( $metas['enclosures'] );
 		}
 
@@ -908,7 +968,7 @@ public static function save_tax( $result, $post, $site, $transport_type, $client
 		}
 		$taxonomies = $post['tax'];
 		foreach ( $taxonomies as $tax_name => $tax_value ) {
-			// post cannot be used to create new taxonomy
+			// post cannot be used to create new taxonomy.
 			if ( ! taxonomy_exists( $tax_name ) ) {
 				continue;
 			}
@@ -922,7 +982,7 @@ public static function save_tax( $result, $post, $site, $transport_type, $client
 	 * @param $site
 	 * @param $transport_type
 	 * @param $client
-	 * @return mixed False if an error of if the data to save isn't passed.
+	 * @return bool False if an error of if the data to save isn't passed.
 	 */
 	public static function update_tax( $result, $post, $site, $transport_type, $client ) {
 		if ( ! $result || is_wp_error( $result ) || ! isset( $post['tax'] ) ) {
@@ -931,19 +991,20 @@ public static function update_tax( $result, $post, $site, $transport_type, $clie
 		$taxonomies       = $post['tax'];
 		$replace_tax_list = array();
 		foreach ( $taxonomies as $tax_name => $tax_value ) {
-			//post cannot be used to create new taxonomy
+			// post cannot be used to create new taxonomy.
 			if ( ! taxonomy_exists( $tax_name ) ) {
 				continue;
 			}
 			if ( ! in_array( $tax_name, $replace_tax_list ) ) {
-				//if we haven't processed this taxonomy before, replace any terms on the post with the first new one
+				// if we haven't processed this taxonomy before, replace any terms on the post with the first new one.
 				wp_set_object_terms( $result, (string) $tax_value, $tax_name );
 				$replace_tax_list[] = $tax_name;
 			} else {
-				//if we've already added one term for this taxonomy, append any others
+				// if we've already added one term for this taxonomy, append any others.
 				wp_set_object_terms( $result, (string) $tax_value, $tax_name, true );
 			}
 		}
+		return true;
 	}
 
 	/**
@@ -952,6 +1013,7 @@ public static function update_tax( $result, $post, $site, $transport_type, $clie
 	 * @return string|WP_Error The content of the remote feed, or error if there's a problem.
 	 */
 	public function fetch_feed() {
+		// phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.wp_remote_get_wp_remote_get
 		$request = wp_remote_get( $this->feed_url );
 		if ( is_wp_error( $request ) ) {
 			return $request;
diff --git a/includes/class-syndication-wp-xmlrpc-client.php b/includes/class-syndication-wp-xmlrpc-client.php
index 069e72b6..2682d3b6 100644
--- a/includes/class-syndication-wp-xmlrpc-client.php
+++ b/includes/class-syndication-wp-xmlrpc-client.php
@@ -1,58 +1,66 @@
 <?php
 
-include_once( ABSPATH . 'wp-includes/class-IXR.php' );
-include_once( ABSPATH . 'wp-includes/class-wp-http-ixr-client.php' );
-include_once( dirname(__FILE__) . '/interface-syndication-client.php' );
-include_once( dirname( __FILE__ ) . '/push-syndicate-encryption.php' );
-
+require_once ABSPATH . 'wp-includes/class-IXR.php';
+require_once ABSPATH . 'wp-includes/class-wp-http-ixr-client.php';
+require_once dirname( __FILE__ ) . '/interface-syndication-client.php';
+require_once dirname( __FILE__ ) . '/push-syndicate-encryption.php';
+
+/**
+ * Class Syndication_WP_XMLRPC_Client
+ */
 class Syndication_WP_XMLRPC_Client extends WP_HTTP_IXR_Client implements Syndication_Client {
 
 	private $username;
 	private $password;
 
-	private $site_ID;
+	private $site_id;
 
-	function __construct( $site_ID ) {
+	/**
+	 * Syndication_WP_XMLRPC_Client constructor.
+	 *
+	 * @param int $site_id The site ID.
+	 */
+	public function __construct( $site_id ) {
 
 		// @TODO check port, timeout etc
-		$server = untrailingslashit( get_post_meta( $site_ID, 'syn_site_url', true ) );
-		if ( false === strpos( $server, 'xmlrpc.php' ) )
+		$server = untrailingslashit( get_post_meta( $site_id, 'syn_site_url', true ) );
+		if ( false === strpos( $server, 'xmlrpc.php' ) ) {
 			$server = esc_url_raw( trailingslashit( $server ) . 'xmlrpc.php' );
-		else
+		} else {
 			$server = esc_url_raw( $server );
+		}
 
-		$this->username = get_post_meta( $site_ID, 'syn_site_username', true);
-		$this->password = push_syndicate_decrypt( get_post_meta( $site_ID, 'syn_site_password', true) );
-		$this->site_ID  = $site_ID;
+		$this->username = get_post_meta( $site_id, 'syn_site_username', true );
+		$this->password = push_syndicate_decrypt( get_post_meta( $site_id, 'syn_site_password', true ) );
+		$this->site_id  = $site_id;
 
 		parent::__construct( $server );
 
-		if ( true === apply_filters( 'syn_xmlrpc_push_send_thumbnail', true, $site_ID, $this ) ) {
+		if ( true === apply_filters( 'syn_xmlrpc_push_send_thumbnail', true, $site_id, $this ) ) {
 			add_action( 'syn_xmlrpc_push_new_post_success', array( $this, 'post_push_send_thumbnail' ), 10, 6 );
 			add_action( 'syn_xmlrpc_push_edit_post_success', array( $this, 'post_push_send_thumbnail' ), 10, 6 );
-			// TODO: on delete post, delete thumbnail
+			// TODO: on delete post, delete thumbnail.
 		}
 	}
 
 	private function get_thumbnail_meta_keys( $post_id ) {
-		// Support for non-core images, like from the Multiple Post Thumbnail plugin
+		// Support for non-core images, like from the Multiple Post Thumbnail plugin.
 		return apply_filters( 'syn_xmlrpc_push_thumbnail_metas', array( '_thumbnail_id' ), $post_id );
 	}
 
 	function post_push_send_thumbnail( $remote_post_id, $post_id ) {
-
-		$thumbnail_meta_keys = $this->get_thumbnail_meta_keys( $post_id ); 
+		$thumbnail_meta_keys = $this->get_thumbnail_meta_keys( $post_id );
 
 		foreach ( $thumbnail_meta_keys as $thumbnail_meta ) {
-			$thumbnail_id = get_post_meta( $post_id, $thumbnail_meta, true );
-			$syn_local_meta_key = '_syn_push_thumb_' . $thumbnail_meta;
+			$thumbnail_id                  = get_post_meta( $post_id, $thumbnail_meta, true );
+			$syn_local_meta_key            = '_syn_push_thumb_' . $thumbnail_meta;
 			$syndicated_thumbnails_by_site = get_post_meta( $post_id, $syn_local_meta_key, true );
 
 			if ( ! is_array( $syndicated_thumbnails_by_site ) ) {
 				$syndicated_thumbnails_by_site = array();
 			}
 
-			$syndicated_thumbnail_id = isset( $syndicated_thumbnails_by_site[ $this->site_ID ] ) ? $syndicated_thumbnails_by_site[ $this->site_ID ] : false;
+			$syndicated_thumbnail_id = isset( $syndicated_thumbnails_by_site[ $this->site_id ] ) ? $syndicated_thumbnails_by_site[ $this->site_id ] : false;
 
 			if ( ! $thumbnail_id ) {
 				if ( $syndicated_thumbnail_id ) {
@@ -65,9 +73,8 @@ function post_push_send_thumbnail( $remote_post_id, $post_id ) {
 						$thumbnail_meta
 					);
 
-					unset( $syndicated_thumbnails_by_site[ $this->site_ID ] ); 
+					unset( $syndicated_thumbnails_by_site[ $this->site_id ] );
 					update_post_meta( $post_id, $syn_local_meta_key, $syndicated_thumbnails_by_site );
-
 				}
 				continue;
 			}
@@ -77,11 +84,11 @@ function post_push_send_thumbnail( $remote_post_id, $post_id ) {
 			}
 
 			list( $thumbnail_url ) = wp_get_attachment_image_src( $thumbnail_id, 'full' );
-			//pass thumbnail data and meta into the addThumnail to sync caption, description and alt-text
-			//has to be this way since mw_newMediaObject doesn't allow to pass description and caption along
+			// pass thumbnail data and meta into the addThumnail to sync caption, description and alt-text
+			// has to be this way since mw_newMediaObject doesn't allow to pass description and caption along.
 			$thumbnail_post_data = get_post( $thumbnail_id );
-			$thumbnail_alt_text = get_post_meta( $thumbnail_id, '_wp_attachment_image_alt', true );
-			
+			$thumbnail_alt_text  = get_post_meta( $thumbnail_id, '_wp_attachment_image_alt', true );
+
 			$result = $this->query(
 				'syndication.addThumbnail',
 				'1',
@@ -95,42 +102,45 @@ function post_push_send_thumbnail( $remote_post_id, $post_id ) {
 			);
 
 			if ( $result ) {
-				$syndicated_thumbnails_by_site[ $this->site_ID ] = $thumbnail_id;
+				$syndicated_thumbnails_by_site[ $this->site_id ] = $thumbnail_id;
 				update_post_meta( $post_id, $syn_local_meta_key, $syndicated_thumbnails_by_site );
 			}
 		}
 	}
 
 	public static function get_client_data() {
-		return array( 'id' => 'WP_XMLRPC', 'modes' => array( 'push' ), 'name' => 'WordPress XMLRPC' );
+		return array(
+			'id'    => 'WP_XMLRPC',
+			'modes' => array( 'push' ),
+			'name'  => 'WordPress XMLRPC',
+		);
 	}
-	
-	public function new_post( $post_ID ) {
 
-		$post = (array)get_post( $post_ID );
+	public function new_post( $post_id ) {
+		$post = (array) get_post( $post_id );
 
-		// This filter can be used to exclude or alter posts during a content push
-		$post = apply_filters( 'syn_xmlrpc_push_filter_new_post', $post, $post_ID );
+		// This filter can be used to exclude or alter posts during a content push.
+		$post = apply_filters( 'syn_xmlrpc_push_filter_new_post', $post, $post_id );
 		if ( false === $post ) {
 			return true;
 		}
-		
-		//Uploads all gallery images to the remote site and replaces [gallery] tags with new IDs
+
+		// Uploads all gallery images to the remote site and replaces [gallery] tags with new IDs.
 		$post['post_content'] = $this->syndicate_gallery_images( $post['post_content'] );
 
-		// rearranging arguments
-		$args = array();
-		$args['post_title']	 = $post['post_title'];
-		$args['post_content']   = $post['post_content'];
-		$args['post_excerpt']   = $post['post_excerpt'];
-		$args['post_status']	= $post['post_status'];
-		$args['post_type']	  = $post['post_type'];
-		$args['wp_password']	= $post['post_password'];
-		$args['post_date_gmt']  = $this->convert_date_gmt( $post['post_date_gmt'], $post['post_date'] );
+		// rearranging arguments.
+		$args                  = array();
+		$args['post_title']    = $post['post_title'];
+		$args['post_content']  = $post['post_content'];
+		$args['post_excerpt']  = $post['post_excerpt'];
+		$args['post_status']   = $post['post_status'];
+		$args['post_type']     = $post['post_type'];
+		$args['wp_password']   = $post['post_password'];
+		$args['post_date_gmt'] = $this->convert_date_gmt( $post['post_date_gmt'], $post['post_date'] );
 
-		$args['terms_names'] = $this->_get_post_terms( $post_ID );
+		$args['terms_names'] = $this->get_post_terms( $post_id );
 
-		$args['custom_fields'] = $this->_get_custom_fields( $post_ID );
+		$args['custom_fields'] = $this->get_custom_fields( $post_id );
 
 		$args = apply_filters( 'syn_xmlrpc_push_new_post_args', $args, $post );
 
@@ -148,20 +158,18 @@ public function new_post( $post_ID ) {
 
 		$remote_post_id = (int) $this->getResponse();
 
-		do_action( 'syn_xmlrpc_push_new_post_success', $remote_post_id, $post_ID );
+		do_action( 'syn_xmlrpc_push_new_post_success', $remote_post_id, $post_id );
 
 		return $remote_post_id;
-
 	}
 
-	public function edit_post( $post_ID, $remote_post_id ) {
-
+	public function edit_post( $post_id, $remote_post_id ) {
 		$args = array();
 
-		$post = (array)get_post( $post_ID );
+		$post = (array) get_post( $post_id );
 
-		// This filter can be used to exclude or alter posts during a content push
-		$post = apply_filters( 'syn_xmlrpc_push_filter_edit_post', $post, $post_ID );
+		// This filter can be used to exclude or alter posts during a content push.
+		$post = apply_filters( 'syn_xmlrpc_push_filter_edit_post', $post, $post_id );
 		if ( false === $post ) {
 			return true;
 		}
@@ -169,57 +177,57 @@ public function edit_post( $post_ID, $remote_post_id ) {
 		$remote_post = $this->get_remote_post( $remote_post_id );
 
 		if ( ! $remote_post ) {
-			return new WP_Error( 'syn-remote-post-not-found', __( 'Remote post doesn\'t exist.', 'syndication' ) );
+			return new WP_Error( 'syn-remote-post-not-found', __( 'Remote post doesn\'t exist.', 'push-syndication' ) );
 		}
 
-		// Delete existing metadata to avoid duplicates
+		// Delete existing metadata to avoid duplicates.
 		$args['custom_fields'] = array();
 		foreach ( $remote_post['custom_fields'] as $custom_field ) {
-			$args['custom_fields'][] = array( 
-				'id' => $custom_field['id'],
+			$args['custom_fields'][] = array(
+				'id'              => $custom_field['id'],
 				'meta_key_lookup' => $custom_field['key'],
 			);
 		}
 
-		$thumbnail_meta_keys = $this->get_thumbnail_meta_keys( $post_ID );
+		$thumbnail_meta_keys = $this->get_thumbnail_meta_keys( $post_id );
 
 		foreach ( $thumbnail_meta_keys as $thumbnail_meta_key ) {
-			$thumbnail_id = get_post_meta( $post_ID, $thumbnail_meta_key, true );
-			$syn_local_meta_key = '_syn_push_thumb_' . $thumbnail_meta_key;
-			$syndicated_thumbnails_by_site = get_post_meta( $post_ID, $syn_local_meta_key, true );
+			$thumbnail_id                  = get_post_meta( $post_id, $thumbnail_meta_key, true );
+			$syn_local_meta_key            = '_syn_push_thumb_' . $thumbnail_meta_key;
+			$syndicated_thumbnails_by_site = get_post_meta( $post_id, $syn_local_meta_key, true );
 
 			if ( ! is_array( $syndicated_thumbnails_by_site ) ) {
 				$syndicated_thumbnails_by_site = array();
 			}
 
-			$syndicated_thumbnail_id = isset( $syndicated_thumbnails_by_site[ $this->site_ID ] ) ? $syndicated_thumbnails_by_site[ $this->site_ID ] : false;
+			$syndicated_thumbnail_id = isset( $syndicated_thumbnails_by_site[ $this->site_id ] ) ? $syndicated_thumbnails_by_site[ $this->site_id ] : false;
 
 			if ( $syndicated_thumbnail_id == $thumbnail_id ) {
-				//need to preserve old meta custom_type_thumbnail_id if it wasn't changed during update
-				//hence we remove ID from the custom_fileds list in order to avoid its deletion
+				// need to preserve old meta custom_type_thumbnail_id if it wasn't changed during update
+				// hence we remove ID from the custom_fileds list in order to avoid its deletion.
 				foreach ( $args['custom_fields'] as $index => $value ) {
 					if ( $value['meta_key_lookup'] == $thumbnail_meta_key ) {
-						unset( $args['custom_fields'][$index] );
+						unset( $args['custom_fields'][ $index ] );
 					}
 				}
 			}
 		}
 
-		//Uploads all gallery images to the remote site and replaces [gallery] tags with new IDs
+		// Uploads all gallery images to the remote site and replaces [gallery] tags with new IDs.
 		$post['post_content'] = $this->syndicate_gallery_images( $post['post_content'] );
 
-		// rearranging arguments
-		$args['post_title']	 = $post['post_title'];
-		$args['post_content']   = $post['post_content'];
-		$args['post_excerpt']   = $post['post_excerpt'];
-		$args['post_status']	= $post['post_status'];
-		$args['post_type']	  = $post['post_type'];
-		$args['wp_password']	= $post['post_password'];
-		$args['post_date_gmt']  = $this->convert_date_gmt( $post['post_date_gmt'], $post['post_date'] );
+		// rearranging arguments.
+		$args['post_title']    = $post['post_title'];
+		$args['post_content']  = $post['post_content'];
+		$args['post_excerpt']  = $post['post_excerpt'];
+		$args['post_status']   = $post['post_status'];
+		$args['post_type']     = $post['post_type'];
+		$args['wp_password']   = $post['post_password'];
+		$args['post_date_gmt'] = $this->convert_date_gmt( $post['post_date_gmt'], $post['post_date'] );
 
-		$args['terms_names'] = $this->_get_post_terms( $post_ID );
+		$args['terms_names'] = $this->get_post_terms( $post_id );
 
-		$args['custom_fields'] = array_merge( $args['custom_fields'], $this->_get_custom_fields( $post_ID ) );
+		$args['custom_fields'] = array_merge( $args['custom_fields'], $this->get_custom_fields( $post_id ) );
 
 		$args = apply_filters( 'syn_xmlrpc_push_edit_post_args', $args, $post );
 
@@ -236,49 +244,50 @@ public function edit_post( $post_ID, $remote_post_id ) {
 			return new WP_Error( $this->getErrorCode(), $this->getErrorMessage() );
 		}
 
-		do_action( 'syn_xmlrpc_push_edit_post_success', $remote_post_id, $post_ID );
+		do_action( 'syn_xmlrpc_push_edit_post_success', $remote_post_id, $post_id );
 
 		return $remote_post_id;
 	}
 
 	/**
-	* Utility method to Syndicate [gallery] shortcode images
-	* It needs to upload images and inject new IDs into the post_content
- 	* @access private
- 	* @uses $shortcode_tags global variable
- 	* @param string $post_content - post to be syndicated
- 	* @return string $post_content - post content with replaced gallery shortcodes
-	*/
+	 * Utility method to Syndicate [gallery] shortcode images
+	 * It needs to upload images and inject new IDs into the post_content
+	 *
+	 * @access private
+	 * @uses $shortcode_tags global variable
+	 * @param string $post_content - post to be syndicated.
+	 * @return string|WP_Error $post_content - post content with replaced gallery shortcodes
+	 */
 	private function syndicate_gallery_images( $post_content ) {
 		$attachment_ids = array();
 		global $shortcode_tags;
-		//overwrite global shortcodes for gallery only and then revert back to original
-		$temp = $shortcode_tags;
-		$shortcode_tags = array( 'gallery' => 'gallery_shortcode' );
-		$pattern = get_shortcode_regex();
-		$shortcode_tags = $temp;
+		// overwrite global shortcodes for gallery only and then revert back to original.
+		$temp           = $shortcode_tags;
+		$shortcode_tags = array( 'gallery' => 'gallery_shortcode' ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+		$pattern        = get_shortcode_regex();
+		$shortcode_tags = $temp; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
-		$image_ids = array();
+		$image_ids     = array();
 		$new_image_ids = array();
-		 
+
 		if ( preg_match_all( '/' . $pattern . '/s', $post_content, $matches ) ) {
-		  $count=count( $matches[3] );		  
-		  for ( $i = 0; $i < $count; $i++ ) {
-		    $atts = shortcode_parse_atts( $matches[3][$i] );
-		    if ( isset( $atts['ids'] ) ) {
-		      $attachment_ids = explode( ',', $atts['ids'] );
-		      $image_ids[$i] = $attachment_ids;
-		    }
-		  }
+			$count = count( $matches[3] );
+			for ( $i = 0; $i < $count; $i++ ) {
+				$atts = shortcode_parse_atts( $matches[3][ $i ] );
+				if ( isset( $atts['ids'] ) ) {
+					$attachment_ids  = explode( ',', $atts['ids'] );
+					$image_ids[ $i ] = $attachment_ids;
+				}
+			}
 		}
 
-		if( ! empty( $image_ids ) ) {
+		if ( ! empty( $image_ids ) ) {
 			foreach ( $image_ids as $key => $gallery_ids ) {
 				foreach ( $gallery_ids as $index => $id ) {
-					//do upload, get new ID back
+					// do upload, get new ID back.
 					list( $thumbnail_url ) = wp_get_attachment_image_src( $id, 'full' );
-					$thumbnail_post_data = get_post($id);
-					$thumbnail_alt_text = trim( get_post_meta( $id, '_wp_attachment_image_alt', true ) );
+					$thumbnail_post_data   = get_post( $id );
+					$thumbnail_alt_text    = trim( get_post_meta( $id, '_wp_attachment_image_alt', true ) );
 
 					$result = $this->query(
 						'syndication.postGalleryImage',
@@ -293,34 +302,33 @@ private function syndicate_gallery_images( $post_content ) {
 					if ( ! $result ) {
 						return new WP_Error( $this->getErrorCode(), $this->getErrorMessage() );
 					}
-					$new_image_ids[$key][$index] = (int) $this->getResponse();
+					$new_image_ids[ $key ][ $index ] = (int) $this->getResponse();
 				}
 			}
 		}
 
-		//new IDs needs to be injected into the post content
-		//replace old gallery code with a new one
+		// new IDs needs to be injected into the post content
+		// replace old gallery code with a new one.
 		$lenght = count( $matches[0] );
 		for ( $i = 0; $i < $lenght; $i++ ) {
-			$shortcode = $matches[0][$i];
-			//WP regex matches attribute with leading space, required here
-			$attribute = ' ids="' . implode( ',', $image_ids[$i] ) . '"';
-			$new_attribute = ' ids="' . implode( ',', $new_image_ids[$i] ) . '"';
+			$shortcode = $matches[0][ $i ];
+			// WP regex matches attribute with leading space, required here.
+			$attribute     = ' ids="' . implode( ',', $image_ids[ $i ] ) . '"';
+			$new_attribute = ' ids="' . implode( ',', $new_image_ids[ $i ] ) . '"';
 			$new_shortcode = str_replace( $attribute, $new_attribute, $shortcode );
-			$post_content = str_replace( $shortcode, $new_shortcode, $post_content );
+			$post_content  = str_replace( $shortcode, $new_shortcode, $post_content );
 		}
 
 		return $post_content;
 	}
 
 	public function delete_post( $remote_post_id ) {
-
 		$result = $this->query(
-				'wp.deletePost',
-				'1',
-				$this->username,
-				$this->password,
-				$remote_post_id
+			'wp.deletePost',
+			'1',
+			$this->username,
+			$this->password,
+			$remote_post_id
 		);
 
 		if ( ! $result ) {
@@ -330,53 +338,55 @@ public function delete_post( $remote_post_id ) {
 		return true;
 	}
 
-	private function _get_custom_fields( $post_id ) {
+	private function get_custom_fields( $post_id ) {
 		$post = get_post( $post_id );
 
 		$custom_fields = array();
 		$all_post_meta = get_post_custom( $post_id );
 
-		$blacklisted_meta = $this->_get_meta_blacklist( $post_id );
+		$blacklisted_meta = $this->get_meta_blacklist( $post_id );
 		foreach ( (array) $all_post_meta as $post_meta_key => $post_meta_values ) {
-
-			if ( in_array( $post_meta_key, $blacklisted_meta ) || preg_match( '/^_?syn/i', $post_meta_key ) )
+			if ( in_array( $post_meta_key, $blacklisted_meta ) || preg_match( '/^_?syn/i', $post_meta_key ) ) {
 				continue;
+			}
 
 			foreach ( $post_meta_values as $post_meta_value ) {
-				$post_meta_value = maybe_unserialize( $post_meta_value ); // get_post_custom returns serialized data
+				$post_meta_value = maybe_unserialize( $post_meta_value ); // get_post_custom returns serialized data.
 
 				$custom_fields[] = array(
-					'key' => $post_meta_key,
+					'key'   => $post_meta_key,
 					'value' => $post_meta_value,
 				);
 			}
 		}
 
 		$custom_fields[] = array(
-			'key' => 'syn_source_url',
+			'key'   => 'syn_source_url',
 			'value' => $post->guid,
 		);
 		return $custom_fields;
 	}
 
-	private function _get_meta_blacklist( $post_id ) {
-		$blacklist = array( '_edit_last', '_edit_lock' /** TODO: add more **/ );
+	private function get_meta_blacklist( $post_id ) {
+		$blacklist           = array( '_edit_last', '_edit_lock' /** TODO: add more */ );
 		$thumbnail_meta_keys = $this->get_thumbnail_meta_keys( $post_id );
 
 		$blacklist = array_merge( $blacklist, $thumbnail_meta_keys );
 		return apply_filters( 'syn_ignored_meta_fields', $blacklist, $post_id );
 	}
 
-	private function _get_post_terms( $post_id ) {
+	private function get_post_terms( $post_id ) {
 		$terms_names = array();
 
 		$post = get_post( $post_id );
 
-		if ( is_object_in_taxonomy( $post->post_type, 'category' ) )
+		if ( is_object_in_taxonomy( $post->post_type, 'category' ) ) {
 			$terms_names['category'] = wp_get_object_terms( $post_id, 'category', array( 'fields' => 'names' ) );
+		}
 
-		if ( is_object_in_taxonomy( $post->post_type, 'post_tag' )  )
+		if ( is_object_in_taxonomy( $post->post_type, 'post_tag' ) ) {
 			$terms_names['post_tag'] = wp_get_object_terms( $post_id, 'post_tag', array( 'fields' => 'names' ) );
+		}
 
 		// TODO: custom taxonomy
 
@@ -384,7 +394,6 @@ private function _get_post_terms( $post_id ) {
 	}
 
 	public function test_connection() {
-
 		$result = $this->query(
 			'wp.getPostTypes', // @TODO find a better suitable function
 			'1',
@@ -392,48 +401,59 @@ public function test_connection() {
 			$this->password
 		);
 
-		if( !$result ) {
-
-			$error_code = absint($this->getErrorCode());
+		if ( ! $result ) {
+			$error_code = absint( $this->getErrorCode() );
 
-			switch( $error_code ) {
+			switch ( $error_code ) {
 				case 32301:
-					add_filter('redirect_post_location', function($location) {
-						return add_query_arg("message", 305, $location);
-					});
+					add_filter(
+						'redirect_post_location',
+						function( $location ) {
+							return add_query_arg( 'message', 305, $location );
+						}
+					);
 					break;
 				case 401:
-					add_filter('redirect_post_location', function($location) {
-						return add_query_arg("message", 302, $location);
-					});
+					add_filter(
+						'redirect_post_location',
+						function( $location ) {
+							return add_query_arg( 'message', 302, $location );
+						}
+					);
 					break;
 				case 403:
-					add_filter('redirect_post_location', function($location) {
-						return add_query_arg("message", 303, $location);
-					});
+					add_filter(
+						'redirect_post_location',
+						function( $location ) {
+							return add_query_arg( 'message', 303, $location );
+						}
+					);
 					break;
 				case 405:
-					add_filter('redirect_post_location', function($location) {
-						return add_query_arg("message", 304, $location);
-					});
+					add_filter(
+						'redirect_post_location',
+						function( $location ) {
+							return add_query_arg( 'message', 304, $location );
+						}
+					);
 					break;
 				default:
-					add_filter('redirect_post_location', function($location) {
-						return add_query_arg("message", 306, $location);
-					});
+					add_filter(
+						'redirect_post_location',
+						function( $location ) {
+							return add_query_arg( 'message', 306, $location );
+						}
+					);
 					break;
 			}
 
 			return false;
-
 		}
 
 		return true;
-
 	}
 
 	function get_remote_post( $remote_post_id ) {
-
 		$result = $this->query(
 			'wp.getPost',
 			'1',
@@ -442,8 +462,9 @@ function get_remote_post( $remote_post_id ) {
 			$remote_post_id
 		);
 
-		if( !$result )
+		if ( ! $result ) {
 			return false;
+		}
 
 		return $this->getResponse();
 	}
@@ -451,33 +472,31 @@ function get_remote_post( $remote_post_id ) {
 	public function is_post_exists( $remote_post_id ) {
 		$remote_post = $this->get_remote_post( $remote_post_id );
 
-		if( ! $remote_post || $remote_post_id != $remote_post['post_id'] ) {
+		if ( ! $remote_post || $remote_post_id != $remote_post['post_id'] ) {
 			return false;
 		}
 
 		return true;
-
 	}
 
 	protected function convert_date_gmt( $date_gmt, $date ) {
-		if ( $date !== '0000-00-00 00:00:00' && $date_gmt === '0000-00-00 00:00:00' ) {
+		if ( '0000-00-00 00:00:00' !== $date && '0000-00-00 00:00:00' === $date_gmt ) {
 			return new IXR_Date( get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $date, false ), 'Ymd\TH:i:s' ) );
 		}
 		return $this->convert_date( $date_gmt );
 	}
 
 	protected function convert_date( $date ) {
-		if ( $date === '0000-00-00 00:00:00' ) {
+		if ( '0000-00-00 00:00:00' === $date ) {
 			return new IXR_Date( '00000000T00:00:00Z' );
 		}
 		return new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date, false ) );
 	}
 
 	public static function display_settings( $site ) {
-
-		$site_url = get_post_meta( $site->ID, 'syn_site_url', true);
-		$site_username = get_post_meta( $site->ID, 'syn_site_username', true);
-		$site_password = push_syndicate_decrypt( get_post_meta( $site->ID, 'syn_site_password', true) );
+		$site_url      = get_post_meta( $site->ID, 'syn_site_url', true );
+		$site_username = get_post_meta( $site->ID, 'syn_site_username', true );
+		$site_password = push_syndicate_decrypt( get_post_meta( $site->ID, 'syn_site_password', true ) );
 
 		?>
 
@@ -485,7 +504,7 @@ public static function display_settings( $site ) {
 			<label for=site_url><?php echo esc_html__( 'Enter a valid site URL', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" class="widefat" name="site_url" id="site_url" size="100" value="<?php echo esc_html( $site_url ); ?>" />
+			<input type="text" class="widefat" name="site_url" id="site_url" size="100" value="<?php echo esc_url_raw( $site_url ); ?>" />
 		</p>
 		<p>
 			<label for="site_username"><?php echo esc_html__( 'Enter Username', 'push-syndication' ); ?></label>
@@ -502,50 +521,53 @@ public static function display_settings( $site ) {
 
 		<?php
 
-		do_action( 'syn_after_site_form', $site ); 
+		do_action( 'syn_after_site_form', $site );
 	}
 
-	public static function save_settings( $site_ID ) {
-
+	public static function save_settings( $site_id ) {
+		// @TODO: add nonce
 		$_POST['site_url'] = str_replace( '/xmlrpc.php', '', $_POST['site_url'] );
 
-		update_post_meta( $site_ID, 'syn_site_url', esc_url_raw( $_POST['site_url'] ) );
-		update_post_meta( $site_ID, 'syn_site_username', sanitize_text_field( $_POST['site_username'] ) );
-		update_post_meta( $site_ID, 'syn_site_password', push_syndicate_encrypt( sanitize_text_field( $_POST['site_password'] ) ) );
+		update_post_meta( $site_id, 'syn_site_url', isset( $_POST['site_url'] ) ? esc_url_raw( $_POST['site_url'] ) : '' );
+		update_post_meta( $site_id, 'syn_site_username', isset( $_POST['site_username'] ) ? sanitize_text_field( $_POST['site_username'] ) : '' );
+		update_post_meta( $site_id, 'syn_site_password', isset( $_POST['site_password'] ) ? push_syndicate_encrypt( sanitize_text_field( $_POST['site_password'] ) ) : '' );
 
-		if( !filter_var( $_POST['site_url'], FILTER_VALIDATE_URL ) ) {
-			add_filter('redirect_post_location', function($location) {
-				return add_query_arg("message", 301, $location);
-			});
+		if ( ! filter_var( $_POST['site_url'], FILTER_VALIDATE_URL ) ) {
+			add_filter(
+				'redirect_post_location',
+				function( $location ) {
+					return add_query_arg( 'message', 301, $location );
+				}
+			);
 			return false;
 		}
 
 		return true;
-
 	}
 
-	public function get_post( $ext_ID )
-	{
+	public function get_post( $ext_id ) {
 		// TODO: Implement get_post() method.
 	}
 
-	public function get_posts( $args = array() )
-	{
+	public function get_posts( $args = array() ) {
 		// TODO: Implement get_posts() method.
 	}
 
 }
 
+/**
+ * Class Syndication_WP_XMLRPC_Client_Extensions
+ */
 class Syndication_WP_XMLRPC_Client_Extensions {
 
 	public static function init() {
-		add_filter( 'xmlrpc_methods' , array( __CLASS__, 'push_syndicate_methods' ) );
+		add_filter( 'xmlrpc_methods', array( __CLASS__, 'push_syndicate_methods' ) );
 	}
 
 	public static function push_syndicate_methods( $methods ) {
-        $methods['syndication.addThumbnail']    = array( __CLASS__, 'xmlrpc_add_thumbnail' );
-        $methods['syndication.deleteThumbnail']    = array( __CLASS__, 'xmlrpc_delete_thumbnail' );
-        $methods['syndication.postGalleryImage'] = array(__CLASS__, 'xmlrpc_post_gallery_images');
+		$methods['syndication.addThumbnail']     = array( __CLASS__, 'xmlrpc_add_thumbnail' );
+		$methods['syndication.deleteThumbnail']  = array( __CLASS__, 'xmlrpc_delete_thumbnail' );
+		$methods['syndication.postGalleryImage'] = array( __CLASS__, 'xmlrpc_post_gallery_images' );
 
 		return $methods;
 	}
@@ -564,104 +586,114 @@ public static function xmlrpc_add_thumbnail( $args ) {
 		$thumbnail_post_data = $args[6];
 		$thumbnail_alt_text  = $args[7];
 
-		if ( ! $post_ID )
-			return new IXR_Error( 500, __( 'Please specify a valid post_ID.', 'syndication' ) );
+		if ( ! $post_ID ) {
+			return new IXR_Error( 500, __( 'Please specify a valid post_ID.', 'push-syndication' ) );
+		}
 
+		// phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.wp_remote_get_wp_remote_get
 		$thumbnail_raw = wp_remote_retrieve_body( wp_remote_get( $thumbnail_url ) );
-		if ( ! $thumbnail_raw )
-			return new IXR_Error( 500, __( 'Sorry, the image URL provided was incorrect.', 'syndication' ) );
+		if ( ! $thumbnail_raw ) {
+			return new IXR_Error( 500, __( 'Sorry, the image URL provided was incorrect.', 'push-syndication' ) );
+		}
 
 		$thumbnail_filename = basename( $thumbnail_url );
-		$thumbnail_type = wp_check_filetype( $thumbnail_filename );
+		$thumbnail_type     = wp_check_filetype( $thumbnail_filename );
 
 		$args = array(
 			$blog_id,
 			$username,
 			$password,
 			array(
-				'name' => $thumbnail_filename,
-				'type' => $thumbnail_type['type'],
-				'bits' => $thumbnail_raw,
+				'name'      => $thumbnail_filename,
+				'type'      => $thumbnail_type['type'],
+				'bits'      => $thumbnail_raw,
 				'overwrite' => false,
 			),
 		);
 
-		// Note: Leting mw_newMediaObject handle our auth and cap checks
+		// Note: Leting mw_newMediaObject handle our auth and cap checks.
 		$image = $wp_xmlrpc_server->mw_newMediaObject( $args );
 
-		if ( ! is_array( $image ) || empty( $image['url'] ) )
+		if ( ! is_array( $image ) || empty( $image['url'] ) ) {
 			return $image;
+		}
 
 		$thumbnail_id = (int) $image['id'];
-		if( empty( $thumbnail_id ) )
-			return new IXR_Error( 500, __( 'Sorry, looks like the image upload failed.', 'syndication' ) );
+		if ( empty( $thumbnail_id ) ) {
+			return new IXR_Error( 500, __( 'Sorry, looks like the image upload failed.', 'push-syndication' ) );
+		}
 
-		if ( '_thumbnail_id' == $meta_key )
+		if ( '_thumbnail_id' == $meta_key ) {
 			$thumbnail_set = set_post_thumbnail( $post_ID, $thumbnail_id );
-		else
+		} else {
 			$thumbnail_set = update_post_meta( $post_ID, $meta_key, $thumbnail_id );
+		}
+
+		if ( ! $thumbnail_set ) {
+			return new IXR_Error( 403, __( 'Could not attach post thumbnail.', 'push-syndication' ) );
+		}
 
-		if ( ! $thumbnail_set )
-			return new IXR_Error( 403, __( 'Could not attach post thumbnail.' ) );
-		
 		$args = array(
 			$blog_id,
 			$username,
 			$password,
 			$thumbnail_id,
 			array(
-				'post_title' => $thumbnail_post_data['post_title'],
+				'post_title'   => $thumbnail_post_data['post_title'],
 				'post_content' => $thumbnail_post_data['post_content'],
 				'post_excerpt' => $thumbnail_post_data['post_excerpt'],
 			),
 		);
-		//update caption and description of the image
+		// update caption and description of the image.
 		$result = $wp_xmlrpc_server->wp_editPost( $args );
-		if ( $result !== true ) {
-			//failed to update atatchment post details
-			//handle it th way you want it (log it, message it)
+		if ( true !== $result ) {
+			// failed to update atatchment post details
+			// handle it th way you want it (log it, message it).
 		}
-		//update alt text of the image
-		update_post_meta($thumbnail_id, '_wp_attachment_image_alt', $thumbnail_alt_text);
+		// update alt text of the image.
+		update_post_meta( $thumbnail_id, '_wp_attachment_image_alt', $thumbnail_alt_text );
 
 		return $thumbnail_id;
 	}
 
 	public static function xmlrpc_delete_thumbnail( $args ) {
-
 		global $wp_xmlrpc_server;
 		$wp_xmlrpc_server->escape( $args );
 
-		$blog_id	    = (int) $args[0];
-		$username	    = $args[1];
-		$password	    = $args[2];
-		$post_ID            = (int) $args[3];
+		$blog_id  = (int) $args[0];
+		$username = $args[1];
+		$password = $args[2];
+		$post_ID  = (int) $args[3];
 		$meta_key = ! empty( $args[4] ) ? sanitize_text_field( $args[4] ) : '_thumbnail_id';
 
-		if ( !$user = $wp_xmlrpc_server->login( $username, $password ) )
+		if ( ! $user = $wp_xmlrpc_server->login( $username, $password ) ) {
 			return $wp_xmlrpc_server->error;
+		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.', 'push-syndication' ) );
+		}
 
-		if ( '_thumbnail_id' == $meta_key )
+		if ( '_thumbnail_id' == $meta_key ) {
 			$result = delete_post_thumbnail( $post_ID );
-		else
+		} else {
 			$result = delete_post_meta( $post_ID, $meta_key );
+		}
 
-		if ( ! $result )
-			return new IXR_Error( 403, __( 'Could not remove post thumbnail.' ) );
+		if ( ! $result ) {
+			return new IXR_Error( 403, __( 'Could not remove post thumbnail.', 'push-syndication' ) );
+		}
 
 		return true;
-
 	}
 
 	/**
-	* Upload Image for the gallery shortcode
-	* @uses $wp_xmlrpc_server
-	* @param array $args Contains necessary parameters for XMLRCP call: user, paasword, image data
-	* @return integer $thumbnail_id New ID of the newly uploaded image to the remote site
-	*/
+	 * Upload Image for the gallery shortcode
+	 *
+	 * @uses $wp_xmlrpc_server
+	 * @param array $args Contains necessary parameters for XMLRCP call: user, paasword, image data.
+	 * @return int|IXR_Error $thumbnail_id New ID of the newly uploaded image to the remote site
+	 */
 	public static function xmlrpc_post_gallery_images( $args ) {
 		global $wp_xmlrpc_server;
 
@@ -674,57 +706,59 @@ public static function xmlrpc_post_gallery_images( $args ) {
 		$thumbnail_post_data = $args[4];
 		$thumbnail_alt_text  = $args[5];
 
+		// phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.wp_remote_get_wp_remote_get
 		$thumbnail_raw = wp_remote_retrieve_body( wp_remote_get( $thumbnail_url ) );
 		if ( ! $thumbnail_raw ) {
-			return new IXR_Error( 500, __( 'Sorry, the image URL provided was incorrect.', 'syndication' ) );
+			return new IXR_Error( 500, __( 'Sorry, the image URL provided was incorrect.', 'push-syndication' ) );
 		}
 
 		$thumbnail_filename = basename( $thumbnail_url );
-		$thumbnail_type = wp_check_filetype( $thumbnail_filename );
+		$thumbnail_type     = wp_check_filetype( $thumbnail_filename );
 
 		$args = array(
 			$blog_id,
 			$username,
 			$password,
 			array(
-				'name' => $thumbnail_filename,
-				'type' => $thumbnail_type['type'],
-				'bits' => $thumbnail_raw,
+				'name'      => $thumbnail_filename,
+				'type'      => $thumbnail_type['type'],
+				'bits'      => $thumbnail_raw,
 				'overwrite' => false,
 			),
 		);
 
-		// Note: Leting mw_newMediaObject handle our auth and cap checks
+		// Note: Leting mw_newMediaObject handle our auth and cap checks.
 		$image = $wp_xmlrpc_server->mw_newMediaObject( $args );
-		if ( ! is_array( $image ) || empty($image['url'] ) ) {
+		if ( ! is_array( $image ) || empty( $image['url'] ) ) {
 			return $image;
 		}
 
 		$thumbnail_id = (int) $image['id'];
 		if ( empty( $thumbnail_id ) ) {
-			return new IXR_Error( 500, __( 'Sorry, looks like the image upload failed.', 'syndication' ) );
+			return new IXR_Error( 500, __( 'Sorry, looks like the image upload failed.', 'push-syndication' ) );
 		}
-		
+
 		$args = array(
 			$blog_id,
 			$username,
 			$password,
 			$thumbnail_id,
 			array(
-				'post_title' => $thumbnail_post_data['post_title'],
+				'post_title'   => $thumbnail_post_data['post_title'],
 				'post_content' => $thumbnail_post_data['post_content'],
 				'post_excerpt' => $thumbnail_post_data['post_excerpt'],
 			),
 		);
 
-		//update caption and description of the image
+		// update caption and description of the image.
 		$result = $wp_xmlrpc_server->wp_editPost( $args );
-		if ( $result !== true ) {
-			//failed to update atatchment post details
-			//handle it th way you want it (log it, message it)
-			error_log('Syndication. xmlrpc_post_gallery_images Failed to update remote post attachments');
+		if ( true !== $result ) {
+			// failed to update atatchment post details
+			// handle it th way you want it (log it, message it).
+			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
+			error_log( 'Syndication. xmlrpc_post_gallery_images Failed to update remote post attachments' );
 		}
-		//update alt text of the image
+		// update alt text of the image.
 		update_post_meta( $thumbnail_id, '_wp_attachment_image_alt', $thumbnail_alt_text );
 
 		return $thumbnail_id;
diff --git a/includes/class-walker-category-dropdown-multiple.php b/includes/class-walker-category-dropdown-multiple.php
index 2f73d92a..d8a5e46d 100644
--- a/includes/class-walker-category-dropdown-multiple.php
+++ b/includes/class-walker-category-dropdown-multiple.php
@@ -1,40 +1,45 @@
 <?php
 /**
  * Create HTML list of categories. Allowing a multiple select list
+ *
  * @uses Walker
  */
 class Walker_CategoryDropdownMultiple extends Walker {
+	// @TODO: phpcs - rename class?
 
-	var $tree_type = 'category';
+	public $tree_type = 'category';
 
-	var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	public $db_fields = array(
+		'parent' => 'parent',
+		'id'     => 'term_id',
+	);
 
 	/**
 	 * Start the element output.
 	 *
-	 * @see Walker::start_el()
-	 *
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
+	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param object $category Category data object.
-	 * @param int    $depth    Depth of category in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_list_categories()
-	 * @param int    $id       ID of the current category.
+	 * @param int    $depth Depth of category in reference to parents. Default 0.
+	 * @param array  $args An array of arguments. @see wp_list_categories().
+	 * @param int    $current_object_id The current object ID.
+	 *
+	 * @see Walker::start_el()
 	 */
-	function start_el( &$output, $category, $depth = 0, $args = array(), $current_object_id = 0 ) {
+	public function start_el( &$output, $category, $depth = 0, $args = array(), $current_object_id = 0 ) {
 		$pad = str_repeat( '&nbsp;', $depth * 3 );
 
+		// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
 		$cat_name = apply_filters( 'list_cats', $category->name, $category );
 
-		$output .= "\t<option class=\"level-$depth\" value=\"".$category->term_id."\"";
+		$output .= '\t<option class="level-' . esc_attr( $depth ) . '" value="' . esc_attr( $category->term_id ) . '"';
 		if ( isset( $args['selected_array'] ) && in_array( $category->term_id, $args['selected_array'] ) ) {
 			$output .= ' selected="selected"';
 		}
 		$output .= '>';
-		$output .= $pad.$cat_name;
+		$output .= $pad . $cat_name;
 
 		if ( $args['show_count'] ) {
-			$output .= '&nbsp;&nbsp;('. $category->count .')';
+			$output .= '&nbsp;&nbsp;(' . esc_html( $category->count ) . ')';
 		}
 		$output .= "</option>\n";
 	}
diff --git a/includes/class-wp-cli.php b/includes/class-wp-cli.php
index 678fd5cd..f6f0dd43 100644
--- a/includes/class-wp-cli.php
+++ b/includes/class-wp-cli.php
@@ -2,6 +2,9 @@
 
 WP_CLI::add_command( 'syndication', 'Syndication_CLI_Command' );
 
+/**
+ * Class Syndication_CLI_Command
+ */
 class Syndication_CLI_Command extends WP_CLI_Command {
 	var $enabled_verbosity = false;
 
@@ -11,24 +14,27 @@ class Syndication_CLI_Command extends WP_CLI_Command {
 	 * @subcommand push-all-posts
 	 * @synopsis [--post_type=<post-type>] [--paged=<page>]
 	 */
-	function push_all_posts( $args, $assoc_args ) {
-		$assoc_args = wp_parse_args( $assoc_args, array(
-			'post_type' 	=> 'post',
-			'paged' 		=> 1
-		) );
+	public function push_all_posts( $args, $assoc_args ) {
+		$assoc_args = wp_parse_args(
+			$assoc_args,
+			array(
+				'post_type' => 'post',
+				'paged'     => 1,
+			)
+		);
 
 		$query_args = array(
-			'post_type' 		=> $assoc_args[ 'post_type' ],
-			'posts_per_page' 	=> 150,
-			'paged'				=> $assoc_args[ 'paged' ]
+			'post_type'      => $assoc_args['post_type'],
+			'posts_per_page' => 150, //phpcs:ignore WordPress.WP.PostsPerPage.posts_per_page_posts_per_page
+			'paged'          => $assoc_args['paged'],
 		);
 
 		$query = new WP_Query( $query_args );
 
-		while( $query->post_count ) {
-			WP_CLI::line( sprintf( 'Processing page %d', $query_args[ 'paged' ] ) );
+		while ( $query->post_count ) {
+			WP_CLI::line( sprintf( 'Processing page %d', $query_args['paged'] ) );
 
-			foreach( $query->posts as $post ) {
+			foreach ( $query->posts as $post ) {
 				WP_CLI::line( sprintf( 'Processing post %d (%s)', $post->ID, $post->post_title ) );
 
 				$this->push_post( array(), array( 'post_id' => $post->ID ) );
@@ -38,27 +44,30 @@ function push_all_posts( $args, $assoc_args ) {
 
 			sleep( 2 );
 
-			$query_args[ 'paged' ]++;
+			$query_args['paged']++;
 
 			$query = new WP_Query( $query_args );
 		}
 	}
 
-	function push_post( $args, $assoc_args ) {
-		$assoc_args = wp_parse_args( $assoc_args, array(
-			'post_id' => 0,
-		) );
+	public function push_post( $args, $assoc_args ) {
+		$assoc_args = wp_parse_args(
+			$assoc_args,
+			array(
+				'post_id' => 0,
+			)
+		);
 
-		$post_id = intval( $assoc_args[ 'post_id' ] );
-		$post = get_post( $post_id );
+		$post_id = intval( $assoc_args['post_id'] );
+		$post    = get_post( $post_id );
 		if ( ! $post ) {
 			WP_CLI::error( __( 'Invalid post_id', 'push-syndication' ) );
 		}
 
-		$this->_make_em_talk_push();
+		$this->make_em_talk_push();
 
-		$server = $this->_get_syndication_server();
-		$sites = $server->get_sites_by_post_ID( $post_id );
+		$server = $this->get_syndication_server();
+		$sites  = $server->get_sites_by_post_ID( $post_id );
 
 		if ( empty( $sites ) ) {
 			WP_CLI::error( __( 'Post has no selected sitegroups / sites', 'push-syndication' ) );
@@ -67,90 +76,129 @@ function push_post( $args, $assoc_args ) {
 		$server->push_content( $sites );
 	}
 
-	function pull_site( $args, $assoc_args ) {
-		$assoc_args = wp_parse_args( $assoc_args, array(
-			'site_id' => 0,
-		) );
+	public function pull_site( $args, $assoc_args ) {
+		$assoc_args = wp_parse_args(
+			$assoc_args,
+			array(
+				'site_id' => 0,
+			)
+		);
 
 		$site_id = intval( $assoc_args['site_id'] );
-		$site = get_post( $site_id );
+		$site    = get_post( $site_id );
 
-		if ( ! $site || 'syn_site' !== $site->post_type )
-			WP_CLI::error( "Please select a valid site." );
+		if ( ! $site || 'syn_site' !== $site->post_type ) {
+			WP_CLI::error( 'Please select a valid site.' );
+		}
 
-		// enable verbosity
-		$this->_make_em_talk_pull();
+		// enable verbosity.
+		$this->make_em_talk_pull();
 
-		$this->_get_syndication_server()->pull_content( array( $site ) );
+		$this->get_syndication_server()->pull_content( array( $site ) );
 	}
 
-	function pull_sitegroup( $args, $assoc_args ) {
-		$assoc_args = wp_parse_args( $assoc_args, array(
-			'sitegroup' => '',
-		) );
+	public function pull_sitegroup( $args, $assoc_args ) {
+		$assoc_args = wp_parse_args(
+			$assoc_args,
+			array(
+				'sitegroup' => '',
+			)
+		);
 
 		$sitegroup = sanitize_key( $assoc_args['sitegroup'] );
 
-		if ( empty( $sitegroup ) )
-			WP_CLI::error( "Please specify a valid sitegroup" );
+		if ( empty( $sitegroup ) ) {
+			WP_CLI::error( 'Please specify a valid sitegroup' );
+		}
 
-		$server = $this->_get_syndication_server();
-		$sites = $server->get_sites_by_sitegroup( $sitegroup );
+		$server = $this->get_syndication_server();
+		$sites  = $server->get_sites_by_sitegroup( $sitegroup );
 
-		// enable verbosity
-		$this->_make_em_talk_pull();
+		// enable verbosity.
+		$this->make_em_talk_pull();
 
-		// do it, to it
+		// do it, to it.
 		$server->pull_content( $sites );
 	}
 
-	private function _make_em_talk_pull() {
-		if ( $this->enabled_verbosity )
+	private function make_em_talk_pull() {
+		if ( $this->enabled_verbosity ) {
 			return;
+		}
 
 		$this->enabled_verbosity = true;
 
-		// output when a post is new or updated
-		add_filter( 'syn_pre_pull_posts', function( $posts, $site, $client ) {
-			WP_CLI::line( sprintf( 'Processing feed %s (%d)', $site->post_title, $site->ID ) );
-			WP_CLI::line( sprintf( '-- found %s posts', count( $posts ) ) );
-
-			return $posts;
-		}, 10, 3 );
+		// output when a post is new or updated.
+		add_filter(
+			'syn_pre_pull_posts',
+			function( $posts, $site, $client ) {
+				WP_CLI::line( sprintf( 'Processing feed %s (%d)', $site->post_title, $site->ID ) );
+				WP_CLI::line( sprintf( '-- found %s posts', count( $posts ) ) );
+
+				return $posts;
+			},
+			10,
+			3
+		);
 
-		add_action( 'syn_post_pull_new_post', function( $result, $post, $site, $transport_type, $client ) {
-			WP_CLI::line( sprintf( '-- New post #%d (%s)', $result, $post['post_guid'] ) );
-		}, 10, 5 );
+		add_action(
+			'syn_post_pull_new_post',
+			function( $result, $post, $site, $transport_type, $client ) {
+				WP_CLI::line( sprintf( '-- New post #%d (%s)', $result, $post['post_guid'] ) );
+			},
+			10,
+			5
+		);
 
-		add_action( 'syn_post_pull_edit_post', function( $result, $post, $site, $transport_type, $client ) {
-			WP_CLI::line( sprintf( '-- Updated post #%d (%s)', $result, $post['post_guid'] ) );
-		}, 10, 5 );
+		add_action(
+			'syn_post_pull_edit_post',
+			function( $result, $post, $site, $transport_type, $client ) {
+				WP_CLI::line( sprintf( '-- Updated post #%d (%s)', $result, $post['post_guid'] ) );
+			},
+			10,
+			5
+		);
 	}
 
-	private function _make_em_talk_push() {
-		if ( $this->enabled_verbosity )
+	private function make_em_talk_push() {
+		if ( $this->enabled_verbosity ) {
 			return;
+		}
 
 		$this->enabled_verbosity = true;
 
-		add_filter( 'syn_pre_push_post_sites', function( $sites, $post_id, $slave_states ) {
-			WP_CLI::line( sprintf( "Processing post_id #%d (%s)", $post_id, get_the_title( $post_id ) ) );
-			WP_CLI::line( sprintf( "-- pushing to %s sites and deleting from %s sites", number_format( count( $sites['selected_sites'] ) ), number_format( count( $sites['removed_sites'] ) ) ) );
+		add_filter(
+			'syn_pre_push_post_sites',
+			function( $sites, $post_id, $slave_states ) {
+				WP_CLI::line( sprintf( 'Processing post_id #%d (%s)', $post_id, get_the_title( $post_id ) ) );
+				WP_CLI::line( sprintf( '-- pushing to %s sites and deleting from %s sites', number_format( count( $sites['selected_sites'] ) ), number_format( count( $sites['removed_sites'] ) ) ) );
 
-			return $sites;
-		}, 10, 3 );
-
-		add_action( 'syn_post_push_new_post', function( $result, $post_ID, $site, $transport_type, $client, $info ) {
-			WP_CLI::line( sprintf( '-- Added remote post #%d (%s)', $post_ID, $site->post_title ) );
-		}, 10, 6 );
+				return $sites;
+			},
+			10,
+			3
+		);
 
-		add_action( 'syn_post_push_edit_post', function( $result, $post_ID, $site, $transport_type, $client, $info ) {
-			WP_CLI::line( sprintf( '-- Updated remote post #%d (%s)', $post_ID, $site->post_title ) );
-		}, 10, 6 );
+		add_action(
+			'syn_post_push_new_post',
+			function( $result, $post_ID, $site, $transport_type, $client, $info ) {
+				WP_CLI::line( sprintf( '-- Added remote post #%d (%s)', $post_ID, $site->post_title ) );
+			},
+			10,
+			6
+		);
 
+		add_action(
+			'syn_post_push_edit_post',
+			function( $result, $post_ID, $site, $transport_type, $client, $info ) {
+				WP_CLI::line( sprintf( '-- Updated remote post #%d (%s)', $post_ID, $site->post_title ) );
+			},
+			10,
+			6
+		);
 	}
 
-	private function _get_syndication_server() {
+	private function get_syndication_server() {
 		return $GLOBALS['push_syndication_server'];
 	}
 
@@ -159,15 +207,17 @@ protected function stop_the_insanity() {
 
 		$wpdb->queries = array(); // or define( 'WP_IMPORTING', true );
 
-		if ( !is_object( $wp_object_cache ) )
+		if ( ! is_object( $wp_object_cache ) ) {
 			return;
+		}
 
-		$wp_object_cache->group_ops = array();
-		$wp_object_cache->stats = array();
+		$wp_object_cache->group_ops      = array();
+		$wp_object_cache->stats          = array();
 		$wp_object_cache->memcache_debug = array();
-		$wp_object_cache->cache = array();
+		$wp_object_cache->cache          = array();
 
-		if ( is_callable( $wp_object_cache, '__remoteset' ) )
-			$wp_object_cache->__remoteset(); // important
+		if ( is_callable( $wp_object_cache, '__remoteset' ) ) {
+			$wp_object_cache->__remoteset(); // important!
+		}
 	}
 }
diff --git a/includes/interface-syndication-client.php b/includes/interface-syndication-client.php
index a0cda402..1375362c 100644
--- a/includes/interface-syndication-client.php
+++ b/includes/interface-syndication-client.php
@@ -4,55 +4,56 @@ interface Syndication_Client {
 
 	/**
 	 * Return Client Data
+	 *
 	 * @return array array( 'id' => (string) $transport_name, 'modes' => array( 'push', 'pull' ), 'name' => (string) $name );
 	 */
 	public static function get_client_data();
-	 
+
 	/**
 	 * Creates a new post in the slave site.
 	 *
-	 * @param   int  $post_ID  The post ID to push.
+	 * @param   int $post_id  The post ID to push.
 	 *
 	 * @return  boolean true on success false on failure.
 	 */
-	public function new_post( $post_ID );
+	public function new_post( $post_id );
 
 	/**
 	 * Edits an existing post in the slave site.
 	 *
-	 * @param   int  $post_ID  The post ID to push.
-	 * @param   int  $ext_ID   Slave post ID to edit.
+	 * @param   int $post_id  The post ID to push.
+	 * @param   int $ext_id   Slave post ID to edit.
 	 *
 	 * @return  boolean true on success false on failure.
 	 */
-	public function edit_post( $post_ID, $ext_ID );
+	public function edit_post( $post_id, $ext_id );
 
 	/**
 	 * Deletes an existing post in the slave site.
 	 *
-	 * @param   int  $ext_ID  Slave post ID to delete.
+	 * @param   int $ext_id  Slave post ID to delete.
 	 *
 	 * @return  boolean true on success false on failure.
 	 */
-	public function delete_post( $ext_ID );
+	public function delete_post( $ext_id );
 
-    /**
-     * Retrieves a single post from a slave site.
-     *
-     * @param   int  $ext_ID  Slave post ID to retrieve.
-     *
-     * @return  boolean true on success false on failure.
-     */
-    public function get_post( $ext_ID );
+	/**
+	 * Retrieves a single post from a slave site.
+	 *
+	 * @param   int $ext_id  Slave post ID to retrieve.
+	 *
+	 * @return  boolean true on success false on failure.
+	 */
+	public function get_post( $ext_id );
 
-    /**
-     * Retrieves a list of posts from a slave site.
-     *
-     * @param   array   $args  Arguments when retrieving posts.
-     *
-     * @return  boolean true on success false on failure.
-     */
-    public function get_posts( $args = array() );
+	/**
+	 * Retrieves a list of posts from a slave site.
+	 *
+	 * @param   array $args  Arguments when retrieving posts.
+	 *
+	 * @return  boolean true on success false on failure.
+	 */
+	public function get_posts( $args = array() );
 
 	/**
 	 * Test the connection with the slave site.
@@ -64,26 +65,26 @@ public function test_connection();
 	/**
 	 * Checks whether the given post exists in the slave site.
 	 *
-	 * @param   int  $ext_ID  Slave post ID to check.
+	 * @param   int $ext_id  Slave post ID to check.
 	 *
 	 * @return  boolean  true on success false on failure.
 	 */
-	public function is_post_exists( $ext_ID );
+	public function is_post_exists( $ext_id );
 
 	/**
 	 * Display the client settings for the slave site.
 	 *
-	 * @param   object  $site  The site object to display settings.
+	 * @param   object $site  The site object to display settings.
 	 */
 	public static function display_settings( $site );
 
 	/**
 	 * Save the client settings for the slave site.
 	 *
-	 * @param   int  $site_ID  The site ID to save settings.
+	 * @param   int $site_id  The site ID to save settings.
 	 *
 	 * @return  boolean  true on success false on failure.
 	 */
-	public static function save_settings( $site_ID );
+	public static function save_settings( $site_id );
 
-}
\ No newline at end of file
+}
diff --git a/push-syndication.php b/push-syndication.php
index 0f57d873..3f2a2742 100644
--- a/push-syndication.php
+++ b/push-syndication.php
@@ -7,25 +7,28 @@
  * Author:       Automattic
  * Author URI:   http://automattic.com
  * License:      GPLv2 or later
+ * Text Domain:  push-syndication
  */
 
 define( 'SYNDICATION_VERSION', 2.0 );
 
-if ( ! defined( 'PUSH_SYNDICATE_KEY' ) )
+if ( ! defined( 'PUSH_SYNDICATE_KEY' ) ) {
 	define( 'PUSH_SYNDICATE_KEY', 'PUSH_SYNDICATE_KEY' );
+}
 
 /**
  * Load syndication logger
  */
-require_once( dirname( __FILE__ ) . '/includes/class-syndication-logger.php' );
+require_once dirname( __FILE__ ) . '/includes/class-syndication-logger.php';
 Syndication_Logger::init();
 
-require_once( dirname( __FILE__ ) . '/includes/class-wp-push-syndication-server.php' );
+require_once dirname( __FILE__ ) . '/includes/class-wp-push-syndication-server.php';
 
-if ( defined( 'WP_CLI' ) && WP_CLI )
-	require_once( dirname( __FILE__ ) . '/includes/class-wp-cli.php' );
+if ( defined( 'WP_CLI' ) && WP_CLI ) {
+	require_once dirname( __FILE__ ) . '/includes/class-wp-cli.php';
+}
 
-$GLOBALS['push_syndication_server'] = new WP_Push_Syndication_Server;
+$GLOBALS['push_syndication_server'] = new WP_Push_Syndication_Server();
 
 // Create the event counter.
 require __DIR__ . '/includes/class-syndication-event-counter.php';
@@ -35,6 +38,6 @@
 require __DIR__ . '/includes/class-syndication-site-failure-monitor.php';
 new Syndication_Site_Failure_Monitor();
 
-// Create the site auto retry functionality
+// Create the site auto retry functionality.
 require __DIR__ . '/includes/class-syndication-site-auto-retry.php';
 new Failed_Syndication_Auto_Retry();

From 972a3515a527093b8c6fbec141656d1370242958 Mon Sep 17 00:00:00 2001
From: Henrique Mouta <henrique@automattic.com>
Date: Fri, 9 Jul 2021 15:53:06 +0100
Subject: [PATCH 2/3] PHPCS fixes on `WP_Push_Syndication_Server`

---
 includes/class-wp-push-syndication-server.php | 988 ++++++++++--------
 1 file changed, 541 insertions(+), 447 deletions(-)

diff --git a/includes/class-wp-push-syndication-server.php b/includes/class-wp-push-syndication-server.php
index 5da03d62..79c25144 100644
--- a/includes/class-wp-push-syndication-server.php
+++ b/includes/class-wp-push-syndication-server.php
@@ -1,52 +1,69 @@
 <?php
 
-require_once( dirname( __FILE__ ) . '/class-syndication-client-factory.php' );
+require_once dirname( __FILE__ ) . '/class-syndication-client-factory.php';
 
+/**
+ * Class WP_Push_Syndication_Server
+ */
 class WP_Push_Syndication_Server {
 
 	const CUSTOM_USER_AGENT = 'WordPress/Syndication Plugin';
 
-	public  $push_syndicate_settings;
-	public  $push_syndicate_default_settings;
-	public  $push_syndicate_transports;
+	public $push_syndicate_settings;
+	public $push_syndicate_default_settings;
+	public $push_syndicate_transports;
 
 	private $version;
 
-	function __construct() {
+	/**
+	 * WP_Push_Syndication_Server constructor.
+	 */
+	public function __construct() {
+		$this->push_syndicate_default_settings = array(
+			'selected_pull_sitegroups' => array(),
+			'selected_post_types'      => array( 'post' ),
+			'delete_pushed_posts'      => 'off',
+			'pull_time_interval'       => '3600',
+			'update_pulled_posts'      => 'off',
+			'client_id'                => '',
+			'client_secret'            => '',
+		);
+
+		$this->push_syndicate_settings = wp_parse_args( (array) get_option( 'push_syndicate_settings' ), $this->push_syndicate_default_settings );
 
-		// initialization
+		// initialization.
 		add_action( 'init', array( $this, 'init' ) );
 		add_action( 'admin_init', array( $this, 'admin_init' ) );
 
-		// custom columns
+		// custom columns.
 		add_filter( 'manage_edit-syn_site_columns', array( $this, 'add_new_columns' ) );
-		add_action( 'manage_syn_site_posts_custom_column', array( $this, 'manage_columns' ), 10, 2);
+		add_action( 'manage_syn_site_posts_custom_column', array( $this, 'manage_columns' ), 10, 2 );
 
-		// submenus
+		// submenus.
 		add_action( 'admin_menu', array( $this, 'register_syndicate_settings' ) );
 
-		// defining sites
+		// defining sites.
 		add_action( 'save_post', array( $this, 'save_site_settings' ) );
 
-		// loading necessary styles and scripts
+		// loading necessary styles and scripts.
 		add_action( 'admin_enqueue_scripts', array( $this, 'load_scripts_and_styles' ) );
 
-		// filter admin notices in custom post types
+		// filter admin notices in custom post types.
 		add_filter( 'post_updated_messages', array( $this, 'push_syndicate_admin_messages' ) );
 
-		// syndicating content
+		// syndicating content.
 		add_action( 'add_meta_boxes', array( $this, 'add_post_metaboxes' ) );
-		add_action( 'transition_post_status', array( $this, 'save_syndicate_settings' ) ); // use transition_post_status instead of save_post because the former is fired earlier which causes race conditions when a site group select and publish happen on the same load
+		add_action( 'transition_post_status', array( $this, 'save_syndicate_settings' ) ); // use transition_post_status instead of save_post because the former is fired earlier which causes race conditions when a site group select and publish happen on the same load.
 		add_action( 'wp_trash_post', array( $this, 'delete_content' ) );
 
-		// adding custom time interval
-		add_filter( 'cron_schedules', array( $this, 'cron_add_pull_time_interval' ) );
+		// adding custom time interval.
+		add_filter( 'cron_schedules', array( $this, 'cron_add_pull_time_interval' ) ); // phpcs:ignore WordPress.WP.CronInterval.ChangeDetected
 
-		// firing a cron job
+		// firing a cron job.
 		add_action( 'transition_post_status', array( $this, 'pre_schedule_push_content' ), 10, 3 );
 		add_action( 'delete_post', array( $this, 'schedule_delete_content' ) );
 
-		// Handle changes to sites and site groups
+		// Handle changes to sites and site groups.
 		add_action( 'save_post', array( $this, 'handle_site_change' ) );
 		add_action( 'delete_post', array( $this, 'handle_site_change' ) );
 		add_action( 'create_term', array( $this, 'handle_site_group_change' ), 10, 3 );
@@ -63,19 +80,19 @@ function __construct() {
 		do_action( 'syn_after_setup_server' );
 	}
 
-	public function init() {
 
+	public function init() {
 		$capability = apply_filters( 'syn_syndicate_cap', 'manage_options' );
 
 		$post_type_capabilities = array(
-					'edit_post'          => $capability,
-					'read_post'          => $capability,
-					'delete_post'        => $capability,
-					'delete_posts'		 => $capability, // only added to address notice caused by https://core.trac.wordpress.org/ticket/30991
-					'edit_posts'         => $capability,
-					'edit_others_posts'  => $capability,
-					'publish_posts'      => $capability,
-					'read_private_posts' => $capability
+			'edit_post'          => $capability,
+			'read_post'          => $capability,
+			'delete_post'        => $capability,
+			'delete_posts'       => $capability, // only added to address notice caused by https://core.trac.wordpress.org/ticket/30991.
+			'edit_posts'         => $capability,
+			'edit_others_posts'  => $capability,
+			'publish_posts'      => $capability,
+			'read_private_posts' => $capability,
 		);
 
 		$taxonomy_capabilities = array(
@@ -85,68 +102,63 @@ public function init() {
 			'assign_terms' => 'edit_posts',
 		);
 
-		register_post_type( 'syn_site', array(
-			'labels' => array(
-				'name'              => __( 'Sites' ),
-				'singular_name'     => __( 'Site' ),
-				'add_new'           => __( 'Add Site' ),
-				'add_new_item'      => __( 'Add New Site' ),
-				'edit_item'         => __( 'Edit Site' ),
-				'new_item'          => __( 'New Site' ),
-				'view_item'         => __( 'View Site' ),
-				'search_items'      => __( 'Search Sites' ),
-			),
-			'description'           => __( 'Sites in the network' ),
-			'public'                => false,
-			'show_ui'               => true,
-			'publicly_queryable'    => false,
-			'exclude_from_search'   => true,
-			'menu_position'         => 100,
-			// @TODO we need a menu icon here
-			'hierarchical'          => false, // @TODO check this
-			'query_var'             => false,
-			'rewrite'               => false,
-			'supports'              => array( 'title' ),
-			'can_export'            => true,
-			'register_meta_box_cb'  => array( $this, 'site_metaboxes' ),
-			'capabilities'          => $post_type_capabilities,
-		));
-
-		register_taxonomy( 'syn_sitegroup', 'syn_site', array(
-				'labels' => array(
-					'name'              => __( 'Site Groups' ),
-					'singular_name'     => __( 'Site Group' ),
-					'search_items'      => __( 'Search Site Groups' ),
-					'popular_items'     => __( 'Popular Site Groups' ),
-					'all_items'         => __( 'All Site Groups' ),
-					'parent_item'       => __( 'Parent Site Group' ),
-					'parent_item_colon' => __( 'Parent Site Group' ),
-					'edit_item'         => __( 'Edit Site Group' ),
-					'update_item'       => __( 'Update Site Group' ),
-					'add_new_item'      => __( 'Add New Site Group' ),
-					'new_item_name'     => __( 'New Site Group Name' ),
-
+		register_post_type(
+			'syn_site',
+			array(
+				'labels'               => array(
+					'name'          => __( 'Sites', 'push-syndication' ),
+					'singular_name' => __( 'Site', 'push-syndication' ),
+					'add_new'       => __( 'Add Site', 'push-syndication' ),
+					'add_new_item'  => __( 'Add New Site', 'push-syndication' ),
+					'edit_item'     => __( 'Edit Site', 'push-syndication' ),
+					'new_item'      => __( 'New Site', 'push-syndication' ),
+					'view_item'     => __( 'View Site', 'push-syndication' ),
+					'search_items'  => __( 'Search Sites', 'push-syndication' ),
 				),
-				'public'                => false,
-				'show_ui'               => true,
-				'show_tagcloud'         => false,
-				'show_in_nav_menus'     => false,
-				'hierarchical'          => true,
-				'rewrite'               => false,
-				'capabilities'          => $taxonomy_capabilities,
-		));
-
-		$this->push_syndicate_default_settings = array(
-			'selected_pull_sitegroups'  => array(),
-			'selected_post_types'       => array( 'post' ),
-			'delete_pushed_posts'       => 'off',
-			'pull_time_interval'        => '3600',
-			'update_pulled_posts'       => 'off',
-			'client_id'                 => '',
-			'client_secret'             => ''
+				'description'          => __( 'Sites in the network', 'push-syndication' ),
+				'public'               => false,
+				'show_ui'              => true,
+				'publicly_queryable'   => false,
+				'exclude_from_search'  => true,
+				'menu_position'        => 100,
+				// @TODO we need a menu icon here
+				'hierarchical'         => false, // @TODO check this
+				'query_var'            => false,
+				'rewrite'              => false,
+				'supports'             => array( 'title' ),
+				'can_export'           => true,
+				'register_meta_box_cb' => array( $this, 'site_metaboxes' ),
+				'capabilities'         => $post_type_capabilities,
+			)
 		);
 
-		$this->push_syndicate_settings = wp_parse_args( (array) get_option( 'push_syndicate_settings' ), $this->push_syndicate_default_settings );
+		register_taxonomy(
+			'syn_sitegroup',
+			'syn_site',
+			array(
+				'labels'            => array(
+					'name'              => __( 'Site Groups', 'push-syndication' ),
+					'singular_name'     => __( 'Site Group', 'push-syndication' ),
+					'search_items'      => __( 'Search Site Groups', 'push-syndication' ),
+					'popular_items'     => __( 'Popular Site Groups', 'push-syndication' ),
+					'all_items'         => __( 'All Site Groups', 'push-syndication' ),
+					'parent_item'       => __( 'Parent Site Group', 'push-syndication' ),
+					'parent_item_colon' => __( 'Parent Site Group', 'push-syndication' ),
+					'edit_item'         => __( 'Edit Site Group', 'push-syndication' ),
+					'update_item'       => __( 'Update Site Group', 'push-syndication' ),
+					'add_new_item'      => __( 'Add New Site Group', 'push-syndication' ),
+					'new_item_name'     => __( 'New Site Group Name', 'push-syndication' ),
+
+				),
+				'public'            => false,
+				'show_ui'           => true,
+				'show_tagcloud'     => false,
+				'show_in_nav_menus' => false,
+				'hierarchical'      => true,
+				'rewrite'           => false,
+				'capabilities'      => $taxonomy_capabilities,
+			)
+		);
 
 		$this->version = get_option( 'syn_version' );
 
@@ -163,13 +175,13 @@ public function register_syndicate_actions() {
 	}
 
 	public function add_new_columns( $columns ) {
-		$new_columns = array();
-		$new_columns['cb'] = '<input type="checkbox" />';
-		$new_columns['title'] = _x( 'Site Name', 'column name' );
-		$new_columns['client-type'] = _x( 'Client Type', 'column name' );
-		$new_columns['syn_sitegroup'] = _x( 'Groups', 'column name' );
-		$new_columns['site_status'] = _x( 'Status', 'column name' );
-		$new_columns['date'] = _x('Date', 'column name');
+		$new_columns                  = array();
+		$new_columns['cb']            = '<input type="checkbox" />';
+		$new_columns['title']         = _x( 'Site Name', 'column name', 'push-syndication' );
+		$new_columns['client-type']   = _x( 'Client Type', 'column name', 'push-syndication' );
+		$new_columns['syn_sitegroup'] = _x( 'Groups', 'column name', 'push-syndication' );
+		$new_columns['site_status']   = _x( 'Status', 'column name', 'push-syndication' );
+		$new_columns['date']          = _x( 'Date', 'column name', 'push-syndication' );
 		return $new_columns;
 	}
 
@@ -179,11 +191,11 @@ public function manage_columns( $column_name, $id ) {
 			case 'client-type':
 				$transport_type = get_post_meta( $id, 'syn_transport_type', true );
 				try {
-					$client = Syndication_Client_Factory::get_client( $transport_type, $id );
+					$client      = Syndication_Client_Factory::get_client( $transport_type, $id );
 					$client_data = $client->get_client_data();
 					echo esc_html( sprintf( '%s (%s)', $client_data['name'], array_shift( $client_data['modes'] ) ) );
 				} catch ( Exception $e ) {
-					printf( __( 'Unknown (%s)', 'push-syndication' ), esc_html( $transport_type ) );
+					printf( esc_html__( 'Unknown (%s)', 'push-syndication' ), esc_html( $transport_type ) );
 				}
 				break;
 			case 'syn_sitegroup':
@@ -208,34 +220,39 @@ public function admin_init() {
 
 		$full_path = __DIR__ . '/';
 		if ( $handle = opendir( $full_path ) ) {
-			while ( false !== ( $entry = readdir( $handle ) ) ) {
-				if ( !preg_match( $name_match, $entry, $matches ) )
+			while ( false !== ( $entry = readdir( $handle ) ) ) { // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
+				if ( ! preg_match( $name_match, $entry, $matches ) ) {
 					continue;
-				require_once( $full_path . $entry );
+				}
+				require_once $full_path . $entry;
 				$class_name = 'Syndication_' . strtoupper( str_replace( '-', '_', $matches[1] ) ) . '_Client';
 
-				if ( !class_exists( $class_name ) )
+				if ( ! class_exists( $class_name ) ) {
 					continue;
+				}
 				$client_data = call_user_func( array( $class_name, 'get_client_data' ) );
-				if ( is_array( $client_data ) && !empty( $client_data ) ) {
-					$this->push_syndicate_transports[$client_data['id']] = array( 'name' => $client_data['name'], 'modes' => $client_data['modes'] );
-					}
+				if ( is_array( $client_data ) && ! empty( $client_data ) ) {
+					$this->push_syndicate_transports[ $client_data['id'] ] = array(
+						'name'  => $client_data['name'],
+						'modes' => $client_data['modes'],
+					);
+				}
 			}
 		}
 		$this->push_syndicate_transports = apply_filters( 'syn_transports', $this->push_syndicate_transports );
 
-		// register settings
+		// register settings.
 		register_setting( 'push_syndicate_settings', 'push_syndicate_settings', array( $this, 'push_syndicate_settings_validate' ) );
 		register_setting( 'push_syndicate_settings', 'push_syndication_max_pull_attempts', array( $this, 'validate_max_pull_attempts' ) );
 
-		// Maybe run upgrade
+		// Maybe run upgrade.
 		$this->upgrade();
 	}
 
 	public function load_scripts_and_styles( $hook ) {
 		global $typenow;
 		if ( 'syn_site' == $typenow ) {
-			if( $hook == 'edit.php' ) {
+			if ( 'edit.php' === $hook ) {
 				wp_enqueue_style( 'syn-edit-sites', plugins_url( 'css/sites.css', __FILE__ ), array(), $this->version );
 			} elseif ( in_array( $hook, array( 'post.php', 'post-new.php' ) ) ) {
 				wp_enqueue_style( 'syn-edit-site', plugins_url( 'css/edit-site.css', __FILE__ ), array(), $this->version );
@@ -244,45 +261,42 @@ public function load_scripts_and_styles( $hook ) {
 	}
 
 	public function push_syndicate_settings_validate( $raw_settings ) {
-
-		$settings                               = array();
-		$settings['client_id']                  = sanitize_text_field( $raw_settings['client_id'] );
-		$settings['client_secret']              = sanitize_text_field( $raw_settings['client_secret'] );
-		$settings['selected_post_types']        = !empty( $raw_settings['selected_post_types'] ) ? $raw_settings['selected_post_types'] : array() ;
-		$settings['delete_pushed_posts']        = !empty( $raw_settings['delete_pushed_posts'] ) ? $raw_settings['delete_pushed_posts'] : 'off' ;
-		$settings['selected_pull_sitegroups']   = !empty( $raw_settings['selected_pull_sitegroups'] ) ? $raw_settings['selected_pull_sitegroups'] : array() ;
-		$settings['pull_time_interval']         = !empty( $raw_settings['pull_time_interval'] ) ? max( $raw_settings['pull_time_interval'], 300 ) : '3600';
-		$settings['update_pulled_posts']        = !empty( $raw_settings['update_pulled_posts'] ) ? $raw_settings['update_pulled_posts'] : 'off' ;
+		$settings                             = array();
+		$settings['client_id']                = sanitize_text_field( $raw_settings['client_id'] );
+		$settings['client_secret']            = sanitize_text_field( $raw_settings['client_secret'] );
+		$settings['selected_post_types']      = ! empty( $raw_settings['selected_post_types'] ) ? $raw_settings['selected_post_types'] : array();
+		$settings['delete_pushed_posts']      = ! empty( $raw_settings['delete_pushed_posts'] ) ? $raw_settings['delete_pushed_posts'] : 'off';
+		$settings['selected_pull_sitegroups'] = ! empty( $raw_settings['selected_pull_sitegroups'] ) ? $raw_settings['selected_pull_sitegroups'] : array();
+		$settings['pull_time_interval']       = ! empty( $raw_settings['pull_time_interval'] ) ? max( $raw_settings['pull_time_interval'], 300 ) : '3600';
+		$settings['update_pulled_posts']      = ! empty( $raw_settings['update_pulled_posts'] ) ? $raw_settings['update_pulled_posts'] : 'off';
 
 		$this->pre_schedule_pull_content( $settings['selected_pull_sitegroups'] );
 
 		return $settings;
-
 	}
 
 	public function register_syndicate_settings() {
-		add_submenu_page( 'options-general.php', esc_html__( 'Push Syndication Settings', 'push-syndication' ), esc_html__( 'Push Syndication', 'push-syndication' ), apply_filters('syn_syndicate_cap', 'manage_options'), 'push-syndicate-settings', array( $this, 'display_syndicate_settings' ) );
+		add_submenu_page( 'options-general.php', esc_html__( 'Push Syndication Settings', 'push-syndication' ), esc_html__( 'Push Syndication', 'push-syndication' ), apply_filters( 'syn_syndicate_cap', 'manage_options' ), 'push-syndicate-settings', array( $this, 'display_syndicate_settings' ) );
 	}
 
 	public function display_syndicate_settings() {
-
-		add_settings_section( 'push_syndicate_pull_sitegroups', esc_html__( 'Site Groups' , 'push-syndication' ), array( $this, 'display_pull_sitegroups_description' ), 'push_syndicate_pull_sitegroups' );
+		add_settings_section( 'push_syndicate_pull_sitegroups', esc_html__( 'Site Groups', 'push-syndication' ), array( $this, 'display_pull_sitegroups_description' ), 'push_syndicate_pull_sitegroups' );
 		add_settings_field( 'pull_sitegroups_selection', esc_html__( 'select sitegroups', 'push-syndication' ), array( $this, 'display_pull_sitegroups_selection' ), 'push_syndicate_pull_sitegroups', 'push_syndicate_pull_sitegroups' );
 
-		add_settings_section( 'push_syndicate_pull_options', esc_html__( 'Pull Options' , 'push-syndication' ), array( $this, 'display_pull_options_description' ), 'push_syndicate_pull_options' );
+		add_settings_section( 'push_syndicate_pull_options', esc_html__( 'Pull Options', 'push-syndication' ), array( $this, 'display_pull_options_description' ), 'push_syndicate_pull_options' );
 		add_settings_field( 'pull_time_interval', esc_html__( 'Specify time interval in seconds', 'push-syndication' ), array( $this, 'display_time_interval_selection' ), 'push_syndicate_pull_options', 'push_syndicate_pull_options' );
 		add_settings_field( 'max_pull_attempts', esc_html__( 'Maximum pull attempts', 'push-syndication' ), array( $this, 'display_max_pull_attempts' ), 'push_syndicate_pull_options', 'push_syndicate_pull_options' );
 		add_settings_field( 'update_pulled_posts', esc_html__( 'update pulled posts', 'push-syndication' ), array( $this, 'display_update_pulled_posts_selection' ), 'push_syndicate_pull_options', 'push_syndicate_pull_options' );
 
-		add_settings_section( 'push_syndicate_post_types', esc_html__( 'Post Types' , 'push-syndication' ), array( $this, 'display_push_post_types_description' ), 'push_syndicate_post_types' );
+		add_settings_section( 'push_syndicate_post_types', esc_html__( 'Post Types', 'push-syndication' ), array( $this, 'display_push_post_types_description' ), 'push_syndicate_post_types' );
 		add_settings_field( 'post_type_selection', esc_html__( 'select post types', 'push-syndication' ), array( $this, 'display_post_types_selection' ), 'push_syndicate_post_types', 'push_syndicate_post_types' );
 
-		add_settings_section( 'delete_pushed_posts', esc_html__(' Delete Pushed Posts ', 'push-syndication' ), array( $this, 'display_delete_pushed_posts_description' ), 'delete_pushed_posts' );
-		add_settings_field( 'delete_post_check', esc_html__(' delete pushed posts ', 'push-syndication' ), array( $this, 'display_delete_pushed_posts_selection' ), 'delete_pushed_posts', 'delete_pushed_posts' );
+		add_settings_section( 'delete_pushed_posts', esc_html__( ' Delete Pushed Posts ', 'push-syndication' ), array( $this, 'display_delete_pushed_posts_description' ), 'delete_pushed_posts' );
+		add_settings_field( 'delete_post_check', esc_html__( ' delete pushed posts ', 'push-syndication' ), array( $this, 'display_delete_pushed_posts_selection' ), 'delete_pushed_posts', 'delete_pushed_posts' );
 
-		add_settings_section( 'api_token', esc_html__(' API Token Configuration ', 'push-syndication' ), array( $this, 'display_apitoken_description' ), 'api_token' );
-		add_settings_field( 'client_id', esc_html__(' Enter your client id ', 'push-syndication' ), array( $this, 'display_client_id' ), 'api_token', 'api_token' );
-		add_settings_field( 'client_secret', esc_html__(' Enter your client secret ', 'push-syndication' ), array( $this, 'display_client_secret' ), 'api_token', 'api_token' );
+		add_settings_section( 'api_token', esc_html__( ' API Token Configuration ', 'push-syndication' ), array( $this, 'display_apitoken_description' ), 'api_token' );
+		add_settings_field( 'client_id', esc_html__( ' Enter your client id ', 'push-syndication' ), array( $this, 'display_client_id' ), 'api_token', 'api_token' );
+		add_settings_field( 'client_secret', esc_html__( ' Enter your client secret ', 'push-syndication' ), array( $this, 'display_client_secret' ), 'api_token', 'api_token' );
 
 		?>
 
@@ -312,7 +326,7 @@ public function display_syndicate_settings() {
 
 			</form>
 
-			<?php $this->get_api_token() ?>
+			<?php $this->get_api_token(); ?>
 
 		</div>
 
@@ -326,27 +340,30 @@ public function display_pull_sitegroups_description() {
 
 	public function display_pull_sitegroups_selection() {
 
-		// get all sitegroups
-		$sitegroups = get_terms( 'syn_sitegroup', array(
-			'fields'        => 'all',
-			'hide_empty'    => false,
-			'orderby'       => 'name'
-		) );
+		// get all sitegroups.
+		$sitegroups = get_terms(
+			'syn_sitegroup',
+			array(
+				'fields'     => 'all',
+				'hide_empty' => false,
+				'orderby'    => 'name',
+			)
+		);
 
-		// if there are no sitegroups defined return
-		if( empty( $sitegroups ) ) {
+		// if there are no sitegroups defined return.
+		if ( empty( $sitegroups ) ) {
 			echo '<p>' . esc_html__( 'No sitegroups defined yet. You must group your sites into sitegroups to syndicate content', 'push-syndication' ) . '</p>';
 			echo '<p><a href="' . esc_url( get_admin_url() . 'edit-tags.php?taxonomy=syn_sitegroup&post_type=syn_site' ) . '" target="_blank" >' . esc_html__( 'Create new', 'push-syndication' ) . '</a></p>';
 			return;
 		}
 
-		foreach( $sitegroups as $sitegroup ) {
+		foreach ( $sitegroups as $sitegroup ) {
 
 			?>
 
 			<p>
 				<label>
-					<input type="checkbox" name="push_syndicate_settings[selected_pull_sitegroups][]" value="<?php echo esc_html( $sitegroup->slug ); ?>" <?php $this->checked_array( $sitegroup->slug, $this->push_syndicate_settings['selected_pull_sitegroups'] ) ?> />
+					<input type="checkbox" name="push_syndicate_settings[selected_pull_sitegroups][]" value="<?php echo esc_html( $sitegroup->slug ); ?>" <?php $this->checked_array( $sitegroup->slug, $this->push_syndicate_settings['selected_pull_sitegroups'] ); ?> />
 					<?php echo esc_html( $sitegroup->name ); ?>
 				</label>
 				<?php echo esc_html( $sitegroup->description ); ?>
@@ -355,10 +372,9 @@ public function display_pull_sitegroups_selection() {
 			<?php
 
 		}
-
 	}
 
-	public  function display_pull_options_description() {
+	public function display_pull_options_description() {
 		echo esc_html__( 'Configure options for pulling content', 'push-syndication' );
 	}
 
@@ -379,7 +395,7 @@ public function display_max_pull_attempts() {
 	/**
 	 * Validate the push_syndication_max_pull_attempts option.
 	 *
-	 * @param $val
+	 * @param int $val The value.
 	 * @return int
 	 */
 	public function validate_max_pull_attempts( $val ) {
@@ -415,13 +431,13 @@ public function display_post_types_selection() {
 
 		echo '<ul>';
 
-		foreach( $post_types as $post_type  ) {
+		foreach ( $post_types as $post_type ) {
 
 			?>
 
 			<li>
 				<label>
-					<input type="checkbox" name="push_syndicate_settings[selected_post_types][]" value="<?php echo esc_attr( $post_type ); ?>" <?php echo $this->checked_array( $post_type, $this->push_syndicate_settings['selected_post_types'] ); ?> />
+					<input type="checkbox" name="push_syndicate_settings[selected_post_types][]" value="<?php echo esc_attr( $post_type ); ?>" <?php $this->checked_array( $post_type, $this->push_syndicate_settings['selected_post_types'] ); ?> />
 					<?php echo esc_html( $post_type ); ?>
 				</label>
 			</li>
@@ -431,7 +447,6 @@ public function display_post_types_selection() {
 		}
 
 		echo '</ul>';
-
 	}
 
 	public function display_delete_pushed_posts_description() {
@@ -444,9 +459,9 @@ public function display_delete_pushed_posts_selection() {
 		echo checked( $this->push_syndicate_settings['delete_pushed_posts'], 'on' ) . ' />';
 	}
 
-	public function  display_apitoken_description() {
+	public function display_apitoken_description() {
 		// @TODO add client type information
-		echo '<p>' . esc_html__( 'To syndicate content to WordPress.com you must ', 'push-syndication' ). '<a href="https://developer.wordpress.com/apps/new/">' . esc_html__( 'create a new application', 'push-syndication' ) . '</a></p>';
+		echo '<p>' . esc_html__( 'To syndicate content to WordPress.com you must ', 'push-syndication' ) . '<a href="https://developer.wordpress.com/apps/new/">' . esc_html__( 'create a new application', 'push-syndication' ) . '</a></p>';
 		echo '<p>' . esc_html__( 'Enter the Redirect URI as follows', 'push-syndication' ) . '</p>';
 		echo '<p><b>' . esc_html( menu_page_url( 'push-syndicate-settings', false ) ) . '</p></b>';
 	}
@@ -460,15 +475,13 @@ public function display_client_secret() {
 	}
 
 	public function get_api_token() {
-
 		$redirect_uri           = menu_page_url( 'push-syndicate-settings', false );
-		$authorization_endpoint = 'https://public-api.wordpress.com/oauth2/authorize?client_id=' . $this->push_syndicate_settings['client_id'] . '&redirect_uri=' .  $redirect_uri . '&response_type=code';
+		$authorization_endpoint = 'https://public-api.wordpress.com/oauth2/authorize?client_id=' . $this->push_syndicate_settings['client_id'] . '&redirect_uri=' . $redirect_uri . '&response_type=code';
 
 		echo '<h3>' . esc_html__( 'Authorization ', 'push-syndication' ) . '</h3>';
 
 		// if code is not found return or settings updated return
-		if( empty( $_GET['code'] ) || !empty( $_GET[ 'settings-updated' ] ) ) {
-
+		if ( empty( $_GET['code'] ) || ! empty( $_GET['settings-updated'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			echo '<p>' . esc_html__( 'Click the authorize button to generate api token', 'push-syndication' ) . '</p>';
 
 			?>
@@ -478,24 +491,25 @@ public function get_api_token() {
 			<?php
 
 			return;
-
 		}
 
-		$response = wp_remote_post( 'https://public-api.wordpress.com/oauth2/token', array(
-			'sslverify' => false,
-			'body'      => array (
-				'client_id'     => $this->push_syndicate_settings['client_id'],
-				'redirect_uri'  => $redirect_uri,
-				'client_secret' => $this->push_syndicate_settings['client_secret'],
-				'code'          => $_GET['code'],
-				'grant_type'    => 'authorization_code'
-			),
-		) );
+		$response = wp_remote_post(
+			'https://public-api.wordpress.com/oauth2/token',
+			array(
+				'sslverify' => false,
+				'body'      => array(
+					'client_id'     => $this->push_syndicate_settings['client_id'],
+					'redirect_uri'  => $redirect_uri,
+					'client_secret' => $this->push_syndicate_settings['client_secret'],
+					'code'          => sanitize_text_field( $_GET['code'] ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					'grant_type'    => 'authorization_code',
+				),
+			)
+		);
 
 		$result = json_decode( $response['body'] );
 
-		if( !empty( $result->error ) ) {
-
+		if ( ! empty( $result->error ) ) {
 			echo '<p>' . esc_html__( 'Error retrieving API token ', 'push-syndication' ) . esc_html( $result->error_description ) . esc_html__( 'Please authorize again', 'push-syndication' ) . '</p>';
 
 			?>
@@ -505,7 +519,6 @@ public function get_api_token() {
 			<?php
 
 			return;
-
 		}
 
 		?>
@@ -529,38 +542,39 @@ public function get_api_token() {
 
 		<?php
 
-		echo '<p>' . esc_html__( 'Enter the above details in relevant fields when registering a ', 'push-syndication' ). '<a href="http://wordpress.com" target="_blank">WordPress.com</a>' . esc_html__( 'site', 'push-syndication' ) . '</p>';
-
+		echo '<p>' . esc_html__( 'Enter the above details in relevant fields when registering a ', 'push-syndication' ) . '<a href="http://wordpress.com" target="_blank">WordPress.com</a>' . esc_html__( 'site', 'push-syndication' ) . '</p>';
 	}
 
 	public function display_sitegroups_selection() {
-
 		echo '<h3>' . esc_html__( 'Select Sitegroups', 'push-syndication' ) . '</h3>';
 
 		$selected_sitegroups = get_option( 'syn_selected_sitegroups' );
-		$selected_sitegroups = !empty( $selected_sitegroups ) ? $selected_sitegroups : array() ;
+		$selected_sitegroups = ! empty( $selected_sitegroups ) ? $selected_sitegroups : array();
 
 		// get all sitegroups
-		$sitegroups = get_terms( 'syn_sitegroup', array(
-			'fields'        => 'all',
-			'hide_empty'    => false,
-			'orderby'       => 'name'
-		) );
+		$sitegroups = get_terms(
+			'syn_sitegroup',
+			array(
+				'fields'     => 'all',
+				'hide_empty' => false,
+				'orderby'    => 'name',
+			)
+		);
 
 		// if there are no sitegroups defined return
-		if( empty( $sitegroups ) ) {
+		if ( empty( $sitegroups ) ) {
 			echo '<p>' . esc_html__( 'No sitegroups defined yet. You must group your sites into sitegroups to syndicate content', 'push-syndication' ) . '</p>';
 			echo '<p><a href="' . esc_url( get_admin_url() . 'edit-tags.php?taxonomy=syn_sitegroup&post_type=syn_site' ) . '" target="_blank" >' . esc_html__( 'Create new', 'push-syndication' ) . '</a></p>';
 			return;
 		}
 
-		foreach( $sitegroups as $sitegroup ) {
+		foreach ( $sitegroups as $sitegroup ) {
 
 			?>
 
 			<p>
 				<label>
-					<input type="checkbox" name="syn_selected_sitegroups[]" value="<?php echo esc_html( $sitegroup->slug ); ?>" <?php $this->checked_array( $sitegroup->slug, $selected_sitegroups ) ?> />
+					<input type="checkbox" name="syn_selected_sitegroups[]" value="<?php echo esc_html( $sitegroup->slug ); ?>" <?php $this->checked_array( $sitegroup->slug, $selected_sitegroups ); ?> />
 					<?php echo esc_html( $sitegroup->name ); ?>
 				</label>
 				<?php echo esc_html( $sitegroup->description ); ?>
@@ -569,13 +583,12 @@ public function display_sitegroups_selection() {
 			<?php
 
 		}
-
 	}
 
 	public function site_metaboxes() {
-		add_meta_box('sitediv', __(' Site Settings '), array( $this, 'add_site_settings_metabox' ), 'syn_site', 'normal', 'high');
-		remove_meta_box('submitdiv', 'syn_site', 'side');
-		add_meta_box( 'submitdiv', __(' Site Status '), array( $this, 'add_site_status_metabox' ), 'syn_site', 'side', 'high' );
+		add_meta_box( 'sitediv', __( ' Site Settings ', 'push-syndication' ), array( $this, 'add_site_settings_metabox' ), 'syn_site', 'normal', 'high' );
+		remove_meta_box( 'submitdiv', 'syn_site', 'side' );
+		add_meta_box( 'submitdiv', __( ' Site Status ', 'push-syndication' ), array( $this, 'add_site_status_metabox' ), 'syn_site', 'side', 'high' );
 	}
 
 	public function add_site_status_metabox( $site ) {
@@ -585,10 +598,10 @@ public function add_site_status_metabox( $site ) {
 			<div id="minor-publishing">
 				<div id="misc-publishing-actions">
 					<div class="misc-pub-section">
-						<label for="post_status"><?php _e( 'Status:', 'push-syndication' ) ?></label>
+						<label for="post_status"><?php _e( 'Status:', 'push-syndication' ); ?></label>
 						<span id="post-status-display">
 						<?php
-						switch( $site_enabled ) {
+						switch ( $site_enabled ) {
 							case 'on':
 								_e( 'Enabled', 'push-syndication' );
 								break;
@@ -600,20 +613,20 @@ public function add_site_status_metabox( $site ) {
 						?>
 						</span>
 
-						<a href="#post_status" class="edit-post-status hide-if-no-js" tabindex='4'><?php _e( 'Edit', 'push-syndication' ) ?></a>
+						<a href="#post_status" class="edit-post-status hide-if-no-js" tabindex='4'><?php _e( 'Edit', 'push-syndication' ); ?></a>
 
 						<div id="post-status-select" class="hide-if-js">
 							<input type="hidden" name="post_status" value="publish" />
 							<select name='site_enabled' id='post_status' tabindex='4'>
-								<option<?php selected( $site_enabled, 'on' ); ?> value='on'><?php _e('Enabled', 'push-syndication' ) ?></option>
-								<option<?php selected( $site_enabled, 'off' ); ?> value='off'><?php _e('Disabled', 'push-syndication' ) ?></option>
+								<option<?php selected( $site_enabled, 'on' ); ?> value='on'><?php _e( 'Enabled', 'push-syndication' ); ?></option>
+								<option<?php selected( $site_enabled, 'off' ); ?> value='off'><?php _e( 'Disabled', 'push-syndication' ); ?></option>
 							</select>
 							<a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e( 'OK', 'push-syndication' ); ?></a>
 						</div>
 
 					</div>
 
-					<div id="timestampdiv" class="hide-if-js"><?php touch_time(0, 1, 4); ?></div>
+					<div id="timestampdiv" class="hide-if-js"><?php touch_time( 0, 1, 4 ); ?></div>
 				</div>
 				<div class="clear"></div>
 			</div>
@@ -621,18 +634,30 @@ public function add_site_status_metabox( $site ) {
 			<div id="major-publishing-actions">
 
 				<div id="delete-action">
-					<a class="submitdelete deletion" href="<?php echo get_delete_post_link($site->ID); ?>"><?php echo __( 'Move to Trash', 'push-syndication' ); ?></a>
+					<a class="submitdelete deletion" href="<?php echo esc_url( get_delete_post_link( $site->ID ) ); ?>"><?php echo esc_html__( 'Move to Trash', 'push-syndication' ); ?></a>
 				</div>
 
 				<div id="publishing-action">
 					<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="ajax-loading" alt="" />
 					<?php
-					if ( !in_array( $site_enabled, array( 'on', 'off' ) ) || 0 == $site->ID ) { ?>
-						<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Add Site') ?>" />
-						<?php submit_button( __( 'Add Site', 'push-syndication' ), 'primary', 'enabled', false, array( 'tabindex' => '5', 'accesskey' => 'p' ) ); ?>
+					if ( ! in_array( $site_enabled, array( 'on', 'off' ) ) || 0 == $site->ID ) {
+						?>
+						<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Add Site', 'push-syndication' ); ?>" />
+						<?php
+						submit_button(
+							__( 'Add Site', 'push-syndication' ),
+							'primary',
+							'enabled',
+							false,
+							array(
+								'tabindex'  => '5',
+								'accesskey' => 'p',
+							)
+						);
+						?>
 					<?php } else { ?>
-						<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-						<input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e( 'Update', 'push-syndication' ) ?>" />
+						<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Update', 'push-syndication' ); ?>" />
+						<input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e( 'Update', 'push-syndication' ); ?>" />
 					<?php } ?>
 				</div>
 
@@ -644,26 +669,25 @@ public function add_site_status_metabox( $site ) {
 	}
 
 	public function add_site_settings_metabox( $post ) {
+		global $post; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.VariableRedeclaration
 
-		global $post;
-
-		$transport_type = get_post_meta( $post->ID, 'syn_transport_type', true);
-		$site_enabled   = get_post_meta( $post->ID, 'syn_site_enabled', true);
+		$transport_type = get_post_meta( $post->ID, 'syn_transport_type', true );
+		$site_enabled   = get_post_meta( $post->ID, 'syn_site_enabled', true );
 
-		// default values
-		$transport_type = !empty( $transport_type ) ? $transport_type : 'WP_XMLRPC';
-		$transport_mode = !empty( $transport_mode ) ? $transport_mode : 'pull' ;
-		$site_enabled   = !empty( $site_enabled ) ? $site_enabled : 'off';
+		// default values.
+		$transport_type = ! empty( $transport_type ) ? $transport_type : 'WP_XMLRPC';
+		$transport_mode = ! empty( $transport_mode ) ? $transport_mode : 'pull';
+		$site_enabled   = ! empty( $site_enabled ) ? $site_enabled : 'off';
 
-		// nonce for verification when saving
+		// nonce for verification when saving.
 		wp_nonce_field( plugin_basename( __FILE__ ), 'site_settings_noncename' );
 
 		$this->display_transports( $transport_type, $transport_mode );
 
 		try {
 			Syndication_Client_Factory::display_client_settings( $post, $transport_type );
-		} catch( Exception $e ) {
-			echo $e;
+		} catch ( Exception $e ) {
+			echo $e; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
 
 		?>
@@ -675,70 +699,79 @@ public function add_site_settings_metabox( $post ) {
 	}
 
 	public function display_transports( $transport_type, $mode ) {
-
 		echo '<p>' . esc_html__( 'Select a transport type', 'push-syndication' ) . '</p>';
-		// TODO: add direction
+		// TODO: add direction.
 		echo '<select name="transport_type" onchange="this.form.submit()">';
 
-		$values = array();
+		$values  = array();
 		$max_len = 0;
-		foreach( $this->push_syndicate_transports as $key => $value ) {
+		foreach ( $this->push_syndicate_transports as $key => $value ) {
 			$mode = array_shift( $value['modes'] );
-			echo '<option value="' . esc_html( $key ) . '"' . selected( $key, $transport_type ) . '>' . sprintf( esc_html__( '%s (%s)' ), $value['name'], $mode ) . '</option>';
+			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			echo '<option value="' . esc_html( $key ) . '"' . selected( $key, $transport_type ) . '>' . sprintf( esc_html__( '%1$s (%2$s)', 'push-syndication' ), $value['name'], $mode ) . '</option>';
 		}
 		echo '</select>';
-
 	}
 
 	public function save_site_settings() {
-
 		global $post;
 
-		// autosave verification
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+		// autosave verification.
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
+		}
 
-		// if our nonce isn't there, or we can't verify it return
-		if( !isset( $_POST['site_settings_noncename'] ) || !wp_verify_nonce( $_POST['site_settings_noncename'], plugin_basename( __FILE__ ) ) )
+		// if our nonce isn't there, or we can't verify it return.
+		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+		if ( ! isset( $_POST['site_settings_noncename'] ) || ! wp_verify_nonce( $_POST['site_settings_noncename'], plugin_basename( __FILE__ ) ) ) {
 			return;
+		}
 
-		$transport_type = sanitize_text_field( $_POST['transport_type'] ); // TODO: validate this exists
+		$transport_type = isset( $_POST['transport_type'] ) ? sanitize_text_field( $_POST['transport_type'] ) : '';
 
 		// @TODO validate that type and mode are valid
 		update_post_meta( $post->ID, 'syn_transport_type', $transport_type );
 
-		$site_enabled = sanitize_text_field( $_POST['site_enabled'] );
+		$site_enabled = isset( $_POST['site_enabled'] ) ? sanitize_text_field( $_POST['site_enabled'] ) : '';
 
 		try {
 			$save = Syndication_Client_Factory::save_client_settings( $post->ID, $transport_type );
-			if( !$save )
+			if ( ! $save ) {
 				return;
+			}
 			$client = Syndication_Client_Factory::get_client( $transport_type, $post->ID );
 
-			if ( $client->test_connection()  ) {
-				add_filter('redirect_post_location', function ($location) {
-					return add_query_arg("message", 251, $location);
-				});
+			if ( $client->test_connection() ) {
+				add_filter(
+					'redirect_post_location',
+					function ( $location ) {
+						return add_query_arg( 'message', 251, $location );
+					}
+				);
 			} else {
-				add_filter('redirect_post_location', function ($location) {
-					return add_query_arg("message", 252, $location);
-				});
+				add_filter(
+					'redirect_post_location',
+					function ( $location ) {
+						return add_query_arg( 'message', 252, $location );
+					}
+				);
 				$site_enabled = 'off';
 			}
-
-		} catch( Exception $e ) {
-			add_filter('redirect_post_location', function ($location) {
-				return add_query_arg("message", 250, $location);
-			});
+		} catch ( Exception $e ) {
+			add_filter(
+				'redirect_post_location',
+				function ( $location ) {
+					return add_query_arg( 'message', 250, $location );
+				}
+			);
 		}
 
 		update_post_meta( $post->ID, 'syn_site_enabled', $site_enabled );
-
 	}
 
 	public function push_syndicate_admin_messages( $messages ) {
 
-		// general error messages
+		// general error messages.
 		$messages['syn_site'][250] = __( 'Transport class not found!', 'push-syndication' );
 		$messages['syn_site'][251] = __( 'Connection Successful!', 'push-syndication' );
 		$messages['syn_site'][252] = __( 'Something went wrong when connecting to the site. Site disabled.', 'push-syndication' );
@@ -751,64 +784,65 @@ public function push_syndicate_admin_messages( $messages ) {
 		$messages['syn_site'][305] = __( 'Transport error. Invalid endpoint', 'push-syndication' );
 		$messages['syn_site'][306] = __( 'Something went wrong when connecting to the site.', 'push-syndication' );
 
-		// WordPress.com REST error messages
+		// WordPress.com REST error messages.
 		$messages['site'][301] = __( 'Invalid URL', 'push-syndication' );
 
-		// RSS error messages
+		// RSS error messages.
 
 		return $messages;
-
 	}
 
 	public function add_post_metaboxes() {
 
-		// return if no post types supports push syndication
-		if( empty( $this->push_syndicate_settings['selected_post_types'] ) )
+		// return if no post types supports push syndication.
+		if ( empty( $this->push_syndicate_settings['selected_post_types'] ) ) {
 			return;
+		}
 
-		if( !$this->current_user_can_syndicate() )
+		if ( ! $this->current_user_can_syndicate() ) {
 			return;
-
-		$selected_post_types = $this->push_syndicate_settings[ 'selected_post_types' ];
-		foreach( $selected_post_types as $selected_post_type ) {
-			add_meta_box( 'syndicatediv', __( ' Syndicate ' ), array( $this, 'add_syndicate_metabox' ), $selected_post_type, 'side', 'high' );
-			//add_meta_box( 'syndicationstatusdiv', __( ' Syndication Status ' ), array( $this, 'add_syndication_status_metabox' ), $selected_post_type, 'normal', 'high' );
 		}
 
+		$selected_post_types = $this->push_syndicate_settings['selected_post_types'];
+		foreach ( $selected_post_types as $selected_post_type ) {
+			add_meta_box( 'syndicatediv', __( ' Syndicate ', 'push-syndication' ), array( $this, 'add_syndicate_metabox' ), $selected_post_type, 'side', 'high' );
+		}
 	}
 
-	public function add_syndicate_metabox( ) {
-
+	public function add_syndicate_metabox() {
 		global $post;
 
-		// nonce for verification when saving
+		// nonce for verification when saving.
 		wp_nonce_field( plugin_basename( __FILE__ ), 'syndicate_noncename' );
 
-		// get all sitegroups
-		$sitegroups = get_terms( 'syn_sitegroup', array(
-			'fields'        => 'all',
-			'hide_empty'    => false,
-			'orderby'       => 'name'
-		) );
+		// get all sitegroups.
+		$sitegroups = get_terms(
+			'syn_sitegroup',
+			array(
+				'fields'     => 'all',
+				'hide_empty' => false,
+				'orderby'    => 'name',
+			)
+		);
 
-		// if there are no sitegroups defined return
-		if( empty( $sitegroups ) ) {
+		// if there are no sitegroups defined return.
+		if ( empty( $sitegroups ) ) {
 			echo '<p>' . esc_html__( 'No sitegroups defined yet. You must group your sites into sitegroups to syndicate content', 'push-syndication' ) . '</p>';
 			echo '<p><a href="' . esc_url( get_admin_url() . 'edit-tags.php?taxonomy=syn_sitegroup&post_type=syn_site' ) . '" target="_blank" >' . esc_html__( 'Create new', 'push-syndication' ) . '</a></p>';
 			return;
 		}
 
 		$selected_sitegroups = get_post_meta( $post->ID, '_syn_selected_sitegroups', true );
-		$selected_sitegroups = !empty( $selected_sitegroups ) ? $selected_sitegroups : array() ;
+		$selected_sitegroups = ! empty( $selected_sitegroups ) ? $selected_sitegroups : array();
 
 		echo '<ul>';
 
-		foreach( $sitegroups as $sitegroup  ) {
+		foreach ( $sitegroups as $sitegroup ) {
 
 			?>
 			<li>
 				<label>
-					<input type="checkbox" name="selected_sitegroups[]" value="<?php echo esc_html( $sitegroup->slug ); ?>" <?php $this->checked_array( $sitegroup->slug, $selected_sitegroups ) ?> />
+					<input type="checkbox" name="selected_sitegroups[]" value="<?php echo esc_html( $sitegroup->slug ); ?>" <?php $this->checked_array( $sitegroup->slug, $selected_sitegroups ); ?> />
 					<?php echo esc_html( $sitegroup->name ); ?>
 				</label>
 				<p> <?php echo esc_html( $sitegroup->description ); ?> </p>
@@ -818,35 +852,42 @@ public function add_syndicate_metabox( ) {
 		}
 
 		echo '</ul>';
-
 	}
 
+	/**
+	 * If the $value is in $group, output the checked="checked" attribute
+	 *
+	 * @param string $value the string to test.
+	 * @param array  $group the array with the options.
+	 */
 	public function checked_array( $value, $group ) {
-		if( !empty( $group ) ) {
-			if( in_array( $value, $group ) ) {
+		if ( ! empty( $group ) ) {
+			if ( in_array( $value, $group ) ) {
 				echo 'checked="checked"';
 			}
 		}
 	}
 
 	public function save_syndicate_settings() {
-
 		global $post;
 
-		// autosave verification
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+		// autosave verification.
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
+		}
 
-		// if our nonce isn't there, or we can't verify it return
-		if( !isset( $_POST['syndicate_noncename'] ) || !wp_verify_nonce( $_POST['syndicate_noncename'], plugin_basename( __FILE__ ) ) )
+		// if our nonce isn't there, or we can't verify it return.
+		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+		if ( ! isset( $_POST['syndicate_noncename'] ) || ! wp_verify_nonce( $_POST['syndicate_noncename'], plugin_basename( __FILE__ ) ) ) {
 			return;
+		}
 
-		if ( ! $this->current_user_can_syndicate() )
+		if ( ! $this->current_user_can_syndicate() ) {
 			return;
+		}
 
-		$selected_sitegroups = !empty( $_POST['selected_sitegroups'] ) ? array_map( 'sanitize_key', $_POST['selected_sitegroups'] ) : '' ;
+		$selected_sitegroups = ! empty( $_POST['selected_sitegroups'] ) ? array_map( 'sanitize_key', $_POST['selected_sitegroups'] ) : '';
 		update_post_meta( $post->ID, '_syn_selected_sitegroups', $selected_sitegroups );
-
 	}
 
 	public function add_syndication_status_metabox() {
@@ -855,16 +896,20 @@ public function add_syndication_status_metabox() {
 
 	public function pre_schedule_push_content( $new_status, $old_status, $post ) {
 
-		// autosave verification
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+		// autosave verification.
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
+		}
 
 		// if our nonce isn't there, or we can't verify it return
-		if( !isset( $_POST['syndicate_noncename'] ) || !wp_verify_nonce( $_POST['syndicate_noncename'], plugin_basename( __FILE__ ) ) )
+		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+		if ( ! isset( $_POST['syndicate_noncename'] ) || ! wp_verify_nonce( $_POST['syndicate_noncename'], plugin_basename( __FILE__ ) ) ) {
 			return;
+		}
 
-		if( !$this->current_user_can_syndicate() )
+		if ( ! $this->current_user_can_syndicate() ) {
 			return;
+		}
 
 		$sites = $this->get_sites_by_post_ID( $post->ID );
 
@@ -883,39 +928,45 @@ function schedule_push_content( $post_id, $sites ) {
 		);
 	}
 
-	// cron job function to syndicate content
+	/**
+	 * Cron job function to syndicate content
+	 *
+	 * @param array $sites array of sites.
+	 *
+	 * @throws Exception The exception.
+	 */
 	public function push_content( $sites ) {
 
-		// if another process running on it return
-		if( get_transient( 'syn_syndicate_lock' ) == 'locked' )
+		// if another process running on it return.
+		if ( get_transient( 'syn_syndicate_lock' ) == 'locked' ) {
 			return;
+		}
 
-		// set value as locked, valid for 5 mins
-		set_transient( 'syn_syndicate_lock', 'locked', 60*5 );
+		// set value as locked, valid for 5 mins.
+		set_transient( 'syn_syndicate_lock', 'locked', 60 * 5 );
 
-		/** start of critical section **/
+		/** Start of critical section */
 
 		$post_ID = $sites['post_ID'];
 
-		// an array containing states of sites
+		// an array containing states of sites.
 		$slave_post_states = get_post_meta( $post_ID, '_syn_slave_post_states', true );
-		$slave_post_states = !empty( $slave_post_states ) ? $slave_post_states : array() ;
+		$slave_post_states = ! empty( $slave_post_states ) ? $slave_post_states : array();
 
 		$sites = apply_filters( 'syn_pre_push_post_sites', $sites, $post_ID, $slave_post_states );
 
-		if( !empty( $sites['selected_sites'] ) ) {
-
-			foreach( $sites['selected_sites'] as $site ) {
-
-				$transport_type = get_post_meta( $site->ID, 'syn_transport_type', true);
-				$client         = Syndication_Client_Factory::get_client( $transport_type  ,$site->ID );
+		if ( ! empty( $sites['selected_sites'] ) ) {
+			foreach ( $sites['selected_sites'] as $site ) {
+				$transport_type = get_post_meta( $site->ID, 'syn_transport_type', true );
+				$client         = Syndication_Client_Factory::get_client( $transport_type, $site->ID );
 				$info           = $this->get_site_info( $site->ID, $slave_post_states, $client );
 
-				if( $info['state'] == 'new' || $info['state'] == 'new-error' ) { // states 'new' and 'new-error'
+				if ( 'new' === $info['state'] || 'new-error' === $info['state'] ) { // states are 'new' and 'new-error'.
 
 					$push_new_shortcircuit = apply_filters( 'syn_pre_push_new_post_shortcircuit', false, $post_ID, $site, $transport_type, $client, $info );
-					if ( true === $push_new_shortcircuit )
+					if ( true === $push_new_shortcircuit ) {
 						continue;
+					}
 
 					$result = $client->new_post( $post_ID );
 
@@ -923,11 +974,11 @@ public function push_content( $sites ) {
 					$this->update_slave_post_states( $post_ID, $slave_post_states );
 
 					do_action( 'syn_post_push_new_post', $result, $post_ID, $site, $transport_type, $client, $info );
-
-				} else { // states 'success', 'edit-error' and 'remove-error'
+				} else { // otherwise states are 'success', 'edit-error' and 'remove-error'.
 					$push_edit_shortcircuit = apply_filters( 'syn_pre_push_edit_post_shortcircuit', false, $post_ID, $site, $transport_type, $client, $info );
-					if ( true === $push_edit_shortcircuit )
+					if ( true === $push_edit_shortcircuit ) {
 						continue;
+					}
 
 					$result = $client->edit_post( $post_ID, $info['ext_ID'] );
 
@@ -937,120 +988,113 @@ public function push_content( $sites ) {
 					do_action( 'syn_post_push_edit_post', $result, $post_ID, $site, $transport_type, $client, $info );
 				}
 			}
-
 		}
 
-		if( !empty( $sites['removed_sites'] ) ) {
-
-			foreach( $sites['removed_sites'] as $site ) {
-
-				$transport_type = get_post_meta( $site->ID, 'syn_transport_type', true);
-				$client         = Syndication_Client_Factory::get_client( $transport_type  ,$site->ID );
+		if ( ! empty( $sites['removed_sites'] ) ) {
+			foreach ( $sites['removed_sites'] as $site ) {
+				$transport_type = get_post_meta( $site->ID, 'syn_transport_type', true );
+				$client         = Syndication_Client_Factory::get_client( $transport_type, $site->ID );
 				$info           = $this->get_site_info( $site->ID, $slave_post_states, $client );
 
-				// if the post is not pushed we do not need to delete them
-				if( $info['state'] == 'success' || $info['state'] == 'edit-error' || $info['state'] == 'remove-error' ) {
-
+				// if the post is not pushed we do not need to delete them.
+				if ( 'success' === $info['state'] || 'edit-error' === $info['state'] || 'remove-error' === $info['state'] ) {
 					$result = $client->delete_post( $info['ext_ID'] );
 					if ( is_wp_error( $result ) ) {
-						$slave_post_states[ 'remove-error' ][ $site->ID ] = $result;
+						$slave_post_states['remove-error'][ $site->ID ] = $result;
 						$this->update_slave_post_states( $post_ID, $slave_post_states );
 					}
-
 				}
-
 			}
-
 		}
 
 
-		/** end of critical section **/
+		/** End of critical section */
 
 		// release the lock.
 		delete_transient( 'syn_syndicate_lock' );
-
 	}
 
 	public function get_sites_by_post_ID( $post_ID ) {
+		$selected_sitegroups = get_post_meta( $post_ID, '_syn_selected_sitegroups', true );
+		$selected_sitegroups = ! empty( $selected_sitegroups ) ? $selected_sitegroups : array();
+		$old_sitegroups      = get_post_meta( $post_ID, '_syn_old_sitegroups', true );
+		$old_sitegroups      = ! empty( $old_sitegroups ) ? $old_sitegroups : array();
+		$removed_sitegroups  = array_diff( $old_sitegroups, $selected_sitegroups );
 
-		$selected_sitegroups    = get_post_meta( $post_ID, '_syn_selected_sitegroups', true );
-		$selected_sitegroups    = !empty( $selected_sitegroups ) ? $selected_sitegroups : array() ;
-		$old_sitegroups         = get_post_meta( $post_ID, '_syn_old_sitegroups', true );
-		$old_sitegroups         = !empty( $old_sitegroups ) ? $old_sitegroups : array() ;
-		$removed_sitegroups     = array_diff( $old_sitegroups, $selected_sitegroups );
-
-		// initialization
+		// initialization.
 		$data = array(
-			'post_ID'           => $post_ID,
-			'selected_sites'    => array(),
-			'removed_sites'     => array(),
+			'post_ID'        => $post_ID,
+			'selected_sites' => array(),
+			'removed_sites'  => array(),
 		);
 
-		if( !empty( $selected_sitegroups ) ) {
-
-			foreach( $selected_sitegroups as $selected_sitegroup ) {
+		if ( ! empty( $selected_sitegroups ) ) {
+			foreach ( $selected_sitegroups as $selected_sitegroup ) {
 
-				// get all the sites in the sitegroup
+				// get all the sites in the sitegroup.
 				$sites = $this->get_sites_by_sitegroup( $selected_sitegroup );
-				if( empty( $sites ) )
+				if ( empty( $sites ) ) {
 					continue;
+				}
 
-				foreach( $sites as $site ) {
-					$site_enabled = get_post_meta( $site->ID, 'syn_site_enabled', true);
-					if( $site_enabled == 'on' ) {
-						$data[ 'selected_sites' ][] = $site;
+				foreach ( $sites as $site ) {
+					$site_enabled = get_post_meta( $site->ID, 'syn_site_enabled', true );
+					if ( 'on' === $site_enabled ) {
+						$data['selected_sites'][] = $site;
 					}
 				}
-
 			}
-
 		}
 
-		if( !empty( $removed_sitegroups ) ) {
-
-			foreach( $removed_sitegroups as $removed_sitegroup ) {
+		if ( ! empty( $removed_sitegroups ) ) {
+			foreach ( $removed_sitegroups as $removed_sitegroup ) {
 
-				// get all the sites in the sitegroup
+				// get all the sites in the sitegroup.
 				$sites = $this->get_sites_by_sitegroup( $removed_sitegroup );
-				if( empty( $sites ) )
+				if ( empty( $sites ) ) {
 					continue;
+				}
 
-				foreach( $sites as $site ) {
-					$site_enabled = get_post_meta( $site->ID, 'syn_site_enabled', true);
-					if( $site_enabled == 'on' ) {
-						$data[ 'removed_sites' ][] = $site;
+				foreach ( $sites as $site ) {
+					$site_enabled = get_post_meta( $site->ID, 'syn_site_enabled', true );
+					if ( 'on' === $site_enabled ) {
+						$data['removed_sites'][] = $site;
 					}
 				}
-
 			}
-
 		}
 
 		update_post_meta( $post_ID, '_syn_old_sitegroups', $selected_sitegroups );
 
 		return $data;
-
 	}
 
-	// return an array of sites as objects based on sitegroup
+	/**
+	 * Return an array of sites as objects based on sitegroup.
+	 *
+	 * @param array|string $sitegroup the site group.
+	 *
+	 * @return array
+	 */
 	public function get_sites_by_sitegroup( $sitegroup ) {
 
 		// @TODO if sitegroup is deleted?
 
-		$results = new WP_Query(array(
-			'post_type'         => 'syn_site',
-			'posts_per_page'    => 100,
-			'tax_query'         => array(
-				array(
-					'taxonomy'  => 'syn_sitegroup',
-					'field'     => 'slug',
-					'terms'     => $sitegroup
-				)
+		$results = new WP_Query(
+			array(
+				'post_type'      => 'syn_site',
+				'posts_per_page' => 100,
+				'tax_query'      => array( //phpcs:ignore WordPress.DB.SlowDBQuery
+					array(
+						'taxonomy' => 'syn_sitegroup',
+						'field'    => 'slug',
+						'terms'    => $sitegroup,
+					),
+				),
 			)
-		));
-
-		return (array)$results->posts;
+		);
 
+		return (array) $results->posts;
 	}
 
 	/**
@@ -1061,19 +1105,26 @@ public function get_sites_by_sitegroup( $sitegroup ) {
 	 *  edit-error - error when editing the post.
 	 *  remove-error - error when removing the post in a slave site, when the sitegroup is unselected
 	 *  new - if the state is not found or the post is deleted in the slave site.
+	 *
+	 * @param int                $site_id           the site id.
+	 * @param array              $slave_post_states array containing states of the site.
+	 * @param Syndication_Client $client            the syndication client.
+	 *
+	 * @return array|string[]
 	 */
-	public function get_site_info( $site_ID, &$slave_post_states, $client ) {
-
-		if( empty( $slave_post_states ) )
+	public function get_site_info( $site_id, &$slave_post_states, $client ) {
+		if ( empty( $slave_post_states ) ) {
 			return array( 'state' => 'new' );
+		}
 
-		foreach( $slave_post_states as $state => $sites  ) {
-			if( isset( $sites[ $site_ID ] ) && is_array( $sites[ $site_ID ] ) && ! empty( $sites[ $site_ID ]['ext_ID'] )   ) {
-				if( $client->is_post_exists( $sites[ $site_ID ]['ext_ID'] ) ) {
+		foreach ( $slave_post_states as $state => $sites ) {
+			if ( isset( $sites[ $site_id ] ) && is_array( $sites[ $site_id ] ) && ! empty( $sites[ $site_id ]['ext_ID'] ) ) {
+				if ( $client->is_post_exists( $sites[ $site_id ]['ext_ID'] ) ) {
 					$info = array(
-						'state'     => $state,
-						'ext_ID'    => $sites[ $site_ID ]['ext_ID'] );
-					unset( $slave_post_states[ $state ] [$site_ID] );
+						'state'  => $state,
+						'ext_ID' => $sites[ $site_id ]['ext_ID'],
+					);
+					unset( $slave_post_states[ $state ] [ $site_id ] );
 					return $info;
 				} else {
 					return array( 'state' => 'new' );
@@ -1082,22 +1133,27 @@ public function get_site_info( $site_ID, &$slave_post_states, $client ) {
 		}
 
 		return array( 'state' => 'new' );
-
 	}
 
 	/**
-	 * if the result is false state transitions
+	 * If the result is false state transitions
 	 * new          -> new-error
 	 * new-error    -> new-error
 	 * remove-error -> new-error
+	 *
+	 * @param mixed              $result            the result.
+	 * @param array              $slave_post_states array containing states of the site.
+	 * @param int                $site_id           the site id.
+	 * @param Syndication_Client $client            the syndication client.
+	 *
+	 * @return mixed
 	 */
-	public function validate_result_new_post( $result, &$slave_post_states, $site_ID, $client ) {
-
+	public function validate_result_new_post( $result, &$slave_post_states, $site_id, $client ) {
 		if ( is_wp_error( $result ) ) {
-			$slave_post_states[ 'new-error' ][ $site_ID ] = $result;
+			$slave_post_states['new-error'][ $site_id ] = $result;
 		} else {
-			$slave_post_states[ 'success' ][ $site_ID ] = array(
-				'ext_ID'        => (int) $result
+			$slave_post_states['success'][ $site_id ] = array(
+				'ext_ID' => (int) $result,
 			);
 		}
 
@@ -1105,19 +1161,27 @@ public function validate_result_new_post( $result, &$slave_post_states, $site_ID
 	}
 
 	/**
-	 * if the result is false state transitions
+	 * If the result is false state transitions
 	 * edit-error   -> edit-error
 	 * success      -> edit-error
+	 *
+	 * @param mixed              $result            the result.
+	 * @param int                $ext_id            external id.
+	 * @param array              $slave_post_states array containing states of the site.
+	 * @param int                $site_id           the site id.
+	 * @param Syndication_Client $client            the syndication client.
+	 *
+	 * @return mixed
 	 */
-	public function validate_result_edit_post( $result, $ext_ID, &$slave_post_states, $site_ID, $client ) {
+	public function validate_result_edit_post( $result, $ext_id, &$slave_post_states, $site_id, $client ) {
 		if ( is_wp_error( $result ) ) {
-			$slave_post_states[ 'edit-error' ][ $site_ID ] = array(
-				'error' => $result,
-				'ext_ID' => (int) $ext_ID,
+			$slave_post_states['edit-error'][ $site_id ] = array(
+				'error'  => $result,
+				'ext_ID' => (int) $ext_id,
 			);
 		} else {
-			$slave_post_states[ 'success' ][ $site_ID ] = array(
-				'ext_ID'        => (int) $ext_ID
+			$slave_post_states['success'][ $site_id ] = array(
+				'ext_ID' => (int) $ext_id,
 			);
 		}
 
@@ -1130,13 +1194,15 @@ private function update_slave_post_states( $post_id, $slave_post_states ) {
 
 	public function pre_schedule_delete_content( $post_id ) {
 
-		// if slave post deletion is not enabled return
-		$delete_pushed_posts =  !empty( $this->push_syndicate_settings[ 'delete_pushed_posts' ] ) ? $this->push_syndicate_settings[ 'delete_pushed_posts' ] : 'off' ;
-		if( $delete_pushed_posts != 'on' )
+		// if slave post deletion is not enabled return.
+		$delete_pushed_posts = ! empty( $this->push_syndicate_settings['delete_pushed_posts'] ) ? $this->push_syndicate_settings['delete_pushed_posts'] : 'off';
+		if ( 'on' !== $delete_pushed_posts ) {
 			return;
+		}
 
-		if( !$this->current_user_can_syndicate() )
+		if ( ! $this->current_user_can_syndicate() ) {
 			return;
+		}
 
 		do_action( 'syn_schedule_delete_content', $post_id );
 	}
@@ -1150,72 +1216,77 @@ public function schedule_delete_content( $post_ID ) {
 	}
 
 	public function delete_content( $post_ID ) {
-
 		$delete_error_sites = get_option( 'syn_delete_error_sites' );
-		$delete_error_sites = !empty( $delete_error_sites ) ? $delete_error_sites : array() ;
+		$delete_error_sites = ! empty( $delete_error_sites ) ? $delete_error_sites : array();
 		$slave_posts        = $this->get_slave_posts( $post_ID );
 
-		if( empty( $slave_posts ) )
+		if ( empty( $slave_posts ) ) {
 			return;
+		}
 
-		foreach( $slave_posts as $site_ID => $ext_ID ) {
-
-			$site_enabled = get_post_meta( $site_ID, 'syn_site_enabled', true);
-
-			// check whether the site is enabled
-			if( $site_enabled == 'on' ) {
+		foreach ( $slave_posts as $site_id => $ext_id ) {
+			$site_enabled = get_post_meta( $site_id, 'syn_site_enabled', true );
 
-				$transport_type = get_post_meta( $site_ID, 'syn_transport_type', true);
-				$client         = Syndication_Client_Factory::get_client( $transport_type , $site_ID );
+			// check whether the site is enabled.
+			if ( 'on' === $site_enabled ) {
+				$transport_type = get_post_meta( $site_id, 'syn_transport_type', true );
+				$client         = Syndication_Client_Factory::get_client( $transport_type, $site_id );
 
-				if( $client->is_post_exists( $ext_ID ) ) {
-					$push_delete_shortcircuit = apply_filters( 'syn_pre_push_delete_post_shortcircuit', false, $ext_ID, $post_ID, $site_ID, $transport_type, $client );
-					if ( true === $push_delete_shortcircuit )
+				if ( $client->is_post_exists( $ext_id ) ) {
+					$push_delete_shortcircuit = apply_filters( 'syn_pre_push_delete_post_shortcircuit', false, $ext_id, $post_ID, $site_id, $transport_type, $client );
+					if ( true === $push_delete_shortcircuit ) {
 						continue;
+					}
 
-					$result = $client->delete_post( $ext_ID );
+					$result = $client->delete_post( $ext_id );
 
-					do_action( 'syn_post_push_delete_post', $result, $ext_ID, $post_ID, $site_ID, $transport_type, $client );
+					do_action( 'syn_post_push_delete_post', $result, $ext_id, $post_ID, $site_id, $transport_type, $client );
 
-					if( !$result ) {
-						$delete_error_sites[ $site_ID ] = array( $ext_ID );
+					if ( ! $result ) {
+						$delete_error_sites[ $site_id ] = array( $ext_id );
 					}
-
 				}
-
 			}
-
 		}
 
 		update_option( 'syn_delete_error_sites', $delete_error_sites );
-		// all post metadata will be automatically deleted including slave_post_states
-
+		// all post metadata will be automatically deleted including slave_post_states.
 	}
 
-	// get the slave posts as $site_ID => $ext_ID
-	public function get_slave_posts( $post_ID ) {
+	/**
+	 * Get the slave posts as $site_id => $ext_id.
+	 *
+	 * @param int $post_id the post ID.
+	 *
+	 * @return array|void
+	 */
+	public function get_slave_posts( $post_id ) {
 
-		// array containing states of sites
-		$slave_post_states = get_post_meta( $post_ID, '_syn_slave_post_states', true );
-		if ( empty( $slave_post_states ) )
+		// array containing states of sites.
+		$slave_post_states = get_post_meta( $post_id, '_syn_slave_post_states', true );
+		if ( empty( $slave_post_states ) ) {
 			return;
+		}
 
-		// array containing slave posts as $site_ID => $ext_ID
+		// array containing slave posts as $site_id => $ext_ID.
 		$slave_posts = array();
 
-		foreach( $slave_post_states as $state ) {
-			foreach( $state as $site_ID => $info ) {
-				if( ! is_wp_error( $info ) && !empty( $info[ 'ext_ID' ] ) ) {
-					$slave_posts[ $site_ID ] = $info[ 'ext_ID' ];
+		foreach ( $slave_post_states as $state ) {
+			foreach ( $state as $site_id => $info ) {
+				if ( ! is_wp_error( $info ) && ! empty( $info['ext_ID'] ) ) {
+					$slave_posts[ $site_id ] = $info['ext_ID'];
 				}
 			}
 		}
 
 		return $slave_posts;
-
 	}
 
-	// checking user capability
+	/**
+	 * Checks current user capability
+	 *
+	 * @return bool
+	 */
 	public function current_user_can_syndicate() {
 		$syndicate_cap = apply_filters( 'syn_syndicate_cap', 'manage_options' );
 		return current_user_can( $syndicate_cap );
@@ -1226,37 +1297,35 @@ public function cron_add_pull_time_interval( $schedules ) {
 		// Adds the custom time interval to the existing schedules.
 		$schedules['syn_pull_time_interval'] = array(
 			'interval' => intval( $this->push_syndicate_settings['pull_time_interval'] ),
-			'display' => __( 'Pull Time Interval', 'push-syndication' )
+			'display'  => __( 'Pull Time Interval', 'push-syndication' ),
 		);
 
 		return $schedules;
-
 	}
 
 	public function pre_schedule_pull_content( $selected_sitegroups ) {
-
-		if ( ! $this->current_user_can_syndicate() )
+		if ( ! $this->current_user_can_syndicate() ) {
 			return;
+		}
 
 		$sites = array();
-		foreach( $selected_sitegroups as $selected_sitegroup ) {
+		foreach ( $selected_sitegroups as $selected_sitegroup ) {
 			$sites = array_merge( $sites, $this->get_sites_by_sitegroup( $selected_sitegroup ) );
 		}
 
 
 		$this->schedule_pull_content( $sites );
-
 	}
 
 	public function schedule_pull_content( $sites ) {
 
-		// to unschedule a cron we need the original arguements passed to schedule the cron
-		// we are saving it as a siteoption
+		// to unscheduled a cron we need the original arguments passed to schedule the cron
+		// we are saving it as a siteoption.
 		$old_pull_sites = get_option( 'syn_old_pull_sites' );
 
 
 		// Clear all previously scheduled jobs.
-		if( ! empty( $old_pull_sites ) ) {
+		if ( ! empty( $old_pull_sites ) ) {
 			// Clear any jobs that were scheduled the old way: one job to pull many sites.
 				wp_clear_scheduled_hook( 'syn_pull_content', array( $old_pull_sites ) );
 
@@ -1285,11 +1354,11 @@ public function pull_get_selected_sites() {
 		$selected_sitegroups = $this->push_syndicate_settings['selected_pull_sitegroups'];
 
 		$sites = array();
-		foreach( $selected_sitegroups as $selected_sitegroup ) {
+		foreach ( $selected_sitegroups as $selected_sitegroup ) {
 			$sites = array_merge( $sites, $this->get_sites_by_sitegroup( $selected_sitegroup ) );
 		}
 
-		// Order by last update date
+		// Order by last update date.
 		usort( $sites, array( $this, 'sort_sites_by_last_pull_date' ) );
 
 		return $sites;
@@ -1299,8 +1368,9 @@ private function sort_sites_by_last_pull_date( $site_a, $site_b ) {
 		$site_a_pull_date = (int) get_post_meta( $site_a->ID, 'syn_last_pull_time', true );
 		$site_b_pull_date = (int) get_post_meta( $site_b->ID, 'syn_last_pull_time', true );
 
-		if ( $site_a_pull_date == $site_b_pull_date )
+		if ( $site_a_pull_date == $site_b_pull_date ) {
 			return 0;
+		}
 
 		return ( $site_a_pull_date < $site_b_pull_date ) ? -1 : 1;
 	}
@@ -1308,11 +1378,13 @@ private function sort_sites_by_last_pull_date( $site_a, $site_b ) {
 	public function pull_content( $sites = array() ) {
 		add_filter( 'http_headers_useragent', array( $this, 'syndication_user_agent' ) );
 
-		if ( empty( $sites ) )
+		if ( empty( $sites ) ) {
 			$sites = $this->pull_get_selected_sites();
+		}
 
 		// Treat this process as an import.
 		if ( ! defined( 'WP_IMPORTING' ) ) {
+			// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedConstantFound
 			define( 'WP_IMPORTING', true );
 		}
 
@@ -1324,12 +1396,13 @@ public function pull_content( $sites = array() ) {
 		// Keep track of posts that are added or changed.
 		$updated_post_ids = array();
 
-		foreach( $sites as $site ) {
+		foreach ( $sites as $site ) {
 			$site_id = $site->ID;
 
 			$site_enabled = get_post_meta( $site_id, 'syn_site_enabled', true );
-			if( $site_enabled != 'on' )
+			if ( 'on' !== $site_enabled ) {
 				continue;
+			}
 
 			$transport_type = get_post_meta( $site_id, 'syn_transport_type', true );
 			$client         = Syndication_Client_Factory::get_client( $transport_type, $site_id );
@@ -1338,20 +1411,31 @@ public function pull_content( $sites = array() ) {
 			$post_types_processed = array();
 
 			if ( count( $posts ) > 0 ) {
-				Syndication_Logger::log_post_info( $site_id, $status = 'start_import', $message = sprintf( __( 'starting import for site id %d with %d posts', 'push-syndication' ), $site_id, count( $posts ) ), $log_time = null, $extra = array() );
+				Syndication_Logger::log_post_info(
+					$site_id,
+					'start_import',
+					sprintf( __( 'starting import for site id %1$d with %2$d posts', 'push-syndication' ), $site_id, count( $posts ) ),
+					null,
+					array()
+				);
 			} else {
-				Syndication_Logger::log_post_info( $site_id, $status = 'no_posts', $message = sprintf( __( 'no posts for site id %d', 'push-syndication' ), $site_id ), $log_time = null, $extra = array() );
+				Syndication_Logger::log_post_info(
+					$site_id,
+					'no_posts',
+					sprintf( __( 'no posts for site id %d', 'push-syndication' ), $site_id ),
+					null,
+					array()
+				);
 			}
 
-			foreach( $posts as $post ) {
-
+			foreach ( $posts as $post ) {
 				if ( ! in_array( $post['post_type'], $post_types_processed ) ) {
 					remove_post_type_support( $post['post_type'], 'revisions' );
 					$post_types_processed[] = $post['post_type'];
 				}
 
 				if ( empty( $post['post_guid'] ) ) {
-					Syndication_Logger::log_post_error( $site_id, $status = 'no_post_guid', $message = sprintf( __( 'skipping post no guid', 'push-syndication' ) ), $log_time = null, $extra = array( 'post' => $post ) );
+					Syndication_Logger::log_post_error( $site_id, 'no_post_guid', __( 'skipping post no guid', 'push-syndication' ), null, array( 'post' => $post ) );
 					continue;
 				}
 				$post_id = $this->find_post_by_guid( $post['post_guid'], $post, $site );
@@ -1359,12 +1443,12 @@ public function pull_content( $sites = array() ) {
 				if ( $post_id ) {
 					$pull_edit_shortcircuit = apply_filters( 'syn_pre_pull_edit_post_shortcircuit', false, $post, $site, $transport_type, $client );
 					if ( true === $pull_edit_shortcircuit ) {
-						Syndication_Logger::log_post_info( $site_id, $status = 'skip_pre_pull_edit_post', $message = sprintf( __( 'skipping post per syn_pre_pull_edit_post_shortcircuit', 'push-syndication' ) ), $log_time = null, $extra = array( 'post' => $post ) );
+						Syndication_Logger::log_post_info( $site_id, 'skip_pre_pull_edit_post', __( 'skipping post per syn_pre_pull_edit_post_shortcircuit', 'push-syndication' ), null, array( 'post' => $post ) );
 						continue;
 					}
-					// if updation is disabled continue
-					if( $this->push_syndicate_settings['update_pulled_posts'] != 'on' ) {
-						Syndication_Logger::log_post_info( $site_id, $status = 'skip_update_pulled_posts', $message = sprintf( __( 'skipping post update per update_pulled_posts setting', 'push-syndication' ) ), $log_time = null, $extra = array( 'post' => $post ) );
+					// if updation is disabled continue.
+					if ( 'on' !== $this->push_syndicate_settings['update_pulled_posts'] ) {
+						Syndication_Logger::log_post_info( $site_id, 'skip_update_pulled_posts', __( 'skipping post update per update_pulled_posts setting', 'push-syndication' ), null, array( 'post' => $post ) );
 						continue;
 					}
 					$post['ID'] = $post_id;
@@ -1376,11 +1460,10 @@ public function pull_content( $sites = array() ) {
 					do_action( 'syn_post_pull_edit_post', $result, $post, $site, $transport_type, $client );
 
 					$updated_post_ids[] = (int) $result;
-
 				} else {
 					$pull_new_shortcircuit = apply_filters( 'syn_pre_pull_new_post_shortcircuit', false, $post, $site, $transport_type, $client );
 					if ( true === $pull_new_shortcircuit ) {
-						Syndication_Logger::log_post_info( $site_id, $status = 'syn_pre_pull_new_post_shortcircuit', $message = sprintf( __( 'skipping post per syn_pre_pull_edit_post_shortcircuit', 'push-syndication' ) ), $log_time = null, $extra = array( 'post' => $post ) );
+						Syndication_Logger::log_post_info( $site_id, 'syn_pre_pull_new_post_shortcircuit', __( 'skipping post per syn_pre_pull_edit_post_shortcircuit', 'push-syndication' ), null, array( 'post' => $post ) );
 						continue;
 					}
 					$post = apply_filters( 'syn_pull_new_post', $post, $site, $client );
@@ -1389,7 +1472,7 @@ public function pull_content( $sites = array() ) {
 
 					do_action( 'syn_post_pull_new_post', $result, $post, $site, $transport_type, $client );
 
-					if( !is_wp_error( $result ) ) {
+					if ( ! is_wp_error( $result ) ) {
 						update_post_meta( $result, 'syn_post_guid', $post['post_guid'] );
 						update_post_meta( $result, 'syn_source_site_id', $site_id );
 					}
@@ -1402,7 +1485,7 @@ public function pull_content( $sites = array() ) {
 				add_post_type_support( $post_type, 'revisions' );
 			}
 
-			update_post_meta( $site_id, 'syn_last_pull_time', current_time( 'timestamp', 1 ) );
+			update_post_meta( $site_id, 'syn_last_pull_time', time() );
 		}
 
 		// Resume comment and term counting and cache invalidation.
@@ -1426,14 +1509,17 @@ function find_post_by_guid( $guid, $post, $site ) {
 		global $wpdb;
 
 		$post_id = apply_filters( 'syn_pre_find_post_by_guid', false, $guid, $post, $site );
-		if ( false !== $post_id )
+		if ( false !== $post_id ) {
 			return $post_id;
+		}
 
 		// A direct query here is way more efficient than WP_Query, because we don't have to do all the extra processing, filters, and JOIN.
+		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
 		$post_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'syn_post_guid' AND meta_value = %s LIMIT 1", $guid ) );
 
-		if ( $post_id )
+		if ( $post_id ) {
 			return $post_id;
+		}
 
 		return false;
 	}
@@ -1441,7 +1527,7 @@ function find_post_by_guid( $guid, $post, $site ) {
 	/**
 	 * Reschedule all scheduled pull jobs.
 	 */
-	public function refresh_pull_jobs()	{
+	public function refresh_pull_jobs() {
 		$sites = $this->pull_get_selected_sites();
 
 		$this->schedule_pull_content( $sites );
@@ -1451,7 +1537,7 @@ public function refresh_pull_jobs()	{
 	 * Handle save_post and delete_post for syn_site posts. If a syn_site post
 	 * is updated or deleted we should reprocess any scheduled pull jobs.
 	 *
-	 * @param $post_id
+	 * @param int $post_id the post ID.
 	 */
 	public function handle_site_change( $post_id ) {
 		if ( 'syn_site' === get_post_type( $post_id ) ) {
@@ -1467,7 +1553,7 @@ public function handle_site_change( $post_id ) {
 	 * @param $tt_id
 	 * @param $taxonomy
 	 */
-	public function handle_site_group_change ( $term, $tt_id, $taxonomy ) {
+	public function handle_site_group_change( $term, $tt_id, $taxonomy ) {
 		if ( 'syn_sitegroup' === $taxonomy ) {
 			$this->refresh_pull_jobs();
 		}
@@ -1476,15 +1562,21 @@ public function handle_site_group_change ( $term, $tt_id, $taxonomy ) {
 	private function upgrade() {
 		global $wpdb;
 
-		if ( version_compare( $this->version, SYNDICATION_VERSION, '>=' ) )
+		if ( version_compare( $this->version, SYNDICATION_VERSION, '>=' ) ) {
 			return;
+		}
 
-		// upgrade to 2.1
+		// upgrade to 2.1.
 		if ( version_compare( $this->version, '2.0', '<=' ) ) {
+			// phpcs:ignore WordPress.DB.DirectDatabaseQuery
 			$inserted_posts_by_site = $wpdb->get_col( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'syn_inserted_posts'" );
 			foreach ( $inserted_posts_by_site as $site_id ) {
 				$inserted_posts = get_post_meta( $site_id, 'syn_inserted_posts', true );
 
+				if ( ! is_array( $inserted_posts ) ) {
+					continue;
+				}
+
 				foreach ( $inserted_posts as $inserted_post_id => $inserted_post_guid ) {
 					update_post_meta( $inserted_post_id, 'syn_post_guid', $inserted_post_guid );
 					update_post_meta( $inserted_post_id, 'syn_source_site_id', $site_id );
@@ -1495,6 +1587,8 @@ private function upgrade() {
 		}
 
 		update_option( 'syn_version', SYNDICATION_VERSION );
+
+		// @TODO: convert data encrypted with the old cipher (pre 7.1) to the new OpenSSL cipher ( >= 7.1 )
 	}
 
 

From bc2c8f8236a66ff78f42cd944e2faf1ff1c501de Mon Sep 17 00:00:00 2001
From: Henrique Mouta <henrique@automattic.com>
Date: Fri, 9 Jul 2021 16:01:34 +0100
Subject: [PATCH 3/3] address @trepmal feedback

---
 includes/class-syndication-admin-notices.php    | 2 +-
 includes/class-syndication-wp-xml-client.php    | 2 +-
 includes/class-syndication-wp-xmlrpc-client.php | 2 +-
 includes/class-wp-cli.php                       | 8 ++++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/includes/class-syndication-admin-notices.php b/includes/class-syndication-admin-notices.php
index 0925a011..df35f152 100644
--- a/includes/class-syndication-admin-notices.php
+++ b/includes/class-syndication-admin-notices.php
@@ -165,7 +165,7 @@ public static function handle_dismiss_syndication_notice() {
  *
  * @return string|void
  */
-function syn_handle_multiple_error_notices( $message, $message_data ) { //phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals
+function syn_handle_multiple_error_notices( $message, $message_data ) {
 	return esc_html__( 'There have been multiple errors. Please validate your syndication logs', 'push-syndication' );
 }
 add_filter( 'syn_message_text_multiple', 'syn_handle_multiple_error_notices', 10, 2 );
diff --git a/includes/class-syndication-wp-xml-client.php b/includes/class-syndication-wp-xml-client.php
index 0cbebd03..41fe1cf8 100644
--- a/includes/class-syndication-wp-xml-client.php
+++ b/includes/class-syndication-wp-xml-client.php
@@ -532,7 +532,7 @@ public static function display_settings( $site ) {
 			<label for="feed_url"><?php esc_html_e( 'Enter feed URL', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" name="feed_url" id="feed_url" size="100" value="<?php echo esc_url_raw( $feed_url ); ?>" />
+			<input type="text" name="feed_url" id="feed_url" size="100" value="<?php echo esc_attr( $feed_url ); ?>" />
 		</p>
 		<p>
 			<label for="default_post_type"><?php esc_html_e( 'Select post type', 'push-syndication' ); ?></label>
diff --git a/includes/class-syndication-wp-xmlrpc-client.php b/includes/class-syndication-wp-xmlrpc-client.php
index 2682d3b6..ee9d211a 100644
--- a/includes/class-syndication-wp-xmlrpc-client.php
+++ b/includes/class-syndication-wp-xmlrpc-client.php
@@ -504,7 +504,7 @@ public static function display_settings( $site ) {
 			<label for=site_url><?php echo esc_html__( 'Enter a valid site URL', 'push-syndication' ); ?></label>
 		</p>
 		<p>
-			<input type="text" class="widefat" name="site_url" id="site_url" size="100" value="<?php echo esc_url_raw( $site_url ); ?>" />
+			<input type="text" class="widefat" name="site_url" id="site_url" size="100" value="<?php echo esc_attr( $site_url ); ?>" />
 		</p>
 		<p>
 			<label for="site_username"><?php echo esc_html__( 'Enter Username', 'push-syndication' ); ?></label>
diff --git a/includes/class-wp-cli.php b/includes/class-wp-cli.php
index f6f0dd43..db47b706 100644
--- a/includes/class-wp-cli.php
+++ b/includes/class-wp-cli.php
@@ -32,10 +32,10 @@ public function push_all_posts( $args, $assoc_args ) {
 		$query = new WP_Query( $query_args );
 
 		while ( $query->post_count ) {
-			WP_CLI::line( sprintf( 'Processing page %d', $query_args['paged'] ) );
+			WP_CLI::line( sprintf( 'Processing page %d', $query_args['paged'] ) ); // @TODO: change to WP_CLI::log
 
 			foreach ( $query->posts as $post ) {
-				WP_CLI::line( sprintf( 'Processing post %d (%s)', $post->ID, $post->post_title ) );
+				WP_CLI::line( sprintf( 'Processing post %d (%s)', $post->ID, $post->post_title ) ); // @TODO: change to WP_CLI::log
 
 				$this->push_post( array(), array( 'post_id' => $post->ID ) );
 			}
@@ -128,6 +128,8 @@ private function make_em_talk_pull() {
 
 		$this->enabled_verbosity = true;
 
+		// @TODO: change WP_CLI::line to WP_CLI::log
+
 		// output when a post is new or updated.
 		add_filter(
 			'syn_pre_pull_posts',
@@ -167,6 +169,8 @@ private function make_em_talk_push() {
 
 		$this->enabled_verbosity = true;
 
+		// @TODO: change WP_CLI::line to WP_CLI::log
+
 		add_filter(
 			'syn_pre_push_post_sites',
 			function( $sites, $post_id, $slave_states ) {