MinnPost / object-sync-for-salesforce

classes/schedule.php

Indentation +26 added lines, -26 removed lines

@@ -25,18 +25,18 @@ 
 	protected $logging;
 
 	/**
-	* Constructor which sets up schedule and handler for when schedule runs
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param string $schedule_name
-	* @throws \Exception
-	*/
+	 * Constructor which sets up schedule and handler for when schedule runs
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param string $schedule_name
+	 * @throws \Exception
+	 */
 
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $schedule_name, $logging, $schedulable_classes ) {
 
@@ -59,18 +59,18 @@ 
 	}
 
 	/**
-	* Create the filters we need to run
-	*
-	*/
+	 * Create the filters we need to run
+	 *
+	 */
 	public function add_filters() {
 		add_filter( 'cron_schedules', array( $this, 'set_schedule_frequency' ) );
 	}
 
 	/**
-	* Convert the schedule frequency from the admin settings into an array
-	* interval must be in seconds for the class to use it
-	*
-	*/
+	 * Convert the schedule frequency from the admin settings into an array
+	 * interval must be in seconds for the class to use it
+	 *
+	 */
 	public function set_schedule_frequency( $schedules ) {
 
 		// create an option in the core schedules array for each one the plugin defines
@@ -108,10 +108,10 @@ 
 	}
 
 	/**
-	* Convert the schedule frequency from the admin settings into an array
-	* interval must be in seconds for the class to use it
-	*
-	*/
+	 * Convert the schedule frequency from the admin settings into an array
+	 * interval must be in seconds for the class to use it
+	 *
+	 */
 	public function get_schedule_frequency_key( $name = '' ) {
 
 		$schedule_number = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_number', '' );
@@ -138,9 +138,9 @@ 
 	}
 
 	/**
-	* Convert the schedule frequency from the admin settings into seconds
-	*
-	*/
+	 * Convert the schedule frequency from the admin settings into seconds
+	 *
+	 */
 	public function get_schedule_frequency_seconds( $name = '' ) {
 
 		$schedule_number = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_number', '' );

Spacing +52 added lines, -52 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -38,7 +38,7 @@ 
 	* @throws \Exception
 	*/
 
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $schedule_name, $logging, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $schedule_name, $logging, $schedulable_classes) {
 
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -54,7 +54,7 @@ 
 		$this->identifier = $this->schedule_name;
 
 		$this->add_filters();
-		add_action( $this->schedule_name, array( $this, 'maybe_handle' ) ); // run the handle method
+		add_action($this->schedule_name, array($this, 'maybe_handle')); // run the handle method
 
 	}
 
@@ -63,7 +63,7 @@ 
 	*
 	*/
 	public function add_filters() {
-		add_filter( 'cron_schedules', array( $this, 'set_schedule_frequency' ) );
+		add_filter('cron_schedules', array($this, 'set_schedule_frequency'));
 	}
 
 	/**
@@ -71,14 +71,14 @@ 
 	* interval must be in seconds for the class to use it
 	*
 	*/
-	public function set_schedule_frequency( $schedules ) {
+	public function set_schedule_frequency($schedules) {
 
 		// create an option in the core schedules array for each one the plugin defines
-		foreach ( $this->schedulable_classes as $key => $value ) {
-			$schedule_number = absint( get_option( 'object_sync_for_salesforce_' . $key . '_schedule_number', '' ) );
-			$schedule_unit   = get_option( 'object_sync_for_salesforce_' . $key . '_schedule_unit', '' );
+		foreach ($this->schedulable_classes as $key => $value) {
+			$schedule_number = absint(get_option('object_sync_for_salesforce_' . $key . '_schedule_number', ''));
+			$schedule_unit   = get_option('object_sync_for_salesforce_' . $key . '_schedule_unit', '');
 
-			switch ( $schedule_unit ) {
+			switch ($schedule_unit) {
 				case 'minutes':
 					$seconds = 60;
 					break;
@@ -94,7 +94,7 @@ 
 
 			$key = $schedule_unit . '_' . $schedule_number;
 
-			$schedules[ $key ] = array(
+			$schedules[$key] = array(
 				'interval' => $seconds * $schedule_number,
 				'display'  => 'Every ' . $schedule_number . ' ' . $schedule_unit,
 			);
@@ -112,12 +112,12 @@ 
 	* interval must be in seconds for the class to use it
 	*
 	*/
-	public function get_schedule_frequency_key( $name = '' ) {
+	public function get_schedule_frequency_key($name = '') {
 
-		$schedule_number = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_number', '' );
-		$schedule_unit   = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_unit', '' );
+		$schedule_number = get_option('object_sync_for_salesforce_' . $name . '_schedule_number', '');
+		$schedule_unit   = get_option('object_sync_for_salesforce_' . $name . '_schedule_unit', '');
 
-		switch ( $schedule_unit ) {
+		switch ($schedule_unit) {
 			case 'minutes':
 				$seconds = 60;
 				break;
@@ -141,12 +141,12 @@ 
 	* Convert the schedule frequency from the admin settings into seconds
 	*
 	*/
-	public function get_schedule_frequency_seconds( $name = '' ) {
+	public function get_schedule_frequency_seconds($name = '') {
 
-		$schedule_number = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_number', '' );
-		$schedule_unit   = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_unit', '' );
+		$schedule_number = get_option('object_sync_for_salesforce_' . $name . '_schedule_number', '');
+		$schedule_unit   = get_option('object_sync_for_salesforce_' . $name . '_schedule_unit', '');
 
-		switch ( $schedule_unit ) {
+		switch ($schedule_unit) {
 			case 'minutes':
 				$seconds = 60;
 				break;
@@ -172,18 +172,18 @@ 
 	 *
 	 * @return void
 	 */
-	public function use_schedule( $name = '' ) {
+	public function use_schedule($name = '') {
 
-		if ( '' !== $name ) {
+		if ('' !== $name) {
 			$schedule_name = $name;
 		} else {
 			$schedule_name = $this->schedule_name;
 		}
 
-		$schedule_frequency = $this->get_schedule_frequency_key( $name );
+		$schedule_frequency = $this->get_schedule_frequency_key($name);
 
-		if ( ! wp_next_scheduled( $schedule_name ) ) {
-			wp_schedule_event( time(), $schedule_frequency, $schedule_name );
+		if ( ! wp_next_scheduled($schedule_name)) {
+			wp_schedule_event(time(), $schedule_frequency, $schedule_name);
 		}
 
 	}
@@ -200,13 +200,13 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function task( $data ) {
-		if ( is_array( $this->schedulable_classes[ $this->schedule_name ] ) ) {
-			$schedule = $this->schedulable_classes[ $this->schedule_name ];
-			if ( isset( $schedule['class'] ) ) {
-				$class  = new $schedule['class']( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes );
+	protected function task($data) {
+		if (is_array($this->schedulable_classes[$this->schedule_name])) {
+			$schedule = $this->schedulable_classes[$this->schedule_name];
+			if (isset($schedule['class'])) {
+				$class  = new $schedule['class']($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes);
 				$method = $schedule['callback'];
-				$task   = $class->$method( $data['object_type'], $data['object'], $data['mapping'], $data['sf_sync_trigger'] );
+				$task   = $class->$method($data['object_type'], $data['object'], $data['mapping'], $data['sf_sync_trigger']);
 			}
 		}
 		return false;
@@ -222,17 +222,17 @@ 
 	 * @return $data
 	 */
 	protected function check_for_data() {
-		if ( is_array( $this->schedulable_classes[ $this->schedule_name ] ) ) {
-			$schedule = $this->schedulable_classes[ $this->schedule_name ];
-			if ( isset( $schedule['class'] ) ) {
-				$class  = new $schedule['class']( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes );
+		if (is_array($this->schedulable_classes[$this->schedule_name])) {
+			$schedule = $this->schedulable_classes[$this->schedule_name];
+			if (isset($schedule['class'])) {
+				$class  = new $schedule['class']($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes);
 				$method = $schedule['initializer'];
 				$task   = $class->$method();
 			}
 		}
 		// we have checked for data and it's in the queue if it exists
 		// now run maybe_handle again to see if it nees to be processed
-		$this->maybe_handle( true );
+		$this->maybe_handle(true);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * Checks whether data exists within the queue and that
 	 * the process is not already running.
 	 */
-	public function maybe_handle( $already_checked = false, $ajax = false ) {
-		if ( $this->is_process_running() ) {
+	public function maybe_handle($already_checked = false, $ajax = false) {
+		if ($this->is_process_running()) {
 			// Background process already running.
 			wp_die();
 		}
@@ -251,19 +251,19 @@ 
 		// it should call its corresponding class method that saves data to the queue
 		// it should then run maybe_handle() again
 
-		$check_for_data_first = isset( $this->schedulable_classes[ $this->schedule_name ]['initializer'] ) ? true : false;
+		$check_for_data_first = isset($this->schedulable_classes[$this->schedule_name]['initializer']) ? true : false;
 
-		if ( false === $already_checked && true === $check_for_data_first ) {
+		if (false === $already_checked && true === $check_for_data_first) {
 			$this->check_for_data();
 		}
 
-		if ( $this->is_queue_empty() ) {
+		if ($this->is_queue_empty()) {
 			// No data to process.
 			wp_die();
 		}
 
-		if ( true === $ajax ) {
-			check_ajax_referer( $this->identifier, 'nonce' );
+		if (true === $ajax) {
+			check_ajax_referer($this->identifier, 'nonce');
 		}
 
 		$this->handle();
@@ -275,15 +275,15 @@ 
 	 *
 	 * This is modeled off the cancel_process method in wp-background-process but that one doesn't seem to work when we need to specify the queue name
 	 */
-	public function cancel_by_name( $name ) {
-		if ( ! isset( $name ) ) {
+	public function cancel_by_name($name) {
+		if ( ! isset($name)) {
 			$name = $this->identifier . '_cron';
 		}
-		if ( ! $this->is_queue_empty() ) {
-			while ( $this->count_queue_items() > 0 ) {
+		if ( ! $this->is_queue_empty()) {
+			while ($this->count_queue_items() > 0) {
 				$batch = $this->get_batch();
-				$this->delete( $batch->key );
-				wp_clear_scheduled_hook( $name );
+				$this->delete($batch->key);
+				wp_clear_scheduled_hook($name);
 			}
 		}
 	}
@@ -294,28 +294,28 @@ 
 	 *
 	 * @return bool
 	 */
-	public function count_queue_items( $schedule_name = '' ) {
+	public function count_queue_items($schedule_name = '') {
 		$wpdb = $this->wpdb;
 
 		$table  = $wpdb->options;
 		$column = 'option_name';
 
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$table  = $wpdb->sitemeta;
 			$column = 'meta_key';
 		}
 
-		if ( '' === $schedule_name ) {
+		if ('' === $schedule_name) {
 			$key = $this->identifier . '_batch_%';
 		} else {
 			$key = $schedule_name . '_batch_%';
 		}
 
-		$count = $wpdb->get_var( $wpdb->prepare( "
+		$count = $wpdb->get_var($wpdb->prepare("
 			SELECT COUNT(*)
 			FROM {$table}
 			WHERE {$column} LIKE %s
-		", $key ) );
+		", $key));
 
 		return $count;
 	}

classes/salesforce_soap_partner.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 	public $wsdl;
 
 	/**
-	* Constructor which loads the SOAP client
-	*
-	*/
+	 * Constructor which loads the SOAP client
+	 *
+	 */
 	public function __construct( Object_Sync_Sf_Salesforce $sfapi, $wsdl = null ) {
 		if ( ! class_exists( 'SforceBaseClient' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
 			require_once plugin_dir_path( __FILE__ ) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php';

Spacing +25 added lines, -25 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -25,33 +25,33 @@ 
 	* Constructor which loads the SOAP client
 	*
 	*/
-	public function __construct( Object_Sync_Sf_Salesforce $sfapi, $wsdl = null ) {
-		if ( ! class_exists( 'SforceBaseClient' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php';
+	public function __construct(Object_Sync_Sf_Salesforce $sfapi, $wsdl = null) {
+		if ( ! class_exists('SforceBaseClient') && file_exists(plugin_dir_path(__FILE__) . '../vendor/autoload.php')) {
+			require_once plugin_dir_path(__FILE__) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php';
 		}
 		parent::__construct();
-		if ( empty( $wsdl ) ) {
-			$wsdl = plugin_dir_path( __FILE__ ) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/partner.wsdl.xml';
+		if (empty($wsdl)) {
+			$wsdl = plugin_dir_path(__FILE__) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/partner.wsdl.xml';
 		}
-		$this->set_authorized( false );
-		$this->createConnection( $wsdl );
+		$this->set_authorized(false);
+		$this->createConnection($wsdl);
 		$this->salesforce_api = $sfapi;
 
-		if ( $this->salesforce_api->is_authorized() ) {
+		if ($this->salesforce_api->is_authorized()) {
 			$token = $this->salesforce_api->get_access_token();
-			if ( ! $token ) {
+			if ( ! $token) {
 				$token = $this->salesforce_api->refresh_token();
 			}
-			$this->setSessionHeader( $token );
-			$this->setEndPoint( $this->salesforce_api->get_api_endpoint( 'partner' ) );
-			$this->set_authorized( true );
+			$this->setSessionHeader($token);
+			$this->setEndPoint($this->salesforce_api->get_api_endpoint('partner'));
+			$this->set_authorized(true);
 		} else {
-			error_log( 'salesforce is not authorized so we cannot use soap' );
-			$this->set_authorized( false );
+			error_log('salesforce is not authorized so we cannot use soap');
+			$this->set_authorized(false);
 		}
 	}
 
-	protected function set_authorized( $is_authorized ) {
+	protected function set_authorized($is_authorized) {
 		$this->is_authorized = $is_authorized;
 	}
 
@@ -59,35 +59,35 @@ 
 		return $this->is_authorized;
 	}
 
-	public function try_soap( $function ) {
+	public function try_soap($function) {
 		$args = func_get_args();
-		array_shift( $args );
+		array_shift($args);
 		try {
-			$results = call_user_func_array( array( $this, $function ), $args );
+			$results = call_user_func_array(array($this, $function), $args);
 			// If returned without exceptions, reset the refreshed flag.
 			$this->refreshed = false;
 			return $results;
-		} catch ( SoapFault $e ) {
+		} catch (SoapFault $e) {
 			// sf:INVALID_SESSION_ID is thrown on expired login (and other reasons).
 			// Our only recourse is to try refreshing our auth token. If we get any
 			// other exception, bubble it up.
-			if ( 'sf:INVALID_SESSION_ID' !== $e->faultcode ) {
+			if ('sf:INVALID_SESSION_ID' !== $e->faultcode) {
 				throw $e;
 			}
 
-			if ( ! $this->refreshed ) {
+			if ( ! $this->refreshed) {
 				// If we got an invalid session exception, try to refresh the auth
 				// token through REST API. The "refreshed" flag will make sure we retry
 				// only once.
 				$this->refreshed = true;
 				$this->salesforce_api->refresh_token();
-				return $this->trySoap( $function, $args );
+				return $this->trySoap($function, $args);
 			}
 
 			// If we've already tried a refresh, this refresh token is probably
 			// invalid. Kill it, log, and bubble the exception.
-			$this->set_authorized( false );
-			error_log( 'website is not authorized to connect to salesforce. visit authorize page.' );
+			$this->set_authorized(false);
+			error_log('website is not authorized to connect to salesforce. visit authorize page.');
 			throw $e;
 
 		}

classes/salesforce.php

Indentation +406 added lines, -406 removed lines

@@ -17,31 +17,31 @@ 
 	public $response;
 
 	/**
-	* Constructor which initializes the Salesforce APIs.
-	*
-	* @param string $consumer_key
-	*   Salesforce key to connect to your Salesforce instance.
-	* @param string $consumer_secret
-	*   Salesforce secret to connect to your Salesforce instance.
-	* @param string $login_url
-	*   Login URL for Salesforce auth requests - differs for production and sandbox
-	* @param string $callback_url
-	*   WordPress URL where Salesforce should send you after authentication
-	* @param string $authorize_path
-	*   Oauth path that Salesforce wants
-	* @param string $token_path
-	*   Path Salesforce uses to give you a token
-	* @param string $rest_api_version
-	*   What version of the Salesforce REST API to use
-	* @param object $wordpress
-	*   Object for doing things to WordPress - retrieving data, cache, etc.
-	* @param string $slug
-	*   Slug for this plugin. Can be used for file including, especially
-	* @param object $logging
-	*   Logging object for this plugin.
-	* @param array $schedulable_classes
-	*   array of classes that can have scheduled tasks specific to them
-	*/
+	 * Constructor which initializes the Salesforce APIs.
+	 *
+	 * @param string $consumer_key
+	 *   Salesforce key to connect to your Salesforce instance.
+	 * @param string $consumer_secret
+	 *   Salesforce secret to connect to your Salesforce instance.
+	 * @param string $login_url
+	 *   Login URL for Salesforce auth requests - differs for production and sandbox
+	 * @param string $callback_url
+	 *   WordPress URL where Salesforce should send you after authentication
+	 * @param string $authorize_path
+	 *   Oauth path that Salesforce wants
+	 * @param string $token_path
+	 *   Path Salesforce uses to give you a token
+	 * @param string $rest_api_version
+	 *   What version of the Salesforce REST API to use
+	 * @param object $wordpress
+	 *   Object for doing things to WordPress - retrieving data, cache, etc.
+	 * @param string $slug
+	 *   Slug for this plugin. Can be used for file including, especially
+	 * @param object $logging
+	 *   Logging object for this plugin.
+	 * @param array $schedulable_classes
+	 *   array of classes that can have scheduled tasks specific to them
+	 */
 	public function __construct( $consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes ) {
 		$this->consumer_key        = $consumer_key;
 		$this->consumer_secret     = $consumer_secret;
@@ -70,14 +70,14 @@ 
 	}
 
 	/**
-	* Converts a 15-character case-sensitive Salesforce ID to 18-character
-	* case-insensitive ID. If input is not 15-characters, return input unaltered.
-	*
-	* @param string $sf_id_15
-	*   15-character case-sensitive Salesforce ID
-	* @return string
-	*   18-character case-insensitive Salesforce ID
-	*/
+	 * Converts a 15-character case-sensitive Salesforce ID to 18-character
+	 * case-insensitive ID. If input is not 15-characters, return input unaltered.
+	 *
+	 * @param string $sf_id_15
+	 *   15-character case-sensitive Salesforce ID
+	 * @return string
+	 *   18-character case-insensitive Salesforce ID
+	 */
 	public static function convert_id( $sf_id_15 ) {
 		if ( strlen( $sf_id_15 ) !== 15 ) {
 			return $sf_id_15;
@@ -97,17 +97,17 @@ 
 	}
 
 	/**
-	* Given a Salesforce ID, return the corresponding SObject name. (Based on
-	*  keyPrefix from object definition, @see
-	*  https://developer.salesforce.com/forums/?id=906F0000000901ZIAQ )
-	*
-	* @param string $sf_id
-	*   15- or 18-character Salesforce ID
-	* @return string
-	*   sObject name, e.g. "Account", "Contact", "my__Custom_Object__c" or FALSE
-	*   if no match could be found.
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Given a Salesforce ID, return the corresponding SObject name. (Based on
+	 *  keyPrefix from object definition, @see
+	 *  https://developer.salesforce.com/forums/?id=906F0000000901ZIAQ )
+	 *
+	 * @param string $sf_id
+	 *   15- or 18-character Salesforce ID
+	 * @return string
+	 *   sObject name, e.g. "Account", "Contact", "my__Custom_Object__c" or FALSE
+	 *   if no match could be found.
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	public function get_sobject_type( $sf_id ) {
 		$objects = $this->objects(
 			array(
@@ -124,17 +124,17 @@ 
 	}
 
 	/**
-	* Determine if this SF instance is fully configured.
-	*
-	*/
+	 * Determine if this SF instance is fully configured.
+	 *
+	 */
 	public function is_authorized() {
 		return ! empty( $this->consumer_key ) && ! empty( $this->consumer_secret ) && $this->get_refresh_token();
 	}
 
 	/**
-	* Get REST API versions available on this Salesforce organization
-	* This is not an authenticated call, so it would not be a helpful test
-	*/
+	 * Get REST API versions available on this Salesforce organization
+	 * This is not an authenticated call, so it would not be a helpful test
+	 */
 	public function get_api_versions() {
 		$options = array(
 			'authenticated' => false,
@@ -144,26 +144,26 @@ 
 	}
 
 	/**
-	* Make a call to the Salesforce REST API.
-	*
-	* @param string $path
-	*   Path to resource.
-	* @param array $params
-	*   Parameters to provide.
-	* @param string $method
-	*   Method to initiate the call, such as GET or POST. Defaults to GET.
-	* @param array $options
-	*   Any method can supply options for the API call, and they'll be preserved as far as the curl request
-	*   They get merged with the class options
-	* @param string $type
-	*   Type of call. Defaults to 'rest' - currently we don't support other types.
-	*   Other exammple in Drupal is 'apexrest'
-	*
-	* @return mixed
-	*   The requested response.
-	*
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Make a call to the Salesforce REST API.
+	 *
+	 * @param string $path
+	 *   Path to resource.
+	 * @param array $params
+	 *   Parameters to provide.
+	 * @param string $method
+	 *   Method to initiate the call, such as GET or POST. Defaults to GET.
+	 * @param array $options
+	 *   Any method can supply options for the API call, and they'll be preserved as far as the curl request
+	 *   They get merged with the class options
+	 * @param string $type
+	 *   Type of call. Defaults to 'rest' - currently we don't support other types.
+	 *   Other exammple in Drupal is 'apexrest'
+	 *
+	 * @return mixed
+	 *   The requested response.
+	 *
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	public function api_call( $path, $params = array(), $method = 'GET', $options = array(), $type = 'rest' ) {
 		if ( ! $this->get_access_token() ) {
 			$this->refresh_token();
@@ -214,25 +214,25 @@ 
 	}
 
 	/**
-	* Private helper to issue an SF API request.
-	* This method is the only place where we read to or write from the cache
-	*
-	* @param string $path
-	*   Path to resource.
-	* @param array $params
-	*   Parameters to provide.
-	* @param string $method
-	*   Method to initiate the call, such as GET or POST.  Defaults to GET.
-	* @param array $options
-	*   This is the options array from the api_call method
-	*   This is where it gets merged with $this->options
-	* @param string $type
-	*   Type of call. Defaults to 'rest' - currently we don't support other types
-	*   Other exammple in Drupal is 'apexrest'
-	*
-	* @return array
-	*   The requested data.
-	*/
+	 * Private helper to issue an SF API request.
+	 * This method is the only place where we read to or write from the cache
+	 *
+	 * @param string $path
+	 *   Path to resource.
+	 * @param array $params
+	 *   Parameters to provide.
+	 * @param string $method
+	 *   Method to initiate the call, such as GET or POST.  Defaults to GET.
+	 * @param array $options
+	 *   This is the options array from the api_call method
+	 *   This is where it gets merged with $this->options
+	 * @param string $type
+	 *   Type of call. Defaults to 'rest' - currently we don't support other types
+	 *   Other exammple in Drupal is 'apexrest'
+	 *
+	 * @return array
+	 *   The requested data.
+	 */
 	protected function api_http_request( $path, $params, $method, $options = array(), $type = 'rest' ) {
 		$options = array_merge( $this->options, $options ); // this will override a value in $this->options with the one in $options if there is a matching key
 		$url     = $this->get_api_endpoint( $type ) . $path;
@@ -310,22 +310,22 @@ 
 	}
 
 	/**
-	* Make the HTTP request. Wrapper around curl().
-	*
-	* @param string $url
-	*   Path to make request from.
-	* @param array $data
-	*   The request body.
-	* @param array $headers
-	*   Request headers to send as name => value.
-	* @param string $method
-	*   Method to initiate the call, such as GET or POST. Defaults to GET.
-	* @param array $options
-	*   This is the options array from the api_http_request method
-	*
-	* @return array
-	*   Salesforce response object.
-	*/
+	 * Make the HTTP request. Wrapper around curl().
+	 *
+	 * @param string $url
+	 *   Path to make request from.
+	 * @param array $data
+	 *   The request body.
+	 * @param array $headers
+	 *   Request headers to send as name => value.
+	 * @param string $method
+	 *   Method to initiate the call, such as GET or POST. Defaults to GET.
+	 * @param array $options
+	 *   This is the options array from the api_http_request method
+	 *
+	 * @return array
+	 *   Salesforce response object.
+	 */
 	protected function http_request( $url, $data, $headers = array(), $method = 'GET', $options = array() ) {
 		// Build the request, including path and headers. Internal use.
 
@@ -460,14 +460,14 @@ 
 	}
 
 	/**
-	* Get the API end point for a given type of the API.
-	*
-	* @param string $api_type
-	*   E.g., rest, partner, enterprise.
-	*
-	* @return string
-	*   Complete URL endpoint for API access.
-	*/
+	 * Get the API end point for a given type of the API.
+	 *
+	 * @param string $api_type
+	 *   E.g., rest, partner, enterprise.
+	 *
+	 * @return string
+	 *   Complete URL endpoint for API access.
+	 */
 	public function get_api_endpoint( $api_type = 'rest' ) {
 		// Special handling for apexrest, since it's not in the identity object.
 		if ( 'apexrest' === $api_type ) {
@@ -483,67 +483,67 @@ 
 	}
 
 	/**
-	* Get the SF instance URL. Useful for linking to objects.
-	*/
+	 * Get the SF instance URL. Useful for linking to objects.
+	 */
 	public function get_instance_url() {
 		return get_option( 'object_sync_for_salesforce_instance_url', '' );
 	}
 
 	/**
-	* Set the SF instanc URL.
-	*
-	* @param string $url
-	*   URL to set.
-	*/
+	 * Set the SF instanc URL.
+	 *
+	 * @param string $url
+	 *   URL to set.
+	 */
 	protected function set_instance_url( $url ) {
 		update_option( 'object_sync_for_salesforce_instance_url', $url );
 	}
 
 	/**
-	* Get the access token.
-	*/
+	 * Get the access token.
+	 */
 	public function get_access_token() {
 		return get_option( 'object_sync_for_salesforce_access_token', '' );
 	}
 
 	/**
-	* Set the access token.
-	*
-	* It is stored in session.
-	*
-	* @param string $token
-	*   Access token from Salesforce.
-	*/
+	 * Set the access token.
+	 *
+	 * It is stored in session.
+	 *
+	 * @param string $token
+	 *   Access token from Salesforce.
+	 */
 	protected function set_access_token( $token ) {
 		update_option( 'object_sync_for_salesforce_access_token', $token );
 	}
 
 	/**
-	* Get refresh token.
-	*/
+	 * Get refresh token.
+	 */
 	protected function get_refresh_token() {
 		return get_option( 'object_sync_for_salesforce_refresh_token', '' );
 	}
 
 	/**
-	* Set refresh token.
-	*
-	* @param string $token
-	*   Refresh token from Salesforce.
-	*/
+	 * Set refresh token.
+	 *
+	 * @param string $token
+	 *   Refresh token from Salesforce.
+	 */
 	protected function set_refresh_token( $token ) {
 		update_option( 'object_sync_for_salesforce_refresh_token', $token );
 	}
 
 	/**
-	* Refresh access token based on the refresh token. Updates session variable.
-	*
-	* todo: figure out how to do this as part of the schedule class
-	* this is a scheduleable class and so we could add a method from this class to run every 24 hours, but it's unclear to me that we need it. salesforce seems to refresh itself as it needs to.
-	* but it could be a performance boost to do it at scheduleable intervals instead.
-	*
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Refresh access token based on the refresh token. Updates session variable.
+	 *
+	 * todo: figure out how to do this as part of the schedule class
+	 * this is a scheduleable class and so we could add a method from this class to run every 24 hours, but it's unclear to me that we need it. salesforce seems to refresh itself as it needs to.
+	 * but it could be a performance boost to do it at scheduleable intervals instead.
+	 *
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	protected function refresh_token() {
 		$refresh_token = $this->get_refresh_token();
 		if ( empty( $refresh_token ) ) {
@@ -590,13 +590,13 @@ 
 	}
 
 	/**
-	* Retrieve and store the Salesforce identity given an ID url.
-	*
-	* @param string $id
-	*   Identity URL.
-	*
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Retrieve and store the Salesforce identity given an ID url.
+	 *
+	 * @param string $id
+	 *   Identity URL.
+	 *
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	protected function set_identity( $id ) {
 		$headers  = array(
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
@@ -612,18 +612,18 @@ 
 	}
 
 	/**
-	* Return the Salesforce identity, which is stored in a variable.
-	*
-	* @return array
-	*   Returns FALSE if no identity has been stored.
-	*/
+	 * Return the Salesforce identity, which is stored in a variable.
+	 *
+	 * @return array
+	 *   Returns FALSE if no identity has been stored.
+	 */
 	public function get_identity() {
 		return get_option( 'object_sync_for_salesforce_identity', false );
 	}
 
 	/**
-	* OAuth step 1: Redirect to Salesforce and request and authorization code.
-	*/
+	 * OAuth step 1: Redirect to Salesforce and request and authorization code.
+	 */
 	public function get_authorization_code() {
 		$url = add_query_arg(
 			array(
@@ -637,11 +637,11 @@ 
 	}
 
 	/**
-	* OAuth step 2: Exchange an authorization code for an access token.
-	*
-	* @param string $code
-	*   Code from Salesforce.
-	*/
+	 * OAuth step 2: Exchange an authorization code for an access token.
+	 *
+	 * @param string $code
+	 *   Code from Salesforce.
+	 */
 	public function request_token( $code ) {
 		$data = array(
 			'code'          => $code,
@@ -686,22 +686,22 @@ 
 	/* Core API calls */
 
 	/**
-	* Available objects and their metadata for your organization's data.
-	*
-	* @param array $conditions
-	*   Associative array of filters to apply to the returned objects. Filters
-	*   are applied after the list is returned from Salesforce.
-	* @param bool $reset
-	*   Whether to reset the cache and retrieve a fresh version from Salesforce.
-	*
-	* @return array
-	*   Available objects and metadata.
-	*
-	* part of core API calls. this call does require authentication, and the basic url it becomes is like this:
-	* https://instance.salesforce.com/services/data/v#.0/sobjects
-	*
-	* updateable is really how the api spells it
-	*/
+	 * Available objects and their metadata for your organization's data.
+	 *
+	 * @param array $conditions
+	 *   Associative array of filters to apply to the returned objects. Filters
+	 *   are applied after the list is returned from Salesforce.
+	 * @param bool $reset
+	 *   Whether to reset the cache and retrieve a fresh version from Salesforce.
+	 *
+	 * @return array
+	 *   Available objects and metadata.
+	 *
+	 * part of core API calls. this call does require authentication, and the basic url it becomes is like this:
+	 * https://instance.salesforce.com/services/data/v#.0/sobjects
+	 *
+	 * updateable is really how the api spells it
+	 */
 	public function objects(
 		$conditions = array(
 			'updateable'  => true,
@@ -731,22 +731,22 @@ 
 	}
 
 	/**
-	* Use SOQL to get objects based on query string.
-	*
-	* @param string $query
-	*   The SOQL query.
-	* @param array $options
-	*   Allow for the query to have options based on what the user needs from it, ie caching, read/write, etc.
-	* @param boolean $all
-	*   Whether this should get all results for the query
-	* @param boolean $explain
-	*   If set, Salesforce will return feedback on the query performance
-	*
-	* @return array
-	*   Array of Salesforce objects that match the query.
-	*
-	* part of core API calls
-	*/
+	 * Use SOQL to get objects based on query string.
+	 *
+	 * @param string $query
+	 *   The SOQL query.
+	 * @param array $options
+	 *   Allow for the query to have options based on what the user needs from it, ie caching, read/write, etc.
+	 * @param boolean $all
+	 *   Whether this should get all results for the query
+	 * @param boolean $explain
+	 *   If set, Salesforce will return feedback on the query performance
+	 *
+	 * @return array
+	 *   Array of Salesforce objects that match the query.
+	 *
+	 * part of core API calls
+	 */
 	public function query( $query, $options = array(), $all = false, $explain = false ) {
 		$search_data = [
 			'q' => (string) $query,
@@ -766,19 +766,19 @@ 
 	}
 
 	/**
-	* Retrieve all the metadata for an object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account, etc.
-	* @param bool $reset
-	*   Whether to reset the cache and retrieve a fresh version from Salesforce.
-	*
-	* @return array
-	*   All the metadata for an object, including information about each field,
-	*   URLs, and child relationships.
-	*
-	* part of core API calls
-	*/
+	 * Retrieve all the metadata for an object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account, etc.
+	 * @param bool $reset
+	 *   Whether to reset the cache and retrieve a fresh version from Salesforce.
+	 *
+	 * @return array
+	 *   All the metadata for an object, including information about each field,
+	 *   URLs, and child relationships.
+	 *
+	 * part of core API calls
+	 */
 	public function object_describe( $name, $reset = false ) {
 		if ( empty( $name ) ) {
 			return array();
@@ -806,26 +806,26 @@ 
 	}
 
 	/**
-	* Create a new object of the given type.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account, etc.
-	* @param array $params
-	*   Values of the fields to set for the object.
-	*
-	* @return array
-	*   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
-	*   code: 201
-	*   data:
-	*     "id" : "00190000001pPvHAAU",
-	*     "success" : true
-	*     "errors" : [ ],
-	*   from_cache:
-	*   cached:
-	*   is_redo:
-	*
-	* part of core API calls
-	*/
+	 * Create a new object of the given type.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account, etc.
+	 * @param array $params
+	 *   Values of the fields to set for the object.
+	 *
+	 * @return array
+	 *   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
+	 *   code: 201
+	 *   data:
+	 *     "id" : "00190000001pPvHAAU",
+	 *     "success" : true
+	 *     "errors" : [ ],
+	 *   from_cache:
+	 *   cached:
+	 *   is_redo:
+	 *
+	 * part of core API calls
+	 */
 	public function object_create( $name, $params ) {
 		$options = array(
 			'type' => 'write',
@@ -835,34 +835,34 @@ 
 	}
 
 	/**
-	* Create new records or update existing records.
-	*
-	* The new records or updated records are based on the value of the specified
-	* field.  If the value is not unique, REST API returns a 300 response with
-	* the list of matching records.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $key
-	*   The field to check if this record should be created or updated.
-	* @param string $value
-	*   The value for this record of the field specified for $key.
-	* @param array $params
-	*   Values of the fields to set for the object.
-	*
-	* @return array
-	*   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
-	*   code: 201
-	*   data:
-	*     "id" : "00190000001pPvHAAU",
-	*     "success" : true
-	*     "errors" : [ ],
-	*   from_cache:
-	*   cached:
-	*   is_redo:
-	*
-	* part of core API calls
-	*/
+	 * Create new records or update existing records.
+	 *
+	 * The new records or updated records are based on the value of the specified
+	 * field.  If the value is not unique, REST API returns a 300 response with
+	 * the list of matching records.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $key
+	 *   The field to check if this record should be created or updated.
+	 * @param string $value
+	 *   The value for this record of the field specified for $key.
+	 * @param array $params
+	 *   Values of the fields to set for the object.
+	 *
+	 * @return array
+	 *   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
+	 *   code: 201
+	 *   data:
+	 *     "id" : "00190000001pPvHAAU",
+	 *     "success" : true
+	 *     "errors" : [ ],
+	 *   from_cache:
+	 *   cached:
+	 *   is_redo:
+	 *
+	 * part of core API calls
+	 */
 	public function object_upsert( $name, $key, $value, $params ) {
 		$options = array(
 			'type' => 'write',
@@ -884,27 +884,27 @@ 
 	}
 
 	/**
-	* Update an existing object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $id
-	*   Salesforce id of the object.
-	* @param array $params
-	*   Values of the fields to set for the object.
-	*
-	* part of core API calls
-	*
-	* @return array
-	*   json: {"success":true,"body":""}
-	*   code: 204
-	*   data:
+	 * Update an existing object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 * @param array $params
+	 *   Values of the fields to set for the object.
+	 *
+	 * part of core API calls
+	 *
+	 * @return array
+	 *   json: {"success":true,"body":""}
+	 *   code: 204
+	 *   data:
 		success: 1
 		body:
-	*   from_cache:
-	*   cached:
-	*   is_redo:
-	*/
+	 *   from_cache:
+	 *   cached:
+	 *   is_redo:
+	 */
 	public function object_update( $name, $id, $params ) {
 		$options = array(
 			'type' => 'write',
@@ -914,62 +914,62 @@ 
 	}
 
 	/**
-	* Return a full loaded Salesforce object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $id
-	*   Salesforce id of the object.
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Return a full loaded Salesforce object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function object_read( $name, $id ) {
 		return $this->api_call( "sobjects/{$name}/{$id}", array(), 'GET' );
 	}
 
 	/**
-	* Make a call to the Analytics API
-	*
-	* @param string $name
-	*   Object type name, E.g., Report
-	* @param string $id
-	*   Salesforce id of the object.
-	* @param string $route
-	*   What comes after the ID? E.g. instances, ?includeDetails=True
-	* @param array $params
-	*   Params to put with the request
-	* @param string $method
-	*   GET or POST
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Make a call to the Analytics API
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Report
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 * @param string $route
+	 *   What comes after the ID? E.g. instances, ?includeDetails=True
+	 * @param array $params
+	 *   Params to put with the request
+	 * @param string $method
+	 *   GET or POST
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function analytics_api( $name, $id, $route = '', $params = array(), $method = 'GET' ) {
 		return $this->api_call( "analytics/{$name}/{$id}/{$route}", $params, $method );
 	}
 
 	/**
-	* Run a specific Analytics report
-	*
-	* @param string $id
-	*   Salesforce id of the object.
-	* @param bool $async
-	*   Whether the report is asynchronous
-	* @param array $params
-	*   Params to put with the request
-	* @param string $method
-	*   GET or POST
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Run a specific Analytics report
+	 *
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 * @param bool $async
+	 *   Whether the report is asynchronous
+	 * @param array $params
+	 *   Params to put with the request
+	 * @param string $method
+	 *   GET or POST
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function run_analytics_report( $id, $async = true, $clear_cache = false, $params = array(), $method = 'GET', $report_cache_expiration = '', $cache_instance = true, $instance_cache_expiration = '' ) {
 
 		$id         = $this->convert_id( $id );
@@ -1055,36 +1055,36 @@ 
 	}
 
 	/**
-	* Return a full loaded Salesforce object from External ID.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $field
-	*   Salesforce external id field name.
-	* @param string $value
-	*   Value of external id.
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Return a full loaded Salesforce object from External ID.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $field
+	 *   Salesforce external id field name.
+	 * @param string $value
+	 *   Value of external id.
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function object_readby_external_id( $name, $field, $value ) {
 		return $this->api_call( "sobjects/{$name}/{$field}/{$value}" );
 	}
 
 	/**
-	* Delete a Salesforce object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $id
-	*   Salesforce id of the object.
-	*
-	* @return array
-	*
-	* part of core API calls
-	*/
+	 * Delete a Salesforce object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 *
+	 * @return array
+	 *
+	 * part of core API calls
+	 */
 	public function object_delete( $name, $id ) {
 		$options = array(
 			'type' => 'write',
@@ -1094,17 +1094,17 @@ 
 	}
 
 	/**
-	* Retrieves the list of individual objects that have been deleted within the
-	* given timespan for a specified object type.
-	*
-	* @param string $type
-	*   Object type name, E.g., Contact, Account.
-	* @param string $startDate
-	*   Start date to check for deleted objects (in ISO 8601 format).
-	* @param string $endDate
-	*   End date to check for deleted objects (in ISO 8601 format).
-	* @return GetDeletedResult
-	*/
+	 * Retrieves the list of individual objects that have been deleted within the
+	 * given timespan for a specified object type.
+	 *
+	 * @param string $type
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $startDate
+	 *   Start date to check for deleted objects (in ISO 8601 format).
+	 * @param string $endDate
+	 *   End date to check for deleted objects (in ISO 8601 format).
+	 * @return GetDeletedResult
+	 */
 	public function get_deleted( $type, $start_date, $end_date ) {
 		$options = array(
 			'cache' => false,
@@ -1114,13 +1114,13 @@ 
 
 
 	/**
-	* Return a list of available resources for the configured API version.
-	*
-	* @return array
-	*   Associative array keyed by name with a URI value.
-	*
-	* part of core API calls
-	*/
+	 * Return a list of available resources for the configured API version.
+	 *
+	 * @return array
+	 *   Associative array keyed by name with a URI value.
+	 *
+	 * part of core API calls
+	 */
 	public function list_resources() {
 		$resources = $this->api_call( '' );
 		foreach ( $resources as $key => $path ) {
@@ -1130,31 +1130,31 @@ 
 	}
 
 	/**
-	* Return a list of SFIDs for the given object, which have been created or
-	* updated in the given timeframe.
-	*
-	* @param string $type
-	*   Object type name, E.g., Contact, Account.
-	*
-	* @param int $start
-	*   unix timestamp for older timeframe for updates.
-	*   Defaults to "-29 days" if empty.
-	*
-	* @param int $end
-	*   unix timestamp for end of timeframe for updates.
-	*   Defaults to now if empty
-	*
-	* @return array
-	*   return array has 2 indexes:
-	*     "ids": a list of SFIDs of those records which have been created or
-	*       updated in the given timeframe.
-	*     "latestDateCovered": ISO 8601 format timestamp (UTC) of the last date
-	*       covered in the request.
-	*
-	* @see https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_getupdated.htm
-	*
-	* part of core API calls
-	*/
+	 * Return a list of SFIDs for the given object, which have been created or
+	 * updated in the given timeframe.
+	 *
+	 * @param string $type
+	 *   Object type name, E.g., Contact, Account.
+	 *
+	 * @param int $start
+	 *   unix timestamp for older timeframe for updates.
+	 *   Defaults to "-29 days" if empty.
+	 *
+	 * @param int $end
+	 *   unix timestamp for end of timeframe for updates.
+	 *   Defaults to now if empty
+	 *
+	 * @return array
+	 *   return array has 2 indexes:
+	 *     "ids": a list of SFIDs of those records which have been created or
+	 *       updated in the given timeframe.
+	 *     "latestDateCovered": ISO 8601 format timestamp (UTC) of the last date
+	 *       covered in the request.
+	 *
+	 * @see https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_getupdated.htm
+	 *
+	 * part of core API calls
+	 */
 	public function get_updated( $type, $start = null, $end = null ) {
 		if ( empty( $start ) ) {
 			$start = strtotime( '-29 days' );
@@ -1173,19 +1173,19 @@ 
 	}
 
 	/**
-	* Given a DeveloperName and SObject Name, return the SFID of the
-	* corresponding RecordType. DeveloperName doesn't change between Salesforce
-	* environments, so it's safer to rely on compared to SFID.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	*
-	* @param string $devname
-	*   RecordType DeveloperName, e.g. Donation, Membership, etc.
-	*
-	* @return string SFID
-	*   The Salesforce ID of the given Record Type, or null.
-	*/
+	 * Given a DeveloperName and SObject Name, return the SFID of the
+	 * corresponding RecordType. DeveloperName doesn't change between Salesforce
+	 * environments, so it's safer to rely on compared to SFID.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 *
+	 * @param string $devname
+	 *   RecordType DeveloperName, e.g. Donation, Membership, etc.
+	 *
+	 * @return string SFID
+	 *   The Salesforce ID of the given Record Type, or null.
+	 */
 
 	public function get_record_type_id_by_developer_name( $name, $devname, $reset = false ) {
 
@@ -1213,10 +1213,10 @@ 
 	}
 
 	/**
-	* If there is a WordPress setting for how long to keep the cache, return it and set the object property
-	* Otherwise, return seconds in 24 hours
-	*
-	*/
+	 * If there is a WordPress setting for how long to keep the cache, return it and set the object property
+	 * Otherwise, return seconds in 24 hours
+	 *
+	 */
 	private function cache_expiration() {
 		$cache_expiration = $this->wordpress->cache_expiration( 'object_sync_for_salesforce_cache_expiration', 86400 );
 		return $cache_expiration;

Spacing +232 added lines, -232 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -42,7 +42,7 @@ 
 	* @param array $schedulable_classes
 	*   array of classes that can have scheduled tasks specific to them
 	*/
-	public function __construct( $consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes ) {
+	public function __construct($consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes) {
 		$this->consumer_key        = $consumer_key;
 		$this->consumer_secret     = $consumer_secret;
 		$this->login_url           = $login_url;
@@ -60,12 +60,12 @@ 
 			'type'             => 'read',
 		);
 
-		$this->success_codes              = array( 200, 201, 204 );
+		$this->success_codes              = array(200, 201, 204);
 		$this->refresh_code               = 401;
 		$this->success_or_refresh_codes   = $this->success_codes;
 		$this->success_or_refresh_codes[] = $this->refresh_code;
 
-		$this->debug = get_option( 'object_sync_for_salesforce_debug_mode', false );
+		$this->debug = get_option('object_sync_for_salesforce_debug_mode', false);
 
 	}
 
@@ -78,20 +78,20 @@ 
 	* @return string
 	*   18-character case-insensitive Salesforce ID
 	*/
-	public static function convert_id( $sf_id_15 ) {
-		if ( strlen( $sf_id_15 ) !== 15 ) {
+	public static function convert_id($sf_id_15) {
+		if (strlen($sf_id_15) !== 15) {
 			return $sf_id_15;
 		}
-		$chunks = str_split( $sf_id_15, 5 );
+		$chunks = str_split($sf_id_15, 5);
 		$extra  = '';
-		foreach ( $chunks as $chunk ) {
-			$chars = str_split( $chunk, 1 );
+		foreach ($chunks as $chunk) {
+			$chars = str_split($chunk, 1);
 			$bits  = '';
-			foreach ( $chars as $char ) {
-				$bits .= ( ! is_numeric( $char ) && strtoupper( $char ) === $char ) ? '1' : '0';
+			foreach ($chars as $char) {
+				$bits .= ( ! is_numeric($char) && strtoupper($char) === $char) ? '1' : '0';
 			}
 			$map    = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ012345';
-			$extra .= substr( $map, base_convert( strrev( $bits ), 2, 10 ), 1 );
+			$extra .= substr($map, base_convert(strrev($bits), 2, 10), 1);
 		}
 		return $sf_id_15 . $extra;
 	}
@@ -108,15 +108,15 @@ 
 	*   if no match could be found.
 	* @throws Object_Sync_Sf_Exception
 	*/
-	public function get_sobject_type( $sf_id ) {
+	public function get_sobject_type($sf_id) {
 		$objects = $this->objects(
 			array(
-				'keyPrefix' => substr( $sf_id, 0, 3 ),
+				'keyPrefix' => substr($sf_id, 0, 3),
 			)
 		);
-		if ( 1 === count( $objects ) ) {
+		if (1 === count($objects)) {
 			// keyPrefix is unique across objects. If there is exactly one return value from objects(), then we have a match.
-			$object = reset( $objects );
+			$object = reset($objects);
 			return $object['name'];
 		}
 		// Otherwise, we did not find a match.
@@ -128,7 +128,7 @@ 
 	*
 	*/
 	public function is_authorized() {
-		return ! empty( $this->consumer_key ) && ! empty( $this->consumer_secret ) && $this->get_refresh_token();
+		return ! empty($this->consumer_key) && ! empty($this->consumer_secret) && $this->get_refresh_token();
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 			'authenticated' => false,
 			'full_url'      => true,
 		);
-		return $this->api_call( $this->get_instance_url() . '/services/data', [], 'GET', $options );
+		return $this->api_call($this->get_instance_url() . '/services/data', [], 'GET', $options);
 	}
 
 	/**
@@ -164,50 +164,50 @@ 
 	*
 	* @throws Object_Sync_Sf_Exception
 	*/
-	public function api_call( $path, $params = array(), $method = 'GET', $options = array(), $type = 'rest' ) {
-		if ( ! $this->get_access_token() ) {
+	public function api_call($path, $params = array(), $method = 'GET', $options = array(), $type = 'rest') {
+		if ( ! $this->get_access_token()) {
 			$this->refresh_token();
 		}
-		$this->response = $this->api_http_request( $path, $params, $method, $options, $type );
+		$this->response = $this->api_http_request($path, $params, $method, $options, $type);
 
 		// analytic calls that are expired return 404s for some absurd reason
-		if ( $this->response['code'] && 'run_analytics_report' === debug_backtrace()[1]['function'] ) {
+		if ($this->response['code'] && 'run_analytics_report' === debug_backtrace()[1]['function']) {
 			return $this->response;
 		}
 
-		switch ( $this->response['code'] ) {
+		switch ($this->response['code']) {
 			// The session ID or OAuth token used has expired or is invalid.
 			case $this->response['code'] === $this->refresh_code:
 				// Refresh token.
 				$this->refresh_token();
 				// Rebuild our request and repeat request.
 				$options['is_redo'] = true;
-				$this->response     = $this->api_http_request( $path, $params, $method, $options, $type );
+				$this->response     = $this->api_http_request($path, $params, $method, $options, $type);
 				// Throw an error if we still have bad response.
-				if ( ! in_array( $this->response['code'], $this->success_codes, true ) ) {
-					throw new Object_Sync_Sf_Exception( $this->response['data'][0]['message'], $this->response['code'] );
+				if ( ! in_array($this->response['code'], $this->success_codes, true)) {
+					throw new Object_Sync_Sf_Exception($this->response['data'][0]['message'], $this->response['code']);
 				}
 				break;
-			case in_array( $this->response['code'], $this->success_codes, true ):
+			case in_array($this->response['code'], $this->success_codes, true):
 				// All clear.
 				break;
 			default:
 				// We have problem and no specific Salesforce error provided.
-				if ( empty( $this->response['data'] ) ) {
-					throw new Object_Sync_Sf_Exception( $this->response['error'], $this->response['code'] );
+				if (empty($this->response['data'])) {
+					throw new Object_Sync_Sf_Exception($this->response['error'], $this->response['code']);
 				}
 		}
 
-		if ( ! empty( $this->response['data'][0] ) && 1 === count( $this->response['data'] ) ) {
+		if ( ! empty($this->response['data'][0]) && 1 === count($this->response['data'])) {
 			$this->response['data'] = $this->response['data'][0];
 		}
 
-		if ( isset( $this->response['data']['error'] ) ) {
-			throw new Object_Sync_Sf_Exception( $this->response['data']['error_description'], $this->response['data']['error'] );
+		if (isset($this->response['data']['error'])) {
+			throw new Object_Sync_Sf_Exception($this->response['data']['error_description'], $this->response['data']['error']);
 		}
 
-		if ( ! empty( $this->response['data']['errorCode'] ) ) {
-			throw new Object_Sync_Sf_Exception( $this->response['data']['message'], $this->response['code'] );
+		if ( ! empty($this->response['data']['errorCode'])) {
+			throw new Object_Sync_Sf_Exception($this->response['data']['message'], $this->response['code']);
 		}
 
 		return $this->response;
@@ -233,73 +233,73 @@ 
 	* @return array
 	*   The requested data.
 	*/
-	protected function api_http_request( $path, $params, $method, $options = array(), $type = 'rest' ) {
-		$options = array_merge( $this->options, $options ); // this will override a value in $this->options with the one in $options if there is a matching key
-		$url     = $this->get_api_endpoint( $type ) . $path;
-		if ( isset( $options['full_url'] ) && true === $options['full_url'] ) {
+	protected function api_http_request($path, $params, $method, $options = array(), $type = 'rest') {
+		$options = array_merge($this->options, $options); // this will override a value in $this->options with the one in $options if there is a matching key
+		$url     = $this->get_api_endpoint($type) . $path;
+		if (isset($options['full_url']) && true === $options['full_url']) {
 			$url = $path;
 		}
 		$headers = array(
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
 			'Accept-Encoding' => 'Accept-Encoding: gzip, deflate',
 		);
-		if ( 'POST' === $method || 'PATCH' === $method ) {
+		if ('POST' === $method || 'PATCH' === $method) {
 			$headers['Content-Type'] = 'Content-Type: application/json';
 		}
-		if ( isset( $options['authenticated'] ) && true === $options['authenticated'] ) {
+		if (isset($options['authenticated']) && true === $options['authenticated']) {
 			$headers = false;
 		}
 		// if this request should be cached, see if it already exists
 		// if it is already cached, load it. if not, load it and then cache it if it should be cached
 		// add parameters to the array so we can tell if it was cached or not
-		if ( true === $options['cache'] && 'write' !== $options['type'] ) {
-			$cached = $this->wordpress->cache_get( $url, $params );
+		if (true === $options['cache'] && 'write' !== $options['type']) {
+			$cached = $this->wordpress->cache_get($url, $params);
 			// some api calls can send a reset option, in which case we should redo the request anyway
-			if ( is_array( $cached ) && ( ! isset( $options['reset'] ) || true !== $options['reset'] ) ) {
+			if (is_array($cached) && ( ! isset($options['reset']) || true !== $options['reset'])) {
 				$result               = $cached;
 				$result['from_cache'] = true;
 				$result['cached']     = true;
 			} else {
-				$data   = wp_json_encode( $params );
-				$result = $this->http_request( $url, $data, $headers, $method, $options );
-				if ( in_array( $result['code'], $this->success_codes, true ) ) {
-					$result['cached'] = $this->wordpress->cache_set( $url, $params, $result, $options['cache_expiration'] );
+				$data   = wp_json_encode($params);
+				$result = $this->http_request($url, $data, $headers, $method, $options);
+				if (in_array($result['code'], $this->success_codes, true)) {
+					$result['cached'] = $this->wordpress->cache_set($url, $params, $result, $options['cache_expiration']);
 				} else {
 					$result['cached'] = false;
 				}
 				$result['from_cache'] = false;
 			}
 		} else {
-			$data                 = wp_json_encode( $params );
-			$result               = $this->http_request( $url, $data, $headers, $method, $options );
+			$data                 = wp_json_encode($params);
+			$result               = $this->http_request($url, $data, $headers, $method, $options);
 			$result['from_cache'] = false;
 			$result['cached']     = false;
 		}
 
-		if ( isset( $options['is_redo'] ) && true === $options['is_redo'] ) {
+		if (isset($options['is_redo']) && true === $options['is_redo']) {
 			$result['is_redo'] = true;
 		} else {
 			$result['is_redo'] = false;
 		}
 
 		// it would be very unfortunate to ever have to do this in a production site
-		if ( 1 === (int) $this->debug ) {
+		if (1 === (int) $this->debug) {
 			// create log entry for the api call if debug is true
 			$status = 'debug';
-			if ( isset( $this->logging ) ) {
+			if (isset($this->logging)) {
 				$logging = $this->logging;
-			} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-				$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+			} elseif (class_exists('Object_Sync_Sf_Logging')) {
+				$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 			}
 
 			// translators: placeholder is the URL of the Salesforce API request
-			$title = sprintf( esc_html__( 'Debug: on Salesforce API HTTP Request to URL: %1$s.', 'object-sync-for-salesforce' ),
-				esc_url( $url )
+			$title = sprintf(esc_html__('Debug: on Salesforce API HTTP Request to URL: %1$s.', 'object-sync-for-salesforce'),
+				esc_url($url)
 			);
 
 			$logging->setup(
 				$title,
-				print_r( $result, true ), // log the result because we are debugging the whole api call
+				print_r($result, true), // log the result because we are debugging the whole api call
 				0,
 				0,
 				$status
@@ -326,7 +326,7 @@ 
 	* @return array
 	*   Salesforce response object.
 	*/
-	protected function http_request( $url, $data, $headers = array(), $method = 'GET', $options = array() ) {
+	protected function http_request($url, $data, $headers = array(), $method = 'GET', $options = array()) {
 		// Build the request, including path and headers. Internal use.
 
 		/*
@@ -335,60 +335,60 @@ 
 		*/
 
 		$curl = curl_init();
-		curl_setopt( $curl, CURLOPT_URL, $url );
-		curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $curl, CURLOPT_FOLLOWLOCATION, true );
-		if ( false !== $headers ) {
-			curl_setopt( $curl, CURLOPT_HTTPHEADER, $headers );
+		curl_setopt($curl, CURLOPT_URL, $url);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+		if (false !== $headers) {
+			curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
 		} else {
-			curl_setopt( $curl, CURLOPT_HEADER, false );
+			curl_setopt($curl, CURLOPT_HEADER, false);
 		}
 
-		if ( 'POST' === $method ) {
-			curl_setopt( $curl, CURLOPT_POST, true );
-			curl_setopt( $curl, CURLOPT_POSTFIELDS, $data );
-		} elseif ( 'PATCH' === $method || 'DELETE' === $method ) {
-			curl_setopt( $curl, CURLOPT_CUSTOMREQUEST, $method );
-			curl_setopt( $curl, CURLOPT_POSTFIELDS, $data );
+		if ('POST' === $method) {
+			curl_setopt($curl, CURLOPT_POST, true);
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+		} elseif ('PATCH' === $method || 'DELETE' === $method) {
+			curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
 		}
-		$json_response = curl_exec( $curl ); // this is possibly gzipped json data
-		$code          = curl_getinfo( $curl, CURLINFO_HTTP_CODE );
+		$json_response = curl_exec($curl); // this is possibly gzipped json data
+		$code          = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 
-		if ( ( 'PATCH' === $method || 'DELETE' === $method ) && '' === $json_response && 204 === $code ) {
+		if (('PATCH' === $method || 'DELETE' === $method) && '' === $json_response && 204 === $code) {
 			// delete and patch requests return a 204 with an empty body upon success for whatever reason
 			$data = array(
 				'success' => true,
 				'body'    => '',
 			);
-			curl_close( $curl );
+			curl_close($curl);
 			return array(
-				'json' => wp_json_encode( $data ),
+				'json' => wp_json_encode($data),
 				'code' => $code,
 				'data' => $data,
 			);
 		}
 
-		if ( ( ord( $json_response[0] ) == 0x1f ) && ( ord( $json_response[1] ) == 0x8b ) ) {
+		if ((ord($json_response[0]) == 0x1f) && (ord($json_response[1]) == 0x8b)) {
 			// skip header and ungzip the data
-			$json_response = gzinflate( substr( $json_response, 10 ) );
+			$json_response = gzinflate(substr($json_response, 10));
 		}
-		$data = json_decode( $json_response, true ); // decode it into an array
+		$data = json_decode($json_response, true); // decode it into an array
 
 		// don't use the exception if the status is a success one, or if it just needs a refresh token (salesforce uses 401 for this)
-		if ( ! in_array( $code, $this->success_or_refresh_codes, true ) ) {
-			$curl_error = curl_error( $curl );
-			if ( '' !== $curl_error ) {
+		if ( ! in_array($code, $this->success_or_refresh_codes, true)) {
+			$curl_error = curl_error($curl);
+			if ('' !== $curl_error) {
 				// create log entry for failed curl
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholder is the URL of the Salesforce API request
-				$title = sprintf( esc_html__( 'Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce' ),
-					esc_attr( $code )
+				$title = sprintf(esc_html__('Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce'),
+					esc_attr($code)
 				);
 
 				$logging->setup(
@@ -398,25 +398,25 @@ 
 					0,
 					$status
 				);
-			} elseif ( isset( $data[0]['errorCode'] ) && '' !== $data[0]['errorCode'] ) { // salesforce uses this structure to return errors
+			} elseif (isset($data[0]['errorCode']) && '' !== $data[0]['errorCode']) { // salesforce uses this structure to return errors
 				// create log entry for failed curl
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholder is the server code returned by the api
-				$title = sprintf( esc_html__( 'Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce' ),
-					absint( $code )
+				$title = sprintf(esc_html__('Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce'),
+					absint($code)
 				);
 
 				// translators: placeholders are: 1) the URL requested, 2) the message returned by the error, 3) the server code returned
-				$body = sprintf( '<p>' . esc_html__( 'URL: %1$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Message: %2$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Code: %3$s', 'object-sync-for-salesforce' ),
-					esc_attr( $url ),
-					esc_html( $data[0]['message'] ),
-					absint( $code )
+				$body = sprintf('<p>' . esc_html__('URL: %1$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Message: %2$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Code: %3$s', 'object-sync-for-salesforce'),
+					esc_attr($url),
+					esc_html($data[0]['message']),
+					absint($code)
 				);
 
 				$logging->setup(
@@ -429,20 +429,20 @@ 
 			} else {
 				// create log entry for failed curl
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholder is the server code returned by Salesforce
-				$title = sprintf( esc_html__( 'Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce' ),
-					absint( $code )
+				$title = sprintf(esc_html__('Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce'),
+					absint($code)
 				);
 
 				$logging->setup(
 					$title,
-					print_r( $data, true ), // log the result because we are debugging the whole api call
+					print_r($data, true), // log the result because we are debugging the whole api call
 					0,
 					0,
 					$status
@@ -450,7 +450,7 @@ 
 			} // End if().
 		} // End if().
 
-		curl_close( $curl );
+		curl_close($curl);
 
 		return array(
 			'json' => $json_response,
@@ -468,14 +468,14 @@ 
 	* @return string
 	*   Complete URL endpoint for API access.
 	*/
-	public function get_api_endpoint( $api_type = 'rest' ) {
+	public function get_api_endpoint($api_type = 'rest') {
 		// Special handling for apexrest, since it's not in the identity object.
-		if ( 'apexrest' === $api_type ) {
+		if ('apexrest' === $api_type) {
 			$url = $this->get_instance_url() . '/services/apexrest/';
 		} else {
 			$identity = $this->get_identity();
-			$url      = str_replace( '{version}', $this->rest_api_version, $identity['urls'][ $api_type ] );
-			if ( '' === $identity ) {
+			$url      = str_replace('{version}', $this->rest_api_version, $identity['urls'][$api_type]);
+			if ('' === $identity) {
 				$url = $this->get_instance_url() . '/services/data/v' . $this->rest_api_version . '/';
 			}
 		}
@@ -486,7 +486,7 @@ 
 	* Get the SF instance URL. Useful for linking to objects.
 	*/
 	public function get_instance_url() {
-		return get_option( 'object_sync_for_salesforce_instance_url', '' );
+		return get_option('object_sync_for_salesforce_instance_url', '');
 	}
 
 	/**
@@ -495,15 +495,15 @@ 
 	* @param string $url
 	*   URL to set.
 	*/
-	protected function set_instance_url( $url ) {
-		update_option( 'object_sync_for_salesforce_instance_url', $url );
+	protected function set_instance_url($url) {
+		update_option('object_sync_for_salesforce_instance_url', $url);
 	}
 
 	/**
 	* Get the access token.
 	*/
 	public function get_access_token() {
-		return get_option( 'object_sync_for_salesforce_access_token', '' );
+		return get_option('object_sync_for_salesforce_access_token', '');
 	}
 
 	/**
@@ -514,15 +514,15 @@ 
 	* @param string $token
 	*   Access token from Salesforce.
 	*/
-	protected function set_access_token( $token ) {
-		update_option( 'object_sync_for_salesforce_access_token', $token );
+	protected function set_access_token($token) {
+		update_option('object_sync_for_salesforce_access_token', $token);
 	}
 
 	/**
 	* Get refresh token.
 	*/
 	protected function get_refresh_token() {
-		return get_option( 'object_sync_for_salesforce_refresh_token', '' );
+		return get_option('object_sync_for_salesforce_refresh_token', '');
 	}
 
 	/**
@@ -531,8 +531,8 @@ 
 	* @param string $token
 	*   Refresh token from Salesforce.
 	*/
-	protected function set_refresh_token( $token ) {
-		update_option( 'object_sync_for_salesforce_refresh_token', $token );
+	protected function set_refresh_token($token) {
+		update_option('object_sync_for_salesforce_refresh_token', $token);
 	}
 
 	/**
@@ -546,8 +546,8 @@ 
 	*/
 	protected function refresh_token() {
 		$refresh_token = $this->get_refresh_token();
-		if ( empty( $refresh_token ) ) {
-			throw new Object_Sync_Sf_Exception( esc_html__( 'There is no refresh token.', 'object-sync-for-salesforce' ) );
+		if (empty($refresh_token)) {
+			throw new Object_Sync_Sf_Exception(esc_html__('There is no refresh token.', 'object-sync-for-salesforce'));
 		}
 
 		$data = array(
@@ -565,13 +565,13 @@ 
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
 		);
 		$headers  = false;
-		$response = $this->http_request( $url, $data, $headers, 'POST' );
+		$response = $this->http_request($url, $data, $headers, 'POST');
 
-		if ( 200 !== $response['code'] ) {
+		if (200 !== $response['code']) {
 			throw new Object_Sync_Sf_Exception(
 				esc_html(
 					sprintf(
-						__( 'Unable to get a Salesforce access token. Salesforce returned the following errorCode: ', 'object-sync-for-salesforce' ) . $response['code']
+						__('Unable to get a Salesforce access token. Salesforce returned the following errorCode: ', 'object-sync-for-salesforce') . $response['code']
 					)
 				),
 				$response['code']
@@ -580,13 +580,13 @@ 
 
 		$data = $response['data'];
 
-		if ( is_array( $data ) && isset( $data['error'] ) ) {
-			throw new Object_Sync_Sf_Exception( $data['error_description'], $data['error'] );
+		if (is_array($data) && isset($data['error'])) {
+			throw new Object_Sync_Sf_Exception($data['error_description'], $data['error']);
 		}
 
-		$this->set_access_token( $data['access_token'] );
-		$this->set_identity( $data['id'] );
-		$this->set_instance_url( $data['instance_url'] );
+		$this->set_access_token($data['access_token']);
+		$this->set_identity($data['id']);
+		$this->set_instance_url($data['instance_url']);
 	}
 
 	/**
@@ -597,18 +597,18 @@ 
 	*
 	* @throws Object_Sync_Sf_Exception
 	*/
-	protected function set_identity( $id ) {
-		$headers  = array(
+	protected function set_identity($id) {
+		$headers = array(
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
 			//'Content-type'  => 'application/json',
 			'Accept-Encoding' => 'Accept-Encoding: gzip, deflate',
 		);
-		$response = $this->http_request( $id, null, $headers );
-		if ( 200 !== $response['code'] ) {
-			throw new Object_Sync_Sf_Exception( esc_html__( 'Unable to access identity service.', 'object-sync-for-salesforce' ), $response['code'] );
+		$response = $this->http_request($id, null, $headers);
+		if (200 !== $response['code']) {
+			throw new Object_Sync_Sf_Exception(esc_html__('Unable to access identity service.', 'object-sync-for-salesforce'), $response['code']);
 		}
 		$data = $response['data'];
-		update_option( 'object_sync_for_salesforce_identity', $data );
+		update_option('object_sync_for_salesforce_identity', $data);
 	}
 
 	/**
@@ -618,7 +618,7 @@ 
 	*   Returns FALSE if no identity has been stored.
 	*/
 	public function get_identity() {
-		return get_option( 'object_sync_for_salesforce_identity', false );
+		return get_option('object_sync_for_salesforce_identity', false);
 	}
 
 	/**
@@ -642,7 +642,7 @@ 
 	* @param string $code
 	*   Code from Salesforce.
 	*/
-	public function request_token( $code ) {
+	public function request_token($code) {
 		$data = array(
 			'code'          => $code,
 			'grant_type'    => 'authorization_code',
@@ -657,28 +657,28 @@ 
 			//'Content-Type'  => 'application/x-www-form-urlencoded',
 			'Accept-Encoding' => 'Accept-Encoding: gzip, deflate',
 		);
-		$response = $this->http_request( $url, $data, $headers, 'POST' );
+		$response = $this->http_request($url, $data, $headers, 'POST');
 
 		$data = $response['data'];
 
-		if ( 200 !== $response['code'] ) {
-			$error = isset( $data['error_description'] ) ? $data['error_description'] : $response['error'];
-			throw new Object_Sync_Sf_Exception( $error, $response['code'] );
+		if (200 !== $response['code']) {
+			$error = isset($data['error_description']) ? $data['error_description'] : $response['error'];
+			throw new Object_Sync_Sf_Exception($error, $response['code']);
 		}
 
 		// Ensure all required attributes are returned. They can be omitted if the
 		// OAUTH scope is inadequate.
-		$required = array( 'refresh_token', 'access_token', 'id', 'instance_url' );
-		foreach ( $required as $key ) {
-			if ( ! isset( $data[ $key ] ) ) {
+		$required = array('refresh_token', 'access_token', 'id', 'instance_url');
+		foreach ($required as $key) {
+			if ( ! isset($data[$key])) {
 				return false;
 			}
 		}
 
-		$this->set_refresh_token( $data['refresh_token'] );
-		$this->set_access_token( $data['access_token'] );
-		$this->set_identity( $data['id'] );
-		$this->set_instance_url( $data['instance_url'] );
+		$this->set_refresh_token($data['refresh_token']);
+		$this->set_access_token($data['access_token']);
+		$this->set_identity($data['id']);
+		$this->set_instance_url($data['instance_url']);
 
 		return true;
 	}
@@ -713,19 +713,19 @@ 
 		$options = array(
 			'reset' => $reset,
 		);
-		$result  = $this->api_call( 'sobjects', array(), 'GET', $options );
+		$result  = $this->api_call('sobjects', array(), 'GET', $options);
 
-		if ( ! empty( $conditions ) ) {
-			foreach ( $result['data']['sobjects'] as $key => $object ) {
-				foreach ( $conditions as $condition => $value ) {
-					if ( $object[ $condition ] !== $value ) {
-						unset( $result['data']['sobjects'][ $key ] );
+		if ( ! empty($conditions)) {
+			foreach ($result['data']['sobjects'] as $key => $object) {
+				foreach ($conditions as $condition => $value) {
+					if ($object[$condition] !== $value) {
+						unset($result['data']['sobjects'][$key]);
 					}
 				}
 			}
 		}
 
-		ksort( $result['data']['sobjects'] );
+		ksort($result['data']['sobjects']);
 
 		return $result['data']['sobjects'];
 	}
@@ -747,21 +747,21 @@ 
 	*
 	* part of core API calls
 	*/
-	public function query( $query, $options = array(), $all = false, $explain = false ) {
+	public function query($query, $options = array(), $all = false, $explain = false) {
 		$search_data = [
 			'q' => (string) $query,
 		];
-		if ( true === $explain ) {
+		if (true === $explain) {
 			$search_data['explain'] = $search_data['q'];
-			unset( $search_data['q'] );
+			unset($search_data['q']);
 		}
 		// all is a search through deleted and merged data as well
-		if ( true === $all ) {
+		if (true === $all) {
 			$path = 'queryAll';
 		} else {
 			$path = 'query';
 		}
-		$result = $this->api_call( $path . '?' . http_build_query( $search_data ), array(), 'GET', $options );
+		$result = $this->api_call($path . '?' . http_build_query($search_data), array(), 'GET', $options);
 		return $result;
 	}
 
@@ -779,28 +779,28 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_describe( $name, $reset = false ) {
-		if ( empty( $name ) ) {
+	public function object_describe($name, $reset = false) {
+		if (empty($name)) {
 			return array();
 		}
 		$options = array(
 			'reset' => $reset,
 		);
-		$object  = $this->api_call( "sobjects/{$name}/describe", array(), 'GET', $options );
+		$object  = $this->api_call("sobjects/{$name}/describe", array(), 'GET', $options);
 		// Sort field properties, because salesforce API always provides them in a
 		// random order. We sort them so that stored and exported data are
 		// standardized and predictable.
 		$fields = array();
-		foreach ( $object['data']['fields'] as &$field ) {
-			ksort( $field );
-			if ( ! empty( $field['picklistValues'] ) ) {
-				foreach ( $field['picklistValues'] as &$picklist_value ) {
-					ksort( $picklist_value );
+		foreach ($object['data']['fields'] as &$field) {
+			ksort($field);
+			if ( ! empty($field['picklistValues'])) {
+				foreach ($field['picklistValues'] as &$picklist_value) {
+					ksort($picklist_value);
 				}
 			}
-			$fields[ $field['name'] ] = $field;
+			$fields[$field['name']] = $field;
 		}
-		ksort( $fields );
+		ksort($fields);
 		$object['fields'] = $fields;
 		return $object;
 	}
@@ -826,11 +826,11 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_create( $name, $params ) {
+	public function object_create($name, $params) {
 		$options = array(
 			'type' => 'write',
 		);
-		$result  = $this->api_call( "sobjects/{$name}", $params, 'POST', $options );
+		$result  = $this->api_call("sobjects/{$name}", $params, 'POST', $options);
 		return $result;
 	}
 
@@ -863,22 +863,22 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_upsert( $name, $key, $value, $params ) {
+	public function object_upsert($name, $key, $value, $params) {
 		$options = array(
 			'type' => 'write',
 		);
 		// If key is set, remove from $params to avoid UPSERT errors.
-		if ( isset( $params[ $key ] ) ) {
-			unset( $params[ $key ] );
+		if (isset($params[$key])) {
+			unset($params[$key]);
 		}
 
 		// allow developers to change both the key and value by which objects should be matched
-		$key   = apply_filters( 'object_sync_for_salesforce_modify_upsert_key', $key );
-		$value = apply_filters( 'object_sync_for_salesforce_modify_upsert_value', $value );
+		$key   = apply_filters('object_sync_for_salesforce_modify_upsert_key', $key);
+		$value = apply_filters('object_sync_for_salesforce_modify_upsert_value', $value);
 
-		$data = $this->api_call( "sobjects/{$name}/{$key}/{$value}", $params, 'PATCH', $options );
-		if ( 300 === $this->response['code'] ) {
-			$data['message'] = esc_html( 'The value provided is not unique.' );
+		$data = $this->api_call("sobjects/{$name}/{$key}/{$value}", $params, 'PATCH', $options);
+		if (300 === $this->response['code']) {
+			$data['message'] = esc_html('The value provided is not unique.');
 		}
 		return $data;
 	}
@@ -905,11 +905,11 @@ 
 	*   cached:
 	*   is_redo:
 	*/
-	public function object_update( $name, $id, $params ) {
+	public function object_update($name, $id, $params) {
 		$options = array(
 			'type' => 'write',
 		);
-		$result  = $this->api_call( "sobjects/{$name}/{$id}", $params, 'PATCH', $options );
+		$result  = $this->api_call("sobjects/{$name}/{$id}", $params, 'PATCH', $options);
 		return $result;
 	}
 
@@ -926,8 +926,8 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_read( $name, $id ) {
-		return $this->api_call( "sobjects/{$name}/{$id}", array(), 'GET' );
+	public function object_read($name, $id) {
+		return $this->api_call("sobjects/{$name}/{$id}", array(), 'GET');
 	}
 
 	/**
@@ -949,8 +949,8 @@ 
 	*
 	* part of core API calls
 	*/
-	public function analytics_api( $name, $id, $route = '', $params = array(), $method = 'GET' ) {
-		return $this->api_call( "analytics/{$name}/{$id}/{$route}", $params, $method );
+	public function analytics_api($name, $id, $route = '', $params = array(), $method = 'GET') {
+		return $this->api_call("analytics/{$name}/{$id}/{$route}", $params, $method);
 	}
 
 	/**
@@ -970,19 +970,19 @@ 
 	*
 	* part of core API calls
 	*/
-	public function run_analytics_report( $id, $async = true, $clear_cache = false, $params = array(), $method = 'GET', $report_cache_expiration = '', $cache_instance = true, $instance_cache_expiration = '' ) {
+	public function run_analytics_report($id, $async = true, $clear_cache = false, $params = array(), $method = 'GET', $report_cache_expiration = '', $cache_instance = true, $instance_cache_expiration = '') {
 
-		$id         = $this->convert_id( $id );
+		$id         = $this->convert_id($id);
 		$report_url = 'analytics/reports/' . $id . '/' . 'instances';
 
-		if ( true === $clear_cache ) {
-			delete_transient( $report_url );
+		if (true === $clear_cache) {
+			delete_transient($report_url);
 		}
 
-		$instance_id = $this->wordpress->cache_get( $report_url, '' );
+		$instance_id = $this->wordpress->cache_get($report_url, '');
 
 		// there is no stored instance id or this is synchronous; retrieve the results for that instance
-		if ( false === $async || false === $instance_id ) {
+		if (false === $async || false === $instance_id) {
 
 			$result = $this->analytics_api(
 				'reports',
@@ -992,7 +992,7 @@ 
 				'GET'
 			);
 			// if we get a reportmetadata array out of this, continue
-			if ( is_array( $result['data']['reportMetadata'] ) ) {
+			if (is_array($result['data']['reportMetadata'])) {
 				$params = array(
 					'reportMetadata' => $result['data']['reportMetadata'],
 				);
@@ -1004,48 +1004,48 @@ 
 					'POST'
 				);
 				// if we get an id from the post, that is the instance id
-				if ( isset( $report['data']['id'] ) ) {
+				if (isset($report['data']['id'])) {
 					$instance_id = $report['data']['id'];
 				} else {
 					// run the call again if we don't have an instance id
 					//error_log('run report again. we have no instance id.');
-					$this->run_analytics_report( $id, true );
+					$this->run_analytics_report($id, true);
 				}
 
 				// cache the instance id so we can get the report results if they are applicable
-				if ( '' === $report_cache_expiration ) {
+				if ('' === $report_cache_expiration) {
 					$report_cache_expiration = $this->cache_expiration();
 				}
-				$this->wordpress->cache_set( $report_url, '', $instance_id, $report_cache_expiration );
+				$this->wordpress->cache_set($report_url, '', $instance_id, $report_cache_expiration);
 			} else {
 				// run the call again if we don't have a reportMetadata array
 				//error_log('run report again. we have no reportmetadata.');
-				$this->run_analytics_report( $id, true );
+				$this->run_analytics_report($id, true);
 			}
 		} // End if().
 
-		$result = $this->api_call( $report_url . "/{$instance_id}", array(), $method );
+		$result = $this->api_call($report_url . "/{$instance_id}", array(), $method);
 
 		// the report instance is expired. rerun it.
-		if ( 404 === $result['code'] ) {
+		if (404 === $result['code']) {
 			//error_log('run report again. it expired.');
-			$this->run_analytics_report( $id, true, true );
+			$this->run_analytics_report($id, true, true);
 		}
 
 		// cache the instance results as a long fallback if the setting says so
 		// do this because salesforce will have errors if the instance has expired or is currently running
 		// remember: the result of the above api_call is already cached (or not) according to the plugin's generic settings
 		// this is fine I think, although it is a bit of redundancy in this case
-		if ( true === $cache_instance ) {
-			$cached = $this->wordpress->cache_get( $report_url . '_instance_cached', '' );
-			if ( is_array( $cached ) ) {
+		if (true === $cache_instance) {
+			$cached = $this->wordpress->cache_get($report_url . '_instance_cached', '');
+			if (is_array($cached)) {
 				$result = $cached;
 			} else {
-				if ( 'Success' === $result['data']['attributes']['status'] ) {
-					if ( '' === $instance_cache_expiration ) {
+				if ('Success' === $result['data']['attributes']['status']) {
+					if ('' === $instance_cache_expiration) {
 						$instance_cache_expiration = $this->cache_expiration();
 					}
-					$this->wordpress->cache_set( $report_url . '_instance_cached', '', $result, $instance_cache_expiration );
+					$this->wordpress->cache_set($report_url . '_instance_cached', '', $result, $instance_cache_expiration);
 				}
 			}
 		}
@@ -1069,8 +1069,8 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_readby_external_id( $name, $field, $value ) {
-		return $this->api_call( "sobjects/{$name}/{$field}/{$value}" );
+	public function object_readby_external_id($name, $field, $value) {
+		return $this->api_call("sobjects/{$name}/{$field}/{$value}");
 	}
 
 	/**
@@ -1085,11 +1085,11 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_delete( $name, $id ) {
+	public function object_delete($name, $id) {
 		$options = array(
 			'type' => 'write',
 		);
-		$result  = $this->api_call( "sobjects/{$name}/{$id}", array(), 'DELETE', $options );
+		$result  = $this->api_call("sobjects/{$name}/{$id}", array(), 'DELETE', $options);
 		return $result;
 	}
 
@@ -1105,11 +1105,11 @@ 
 	*   End date to check for deleted objects (in ISO 8601 format).
 	* @return GetDeletedResult
 	*/
-	public function get_deleted( $type, $start_date, $end_date ) {
+	public function get_deleted($type, $start_date, $end_date) {
 		$options = array(
 			'cache' => false,
 		); // this is timestamp level specific; probably should not cache it
-		return $this->api_call( "sobjects/{$type}/deleted/?start={$start_date}&end={$end_date}", array(), 'GET', $options );
+		return $this->api_call("sobjects/{$type}/deleted/?start={$start_date}&end={$end_date}", array(), 'GET', $options);
 	}
 
 
@@ -1122,9 +1122,9 @@ 
 	* part of core API calls
 	*/
 	public function list_resources() {
-		$resources = $this->api_call( '' );
-		foreach ( $resources as $key => $path ) {
-			$items[ $key ] = $path;
+		$resources = $this->api_call('');
+		foreach ($resources as $key => $path) {
+			$items[$key] = $path;
 		}
 		return $items;
 	}
@@ -1155,21 +1155,21 @@ 
 	*
 	* part of core API calls
 	*/
-	public function get_updated( $type, $start = null, $end = null ) {
-		if ( empty( $start ) ) {
-			$start = strtotime( '-29 days' );
+	public function get_updated($type, $start = null, $end = null) {
+		if (empty($start)) {
+			$start = strtotime('-29 days');
 		}
-		$start = rawurlencode( gmdate( DATE_ATOM, $start ) );
+		$start = rawurlencode(gmdate(DATE_ATOM, $start));
 
-		if ( empty( $end ) ) {
+		if (empty($end)) {
 			$end = time();
 		}
-		$end = rawurlencode( gmdate( DATE_ATOM, $end ) );
+		$end = rawurlencode(gmdate(DATE_ATOM, $end));
 
 		$options = array(
 			'cache' => false,
 		); // this is timestamp level specific; probably should not cache it
-		return $this->api_call( "sobjects/{$type}/updated/?start=$start&end=$end", array(), 'GET', $options );
+		return $this->api_call("sobjects/{$type}/updated/?start=$start&end=$end", array(), 'GET', $options);
 	}
 
 	/**
@@ -1187,28 +1187,28 @@ 
 	*   The Salesforce ID of the given Record Type, or null.
 	*/
 
-	public function get_record_type_id_by_developer_name( $name, $devname, $reset = false ) {
+	public function get_record_type_id_by_developer_name($name, $devname, $reset = false) {
 
 		// example of how this runs: $this->get_record_type_id_by_developer_name( 'Account', 'HH_Account' );
 
-		$cached = $this->wordpress->cache_get( 'salesforce_record_types', '' );
-		if ( is_array( $cached ) && ( ! isset( $reset ) || true !== $reset ) ) {
-			return ! empty( $cached[ $name ][ $devname ] ) ? $cached[ $name ][ $devname ]['Id'] : null;
+		$cached = $this->wordpress->cache_get('salesforce_record_types', '');
+		if (is_array($cached) && ( ! isset($reset) || true !== $reset)) {
+			return ! empty($cached[$name][$devname]) ? $cached[$name][$devname]['Id'] : null;
 		}
 
-		$query         = new Object_Sync_Sf_Salesforce_Select_Query( 'RecordType' );
-		$query->fields = array( 'Id', 'Name', 'DeveloperName', 'SobjectType' );
+		$query         = new Object_Sync_Sf_Salesforce_Select_Query('RecordType');
+		$query->fields = array('Id', 'Name', 'DeveloperName', 'SobjectType');
 
-		$result       = $this->query( $query );
+		$result       = $this->query($query);
 		$record_types = array();
 
-		foreach ( $result['data']['records'] as $record_type ) {
-			$record_types[ $record_type['SobjectType'] ][ $record_type['DeveloperName'] ] = $record_type;
+		foreach ($result['data']['records'] as $record_type) {
+			$record_types[$record_type['SobjectType']][$record_type['DeveloperName']] = $record_type;
 		}
 
-		$cached = $this->wordpress->cache_set( 'salesforce_record_types', '', $record_types, $this->options['cache_expiration'] );
+		$cached = $this->wordpress->cache_set('salesforce_record_types', '', $record_types, $this->options['cache_expiration']);
 
-		return ! empty( $record_types[ $name ][ $devname ] ) ? $record_types[ $name ][ $devname ]['Id'] : null;
+		return ! empty($record_types[$name][$devname]) ? $record_types[$name][$devname]['Id'] : null;
 
 	}
 
@@ -1218,7 +1218,7 @@ 
 	*
 	*/
 	private function cache_expiration() {
-		$cache_expiration = $this->wordpress->cache_expiration( 'object_sync_for_salesforce_cache_expiration', 86400 );
+		$cache_expiration = $this->wordpress->cache_expiration('object_sync_for_salesforce_cache_expiration', 86400);
 		return $cache_expiration;
 	}
 

tests/bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
  * @package Object_Sync_Salesforce
  */
 
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( ! $_tests_dir) {
 	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
 
@@ -17,9 +17,9 @@ 
  * Manually load the plugin being tested.
  */
 function _manually_load_plugin() {
-	require dirname( dirname( __FILE__ ) ) . '/object-sync-for-salesforce.php';
+	require dirname(dirname(__FILE__)) . '/object-sync-for-salesforce.php';
 }
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
 // Start up the WP testing environment.
 require $_tests_dir . '/includes/bootstrap.php';

tests/test-sample.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 	 */
 	function test_sample() {
 		// Replace this with some actual testing code.
-		$this->assertTrue( true );
+		$this->assertTrue(true);
 	}
 }

classes/wordpress.php

Spacing +492 added lines, -492 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -30,26 +30,26 @@ 
 	 * @param object $logging a Object_Sync_Sf_Logging instance.
 	 * @throws \Exception
 	 */
-	public function __construct( $wpdb, $version, $slug, $mappings, $logging ) {
+	public function __construct($wpdb, $version, $slug, $mappings, $logging) {
 		$this->wpdb     = $wpdb;
 		$this->version  = $version;
 		$this->slug     = $slug;
 		$this->mappings = $mappings;
 		$this->logging  = $logging;
 
-		add_action( 'admin_init', function() {
+		add_action('admin_init', function() {
 			$this->wordpress_objects = $this->get_object_types();
 		} );
 
 		$this->options = array(
 			'cache'            => true,
-			'cache_expiration' => $this->cache_expiration( 'wordpress_data_cache', 86400 ),
+			'cache_expiration' => $this->cache_expiration('wordpress_data_cache', 86400),
 			'type'             => 'read',
 		);
 
-		$this->sfwp_transients = new Object_Sync_Sf_WordPress_Transient( 'sfwp_transients' );
+		$this->sfwp_transients = new Object_Sync_Sf_WordPress_Transient('sfwp_transients');
 
-		$this->debug = get_option( 'object_sync_for_salesforce_debug_mode', false );
+		$this->debug = get_option('object_sync_for_salesforce_debug_mode', false);
 
 	}
 
@@ -77,20 +77,20 @@ 
 		*/
 
 		// this should include the available object types and send them to the hook
-		$wordpress_types_not_posts_include = array( 'user', 'comment', 'category', 'tag' );
-		$wordpress_objects                 = array_merge( get_post_types(), $wordpress_types_not_posts_include );
+		$wordpress_types_not_posts_include = array('user', 'comment', 'category', 'tag');
+		$wordpress_objects                 = array_merge(get_post_types(), $wordpress_types_not_posts_include);
 		// this should be all the objects
-		$wordpress_objects = apply_filters( 'object_sync_for_salesforce_add_more_wordpress_types', $wordpress_objects );
+		$wordpress_objects = apply_filters('object_sync_for_salesforce_add_more_wordpress_types', $wordpress_objects);
 
 		// by default, only remove the log type we use in this plugin
-		$types_to_remove = apply_filters( 'object_sync_for_salesforce_remove_wordpress_types', array( 'wp_log' ) );
+		$types_to_remove = apply_filters('object_sync_for_salesforce_remove_wordpress_types', array('wp_log'));
 
 		// if the hook filters out any types, remove them from the visible list
-		if ( ! empty( $types_to_remove ) ) {
-			$wordpress_objects = array_diff( $wordpress_objects, $types_to_remove );
+		if ( ! empty($types_to_remove)) {
+			$wordpress_objects = array_diff($wordpress_objects, $types_to_remove);
 		}
 
-		sort( $wordpress_objects );
+		sort($wordpress_objects);
 		return $wordpress_objects;
 	}
 
@@ -100,8 +100,8 @@ 
 	 * @param string $object_type The type of object.
 	 * @return array $object_table_structure The table structure.
 	 */
-	public function get_wordpress_table_structure( $object_type ) {
-		if ( 'attachment' === $object_type ) {
+	public function get_wordpress_table_structure($object_type) {
+		if ('attachment' === $object_type) {
 			$object_table_structure = array(
 				'object_name'     => 'post',
 				'content_methods' => array(
@@ -123,7 +123,7 @@ 
 				'where'           => 'AND ' . $this->wpdb->prefix . 'posts.post_type = "' . $object_type . '"',
 				'ignore_keys'     => array(),
 			);
-		} elseif ( 'user' === $object_type ) {
+		} elseif ('user' === $object_type) {
 			// User meta fields need to use update_user_meta for create as well, otherwise it'll just get created twice because apparently when the post is created it's already there.
 			$object_table_structure = array(
 				'object_name'     => 'user',
@@ -150,7 +150,7 @@ 
 					'session_tokens',
 				),
 			);
-		} elseif ( 'post' === $object_type ) {
+		} elseif ('post' === $object_type) {
 			$object_table_structure = array(
 				'object_name'     => 'post',
 				'content_methods' => array(
@@ -172,7 +172,7 @@ 
 				'where'           => 'AND ' . $this->wpdb->prefix . 'posts.post_type = "' . $object_type . '"',
 				'ignore_keys'     => array(),
 			);
-		} elseif ( 'category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type ) {
+		} elseif ('category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type) {
 			// I am unsure why post_tag wasn't here for so long, but i figure it probably needs to be there.
 			$object_table_structure = array(
 				'object_name'     => 'term',
@@ -190,12 +190,12 @@ 
 				),
 				'content_table'   => $this->wpdb->prefix . 'terms',
 				'id_field'        => 'term_id',
-				'meta_table'      => array( $this->wpdb->prefix . 'termmeta', $this->wpdb->prefix . 'term_taxonomy' ),
+				'meta_table'      => array($this->wpdb->prefix . 'termmeta', $this->wpdb->prefix . 'term_taxonomy'),
 				'meta_join_field' => 'term_id',
 				'where'           => '',
 				'ignore_keys'     => array(),
 			);
-		} elseif ( 'comment' === $object_type ) {
+		} elseif ('comment' === $object_type) {
 			$object_table_structure = array(
 				'object_name'     => 'comment',
 				'content_methods' => array(
@@ -251,14 +251,14 @@ 
 	 * @param string $id_field The field of that object that corresponds with its ID in the database.
 	 * @return array $object_fields
 	 */
-	public function get_wordpress_object_fields( $wordpress_object, $id_field = 'ID' ) {
+	public function get_wordpress_object_fields($wordpress_object, $id_field = 'ID') {
 
-		$object_table_structure = $this->get_wordpress_table_structure( $wordpress_object );
+		$object_table_structure = $this->get_wordpress_table_structure($wordpress_object);
 
 		$meta_table      = $object_table_structure['meta_table'];
-		$meta_methods    = maybe_unserialize( $object_table_structure['meta_methods'] );
+		$meta_methods    = maybe_unserialize($object_table_structure['meta_methods']);
 		$content_table   = $object_table_structure['content_table'];
-		$content_methods = maybe_unserialize( $object_table_structure['content_methods'] );
+		$content_methods = maybe_unserialize($object_table_structure['content_methods']);
 		$id_field        = $object_table_structure['id_field'];
 		$object_name     = $object_table_structure['object_name'];
 		$where           = $object_table_structure['where'];
@@ -267,23 +267,23 @@ 
 		$object_fields = array();
 
 		// Try to find the object fields in cache before acquiring it from other source.
-		if ( true === $this->options['cache'] && 'write' !== $this->options['cache'] ) {
-			$cached = $this->cache_get( $wordpress_object, array( 'data', 'meta' ) );
-			if ( is_array( $cached ) ) {
+		if (true === $this->options['cache'] && 'write' !== $this->options['cache']) {
+			$cached = $this->cache_get($wordpress_object, array('data', 'meta'));
+			if (is_array($cached)) {
 				$object_fields['data']       = $cached;
 				$object_fields['from_cache'] = true;
 				$object_fields['cached']     = true;
 			} else {
-				$object_fields['data'] = $this->object_fields( $object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys );
-				if ( ! empty( $object_fields['data'] ) ) {
-					$object_fields['cached'] = $this->cache_set( $wordpress_object, array( 'data', 'meta' ), $object_fields['data'], $this->options['cache_expiration'] );
+				$object_fields['data'] = $this->object_fields($object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys);
+				if ( ! empty($object_fields['data'])) {
+					$object_fields['cached'] = $this->cache_set($wordpress_object, array('data', 'meta'), $object_fields['data'], $this->options['cache_expiration']);
 				} else {
 					$object_fields['cached'] = false;
 				}
 				$object_fields['from_cache'] = false;
 			}
 		} else {
-			$object_fields['data']       = $this->object_fields( $object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys );
+			$object_fields['data']       = $this->object_fields($object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys);
 			$object_fields['from_cache'] = false;
 			$object_fields['cached']     = false;
 		}
@@ -294,7 +294,7 @@ 
 		 *     $object_fields = array( 'data' => array(), 'from_cache' => bool, 'cached' => bool );
 		 * This is useful for custom objects that do not use the normal metadata table structure.
 		 */
-		$object_fields = apply_filters( 'object_sync_for_salesforce_wordpress_object_fields', $object_fields, $wordpress_object );
+		$object_fields = apply_filters('object_sync_for_salesforce_wordpress_object_fields', $object_fields, $wordpress_object);
 
 		return $object_fields['data'];
 
@@ -307,36 +307,36 @@ 
 	 * @param string $object_id The ID of the object.
 	 * @return array $wordpress_object
 	 */
-	public function get_wordpress_object_data( $object_type, $object_id ) {
+	public function get_wordpress_object_data($object_type, $object_id) {
 
 		$wordpress_object       = array();
-		$object_table_structure = $this->get_wordpress_table_structure( $object_type );
+		$object_table_structure = $this->get_wordpress_table_structure($object_type);
 
 		$meta_table      = $object_table_structure['meta_table'];
-		$meta_methods    = maybe_unserialize( $object_table_structure['meta_methods'] );
+		$meta_methods    = maybe_unserialize($object_table_structure['meta_methods']);
 		$content_table   = $object_table_structure['content_table'];
-		$content_methods = maybe_unserialize( $object_table_structure['content_methods'] );
+		$content_methods = maybe_unserialize($object_table_structure['content_methods']);
 		$id_field        = $object_table_structure['id_field'];
 		$object_name     = $object_table_structure['object_name'];
 		$where           = $object_table_structure['where'];
 		$ignore_keys     = $object_table_structure['ignore_keys'];
 
-		if ( 'user' === $object_type ) {
-			$data = get_userdata( $object_id );
-		} elseif ( 'post' === $object_type || 'attachment' === $object_type ) {
-			$data = get_post( $object_id );
-		} elseif ( 'category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type ) {
-			$data = get_term( $object_id );
-		} elseif ( 'comment' === $object_type ) {
-			$data = get_comment( $object_id );
+		if ('user' === $object_type) {
+			$data = get_userdata($object_id);
+		} elseif ('post' === $object_type || 'attachment' === $object_type) {
+			$data = get_post($object_id);
+		} elseif ('category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type) {
+			$data = get_term($object_id);
+		} elseif ('comment' === $object_type) {
+			$data = get_comment($object_id);
 		} else { // This is for custom post types.
-			$data = get_post( $object_id );
+			$data = get_post($object_id);
 		}
 
-		$fields = $this->get_wordpress_object_fields( $object_type );
-		foreach ( $fields as $key => $value ) {
+		$fields = $this->get_wordpress_object_fields($object_type);
+		foreach ($fields as $key => $value) {
 			$field                      = $value['key'];
-			$wordpress_object[ $field ] = $data->{$field};
+			$wordpress_object[$field] = $data->{$field};
 		}
 
 		/*
@@ -352,7 +352,7 @@ 
 			}
 		*/
 
-		$wordpress_object = apply_filters( 'object_sync_for_salesforce_wordpress_object_data', $wordpress_object );
+		$wordpress_object = apply_filters('object_sync_for_salesforce_wordpress_object_data', $wordpress_object);
 
 		return $wordpress_object;
 
@@ -366,16 +366,16 @@ 
 	 * @param array  $args The arguents of the API call.
 	 * @return $this->sfwp_transients->get $cachekey
 	 */
-	public function cache_get( $url, $args ) {
-		if ( is_array( $args ) ) {
+	public function cache_get($url, $args) {
+		if (is_array($args)) {
 			$args[] = $url;
-			array_multisort( $args );
+			array_multisort($args);
 		} else {
 			$args .= $url;
 		}
 
-		$cachekey = md5( wp_json_encode( $args ) );
-		return $this->sfwp_transients->get( $cachekey );
+		$cachekey = md5(wp_json_encode($args));
+		return $this->sfwp_transients->get($cachekey);
 	}
 
 	/**
@@ -388,20 +388,20 @@ 
 	 * @return Bool whether or not the value was set
 	 * @link https://wordpress.stackexchange.com/questions/174330/transient-storage-location-database-xcache-w3total-cache
 	 */
-	public function cache_set( $url, $args, $data, $cache_expiration = '' ) {
-		if ( is_array( $args ) ) {
+	public function cache_set($url, $args, $data, $cache_expiration = '') {
+		if (is_array($args)) {
 			$args[] = $url;
-			array_multisort( $args );
+			array_multisort($args);
 		} else {
 			$args .= $url;
 		}
-		$cachekey = md5( wp_json_encode( $args ) );
+		$cachekey = md5(wp_json_encode($args));
 		// Cache_expiration is how long it should be stored in the cache.
 		// If we didn't give a custom one, use the default.
-		if ( '' === $cache_expiration ) {
+		if ('' === $cache_expiration) {
 			$cache_expiration = $this->options['cache_expiration'];
 		}
-		return $this->sfwp_transients->set( $cachekey, $data, $cache_expiration );
+		return $this->sfwp_transients->set($cachekey, $data, $cache_expiration);
 	}
 
 	/**
@@ -412,8 +412,8 @@ 
 	 * @param int    $expire The default time after which to expire the cache.
 	 * @return The cache expiration saved in the database.
 	 */
-	public function cache_expiration( $option_key, $expire ) {
-		$cache_expiration = get_option( $option_key, $expire );
+	public function cache_expiration($option_key, $expire) {
+		$cache_expiration = get_option($option_key, $expire);
 		return $cache_expiration;
 	}
 
@@ -434,15 +434,15 @@ 
 	 * @param array  $ignore_keys Fields to ignore from the database.
 	 * @return array $all_fields The fields for the object.
 	 */
-	private function object_fields( $object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys ) {
+	private function object_fields($object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys) {
 		// These two queries load all the fields from the specified object unless they have been specified as ignore fields.
 		// They also load the fields that are meta_keys from the specified object's meta table.
 		// Maybe a box for a custom query, since custom fields get done in so many ways.
 		// Eventually this would be the kind of thing we could use fields api for, if it ever gets done.
-		$data_fields      = $this->wpdb->get_col( "DESC {$content_table}", 0 );
-		$data_field_types = $this->wpdb->get_col( "DESC {$content_table}", 1 ); // get the database field types
+		$data_fields      = $this->wpdb->get_col("DESC {$content_table}", 0);
+		$data_field_types = $this->wpdb->get_col("DESC {$content_table}", 1); // get the database field types
 
-		if ( is_array( $meta_table ) ) {
+		if (is_array($meta_table)) {
 			$tax_table  = $meta_table[1];
 			$meta_table = $meta_table[0];
 		}
@@ -454,39 +454,39 @@ 
 		WHERE ' . $meta_table . '.meta_key != ""
 		' . $where . '
 		';
-		$meta_fields = $this->wpdb->get_results( $select_meta );
+		$meta_fields = $this->wpdb->get_results($select_meta);
 		$all_fields  = array();
 
-		foreach ( $data_fields as $key => $value ) {
-			if ( ! in_array( $value, $ignore_keys, true ) ) {
+		foreach ($data_fields as $key => $value) {
+			if ( ! in_array($value, $ignore_keys, true)) {
 				$all_fields[] = array(
 					'key'     => $value,
 					'table'   => $content_table,
-					'methods' => serialize( $content_methods ),
-					'type'    => $data_field_types[ $key ],
+					'methods' => serialize($content_methods),
+					'type'    => $data_field_types[$key],
 				);
 			}
 		}
 
-		foreach ( $meta_fields as $key => $value ) {
-			if ( ! in_array( $value->meta_key, $ignore_keys, true ) ) {
+		foreach ($meta_fields as $key => $value) {
+			if ( ! in_array($value->meta_key, $ignore_keys, true)) {
 				$all_fields[] = array(
 					'key'     => $value->meta_key,
 					'table'   => $meta_table,
-					'methods' => serialize( $meta_methods ),
+					'methods' => serialize($meta_methods),
 				);
 			}
 		}
 
-		if ( 'term' === $object_name ) {
-			$taxonomy = $this->wpdb->get_col( "DESC {$tax_table}", 0 );
-			foreach ( $taxonomy as $key => $value ) {
-				$exists = array_search( $value, array_column( $all_fields, 'key' ), true );
-				if ( 0 !== $exists ) {
+		if ('term' === $object_name) {
+			$taxonomy = $this->wpdb->get_col("DESC {$tax_table}", 0);
+			foreach ($taxonomy as $key => $value) {
+				$exists = array_search($value, array_column($all_fields, 'key'), true);
+				if (0 !== $exists) {
 					$all_fields[] = array(
 						'key'     => $value,
 						'table'   => $tax_table,
-						'methods' => serialize( $content_methods ),
+						'methods' => serialize($content_methods),
 					);
 				}
 			}
@@ -513,28 +513,28 @@ 
 	 *
 	 * part of CRUD for WordPress objects
 	 */
-	public function object_create( $name, $params ) {
+	public function object_create($name, $params) {
 
-		$structure = $this->get_wordpress_table_structure( $name );
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
-				$result = $this->user_create( $params, $id_field );
+				$result = $this->user_create($params, $id_field);
 				break;
 			case 'post':
-				$result = $this->post_create( $params, $id_field );
+				$result = $this->post_create($params, $id_field);
 				break;
 			case 'attachment':
-				$result = $this->attachment_create( $params, $id_field );
+				$result = $this->attachment_create($params, $id_field);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$result = $this->term_create( $params, $name, $id_field );
+				$result = $this->term_create($params, $name, $id_field);
 				break;
 			case 'comment':
-				$result = $this->comment_create( $params, $id_field );
+				$result = $this->comment_create($params, $id_field);
 				break;
 			default:
 				/*
@@ -547,14 +547,14 @@ 
 				 * the one param is: array( 'name' => objecttype, 'params' => array_of_params, 'id_field' => idfield )
 				 */
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( 'object_sync_for_salesforce_create_custom_wordpress_item' ) ) {
-					$result = $this->post_create( $params, $id_field, $name );
+				if ( ! has_filter('object_sync_for_salesforce_create_custom_wordpress_item')) {
+					$result = $this->post_create($params, $id_field, $name);
 				} else {
-					$result = apply_filters( 'object_sync_for_salesforce_create_custom_wordpress_item', array(
+					$result = apply_filters('object_sync_for_salesforce_create_custom_wordpress_item', array(
 						'params'   => $params,
 						'name'     => $name,
 						'id_field' => $id_field,
-					) );
+					));
 				}
 				break;
 		} // End switch().
@@ -590,37 +590,37 @@ 
 	 *
 	 * part of CRUD for WordPress objects
 	 */
-	public function object_upsert( $name, $key, $value, $methods = array(), $params, $push_drafts = false, $check_only = false ) {
+	public function object_upsert($name, $key, $value, $methods = array(), $params, $push_drafts = false, $check_only = false) {
 
-		$structure = $this->get_wordpress_table_structure( $name );
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
 		// If key is set, remove from $params to avoid SQL errors.
-		if ( isset( $params[ $key ] ) ) {
-			unset( $params[ $key ] );
+		if (isset($params[$key])) {
+			unset($params[$key]);
 		}
 
 		// Allow developers to change both the key and value by which objects should be matched.
-		$key   = apply_filters( 'object_sync_for_salesforce_modify_upsert_key', $key );
-		$value = apply_filters( 'object_sync_for_salesforce_modify_upsert_value', $value );
+		$key   = apply_filters('object_sync_for_salesforce_modify_upsert_key', $key);
+		$value = apply_filters('object_sync_for_salesforce_modify_upsert_value', $value);
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
-				$result = $this->user_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $check_only );
+				$result = $this->user_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $check_only);
 				break;
 			case 'post':
-				$result = $this->post_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only );
+				$result = $this->post_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only);
 				break;
 			case 'attachment':
-				$result = $this->attachment_upsert( $key, $value, $methods, $params, $id_field, $check_only );
+				$result = $this->attachment_upsert($key, $value, $methods, $params, $id_field, $check_only);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$result = $this->term_upsert( $key, $value, $methods, $params, $name, $id_field, $push_drafts, $check_only );
+				$result = $this->term_upsert($key, $value, $methods, $params, $name, $id_field, $push_drafts, $check_only);
 				break;
 			case 'comment':
-				$result = $this->comment_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $check_only );
+				$result = $this->comment_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $check_only);
 				break;
 			default:
 				/*
@@ -635,10 +635,10 @@ 
 				 *     array( 'key' => key, 'value' => value, 'methods' => methods, 'params' => array_of_params, 'id_field' => idfield, 'push_drafts' => pushdrafts, 'name' => name, 'check_only' => $check_only )
 				*/
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( 'object_sync_for_salesforce_upsert_custom_wordpress_item' ) ) {
-					$result = $this->post_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only );
+				if ( ! has_filter('object_sync_for_salesforce_upsert_custom_wordpress_item')) {
+					$result = $this->post_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only);
 				} else {
-					$result = apply_filters( 'object_sync_for_salesforce_upsert_custom_wordpress_item', array(
+					$result = apply_filters('object_sync_for_salesforce_upsert_custom_wordpress_item', array(
 						'key'         => $key,
 						'value'       => $value,
 						'methods'     => $methods,
@@ -647,7 +647,7 @@ 
 						'push_drafts' => $push_drafts,
 						'name'        => $name,
 						'check_only'  => $check_only,
-					) );
+					));
 				}
 				break;
 		} // End switch().
@@ -673,29 +673,29 @@ 
 	 *   cached:
 	 *   is_redo:
 	 */
-	public function object_update( $name, $id, $params ) {
+	public function object_update($name, $id, $params) {
 
-		$structure = $this->get_wordpress_table_structure( $name );
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
 				// User id does not come through by default, but we need it to pass to wp method.
-				$result = $this->user_update( $id, $params, $id_field );
+				$result = $this->user_update($id, $params, $id_field);
 				break;
 			case 'post':
-				$result = $this->post_update( $id, $params, $id_field );
+				$result = $this->post_update($id, $params, $id_field);
 				break;
 			case 'attachment':
-				$result = $this->attachment_update( $id, $params, $id_field );
+				$result = $this->attachment_update($id, $params, $id_field);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$result = $this->term_update( $id, $params, $name, $id_field );
+				$result = $this->term_update($id, $params, $name, $id_field);
 				break;
 			case 'comment':
-				$result = $this->comment_update( $id, $params, $id_field );
+				$result = $this->comment_update($id, $params, $id_field);
 				break;
 			default:
 				/*
@@ -710,15 +710,15 @@ 
 				 *     array( 'key' => key, 'value' => value, 'name' => objecttype, 'params' => array_of_params, 'push_drafts' => pushdrafts, 'methods' => methods )
 				 */
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( 'object_sync_for_salesforce_update_custom_wordpress_item' ) ) {
-					$result = $this->post_update( $id, $params, $id_field, $name );
+				if ( ! has_filter('object_sync_for_salesforce_update_custom_wordpress_item')) {
+					$result = $this->post_update($id, $params, $id_field, $name);
 				} else {
-					$result = apply_filters( 'object_sync_for_salesforce_update_custom_wordpress_item', array(
+					$result = apply_filters('object_sync_for_salesforce_update_custom_wordpress_item', array(
 						'id'       => $id,
 						'params'   => $params,
 						'name'     => $name,
 						'id_field' => $id_field,
-					) );
+					));
 				}
 				break;
 		} // End switch().
@@ -739,27 +739,27 @@ 
 	 *
 	 * part of CRUD for WordPress objects
 	 */
-	public function object_delete( $name, $id ) {
-		$structure = $this->get_wordpress_table_structure( $name );
+	public function object_delete($name, $id) {
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
-				$success = $this->user_delete( $id );
+				$success = $this->user_delete($id);
 				break;
 			case 'post':
-				$success = $this->post_delete( $id );
+				$success = $this->post_delete($id);
 				break;
 			case 'attachment':
-				$success = $this->attachment_delete( $id );
+				$success = $this->attachment_delete($id);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$success = $this->term_delete( $id, $name );
+				$success = $this->term_delete($id, $name);
 				break;
 			case 'comment':
-				$success = $this->comment_delete( $id );
+				$success = $this->comment_delete($id);
 				break;
 			default:
 				/*
@@ -771,16 +771,16 @@ 
 				 *     array( 'id' => id, 'name' => objecttype )
 				 */
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( 'object_sync_for_salesforce_delete_custom_wordpress_item' ) ) {
-					$success = $this->post_delete( $id );
+				if ( ! has_filter('object_sync_for_salesforce_delete_custom_wordpress_item')) {
+					$success = $this->post_delete($id);
 				} else {
-					$success = apply_filters( 'object_sync_for_salesforce_delete_custom_wordpress_item', array(
+					$success = apply_filters('object_sync_for_salesforce_delete_custom_wordpress_item', array(
 						'id'   => $id,
 						'name' => $name,
-					) );
+					));
 				}
 
-				$success = $this->post_delete( $id );
+				$success = $this->post_delete($id);
 				break;
 		} // End switch().
 
@@ -805,13 +805,13 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function user_create( $params, $id_field = 'ID' ) {
+	private function user_create($params, $id_field = 'ID') {
 
 		// Allow username to be email address or username.
 		// The username could be autogenerated before this point for the sake of URLs.
 		$username      = $params['user_email']['value'];
 		$email_address = $params['user_email']['value'];
-		if ( isset( $params['user_login']['value'] ) ) { // User_login is used by username_exists.
+		if (isset($params['user_login']['value'])) { // User_login is used by username_exists.
 			$username = $params['user_login']['value'];
 		} else {
 			$params['user_login'] = array(
@@ -822,44 +822,44 @@ 
 		}
 
 		// This is a new user.
-		if ( false === username_exists( $username ) ) {
+		if (false === username_exists($username)) {
 
 			// Create the user
 			// WordPress sends a password reset link so this password doesn't get used, but it does exist in the database, which is helpful to prevent access before the user uses their password reset email.
 			$params['user_pass'] = array(
-				'value'         => wp_generate_password( 12, false ),
+				'value'         => wp_generate_password(12, false),
 				'method_modify' => 'wp_insert_user',
 				'method_read'   => 'get_user_by',
 			);
 			// Load all params with a method_modify of the object structure's content_method into $content
 			$content   = array();
-			$structure = $this->get_wordpress_table_structure( 'user' );
-			foreach ( $params as $key => $value ) {
-				if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-					$content[ $key ] = $value['value'];
-					unset( $params[ $key ] );
+			$structure = $this->get_wordpress_table_structure('user');
+			foreach ($params as $key => $value) {
+				if (in_array($value['method_modify'], $structure['content_methods'])) {
+					$content[$key] = $value['value'];
+					unset($params[$key]);
 				}
 			}
 
-			$user_id = wp_insert_user( $content );
+			$user_id = wp_insert_user($content);
 
-			if ( is_wp_error( $user_id ) ) {
+			if (is_wp_error($user_id)) {
 				$success = false;
 				$errors  = $user_id;
 			} else {
 				$success = true;
 				$errors  = array();
-				foreach ( $params as $key => $value ) {
+				foreach ($params as $key => $value) {
 					$method = $value['method_modify'];
 					// we need to provide a way for passing the values in a custom order here
-					$meta_id = $method( $user_id, $key, $value['value'] );
-					if ( false === $meta_id ) {
+					$meta_id = $method($user_id, $key, $value['value']);
+					if (false === $meta_id) {
 						$success  = false;
 						$errors[] = array(
 							'message' => sprintf(
 								// translators: %1$s is a method name.
-								esc_html__( 'Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce' ),
-								esc_html( $method )
+								esc_html__('Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce'),
+								esc_html($method)
 							),
 							'key'     => $key,
 							'value'   => $value,
@@ -868,18 +868,18 @@ 
 				}
 
 				// Developers can use this hook to set any other user data - permissions, etc.
-				do_action( 'object_sync_for_salesforce_set_more_user_data', $user_id, $params, 'create' );
+				do_action('object_sync_for_salesforce_set_more_user_data', $user_id, $params, 'create');
 
 				// Send notification of new user.
 				// todo: Figure out what permissions ought to get notifications for this and make sure it works the right way.
-				wp_new_user_notification( $user_id, null, 'admin user' );
+				wp_new_user_notification($user_id, null, 'admin user');
 
 			}
 		} else {
-			$user_id = username_exists( $username );
+			$user_id = username_exists($username);
 		} // End if().
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$success = false;
 			$errors  = $user_id;
 		} else {
@@ -916,47 +916,47 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function user_upsert( $key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $check_only = false ) {
+	private function user_upsert($key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $check_only = false) {
 
 		// If the key is user_email, we need to make it just email because that is how the WordPress method reads it.
 		$method = $methods['method_match'];
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// This should give us the user object.
-			$user = $method( str_replace( 'user_', '', $key ), $value );
-			if ( isset( $user->{$id_field} ) ) {
+			$user = $method(str_replace('user_', '', $key), $value);
+			if (isset($user->{$id_field} )) {
 				// User does exist after checking the matching value. we want its id.
 				$user_id = $user->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $user_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// User does not exist after checking the matching value. create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->user_create( $params );
+				$result = $this->user_create($params);
 				return $result;
 			} else {
 				// Check only is true but there's not a user yet.
@@ -964,7 +964,7 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the user. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
@@ -972,21 +972,21 @@ 
 
 			// Allow username to be email address or username.
 			// The username could be autogenerated before this point for the sake of URLs.
-			if ( isset( $params['user_email']['value'] ) ) {
+			if (isset($params['user_email']['value'])) {
 				$username      = $params['user_email']['value'];
 				$email_address = $params['user_email']['value'];
 			}
-			if ( isset( $params['user_login']['value'] ) ) { // user_login is used by username_exists.
+			if (isset($params['user_login']['value'])) { // user_login is used by username_exists.
 				$username = $params['user_login']['value'];
 			}
 
-			$existing_id = username_exists( $username ); // Returns an id if there is a result.
+			$existing_id = username_exists($username); // Returns an id if there is a result.
 
 			// User does not exist after more checking. we want to create it.
-			if ( false === $existing_id && false === $check_only ) {
-				$result = $this->user_create( $params );
+			if (false === $existing_id && false === $check_only) {
+				$result = $this->user_create($params);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -995,23 +995,23 @@ 
 			}
 		} // End if().
 
-		if ( isset( $user_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($user_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->user_update( $user_id, $params );
+			$result = $this->user_update($user_id, $params);
 			return $result;
 		}
 
 		// Create log entry for lack of a user id.
-		if ( isset( $this->logging ) ) {
+		if (isset($this->logging)) {
 			$logging = $this->logging;
-		} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-			$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+		} elseif (class_exists('Object_Sync_Sf_Logging')) {
+			$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 		}
 		$logging->setup(
 			// todo: can we get any more specific about this?
-			esc_html__( 'Error: Users: Tried to run user_upsert, and ended up without a user id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Users: Tried to run user_upsert, and ended up without a user id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1032,28 +1032,28 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function user_update( $user_id, $params, $id_field = 'ID' ) {
+	private function user_update($user_id, $params, $id_field = 'ID') {
 		$content              = array();
-		$content[ $id_field ] = $user_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_user' === $value['method_modify'] ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $user_id;
+		foreach ($params as $key => $value) {
+			if ('wp_update_user' === $value['method_modify']) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		$user_id = wp_update_user( $content );
+		$user_id = wp_update_user($content);
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$success = false;
 			$errors  = $user_id;
 		} else {
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $user_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($user_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'key'   => $key,
@@ -1063,7 +1063,7 @@ 
 			}
 
 			// Developers can use this hook to set any other user data - permissions, etc.
-			do_action( 'object_sync_for_salesforce_set_more_user_data', $user_id, $params, 'update' );
+			do_action('object_sync_for_salesforce_set_more_user_data', $user_id, $params, 'update');
 
 		}
 
@@ -1085,10 +1085,10 @@ 
 	 *
 	 * @return boolean true if successful
 	 */
-	private function user_delete( $id, $reassign = null ) {
+	private function user_delete($id, $reassign = null) {
 		// According to https://codex.wordpress.org/Function_Reference/wp_delete_user we have to include user.php first; otherwise it throws undefined error.
-		require_once( './wp-admin/includes/user.php' );
-		$result = wp_delete_user( $id, $reassign );
+		require_once('./wp-admin/includes/user.php');
+		$result = wp_delete_user($id, $reassign);
 		return $result;
 	}
 
@@ -1105,18 +1105,18 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function post_create( $params, $id_field = 'ID', $post_type = 'post' ) {
+	private function post_create($params, $id_field = 'ID', $post_type = 'post') {
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( $post_type );
-		foreach ( $params as $key => $value ) {
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$structure = $this->get_wordpress_table_structure($post_type);
+		foreach ($params as $key => $value) {
+			if (in_array($value['method_modify'], $structure['content_methods'])) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		if ( '' !== $post_type ) {
+		if ('' !== $post_type) {
 			$content['post_type'] = $post_type;
 		}
 
@@ -1124,31 +1124,31 @@ 
 		// I think we should allow this to happen and not make users' data decisions, so
 		// if we're receiving nothing for either of these, create a blank one so it doesn't fail
 		// here we have to use $content because $params has already been unset
-		if ( ! isset( $content['post_title'] ) ) {
+		if ( ! isset($content['post_title'])) {
 			$content['post_title'] = ' ';
 		}
-		if ( ! isset( $content['post_content'] ) ) {
+		if ( ! isset($content['post_content'])) {
 			$content['post_content'] = ' ';
 		}
 
-		$post_id = wp_insert_post( $content, true ); // return an error instead of a 0 id
+		$post_id = wp_insert_post($content, true); // return an error instead of a 0 id
 
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			$success = false;
 			$errors  = $post_id;
 		} else {
 			$success = true;
 			$errors  = array();
 			// If it's a custom post type, fix the methods.
-			if ( isset( $params['RecordTypeId']['value'] ) ) {
+			if (isset($params['RecordTypeId']['value'])) {
 				$params['RecordTypeId']['method_modify'] = 'update_post_meta';
 				$params['RecordTypeId']['method_read']   = 'get_post_meta';
 			}
-			if ( is_array( $params ) && ! empty( $params ) ) {
-				foreach ( $params as $key => $value ) {
+			if (is_array($params) && ! empty($params)) {
+				foreach ($params as $key => $value) {
 					$method  = $value['method_modify'];
-					$meta_id = $method( $post_id, $key, $value['value'] );
-					if ( false === $meta_id ) {
+					$meta_id = $method($post_id, $key, $value['value']);
+					if (false === $meta_id) {
 						$success  = false;
 						$errors[] = array(
 							'key'   => $key,
@@ -1159,11 +1159,11 @@ 
 			}
 
 			// Developers can use this hook to set any other post data.
-			do_action( 'object_sync_for_salesforce_set_more_post_data', $post_id, $params, 'create' );
+			do_action('object_sync_for_salesforce_set_more_post_data', $post_id, $params, 'create');
 
 		}
 
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			$success = false;
 			$errors  = $post_id;
 		} else {
@@ -1201,68 +1201,68 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function post_upsert( $key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $post_type = 'post', $check_only = false ) {
+	private function post_upsert($key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $post_type = 'post', $check_only = false) {
 
 		$method = $methods['method_match'];
 
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// By default, posts use get_posts as the method. args can be like this.
 			// The args don't really make sense, and are inconsistently documented.
 			// This should give us the post object.
 			$args = array();
-			if ( 'post_title' === $key ) {
+			if ('post_title' === $key) {
 				$params['post_title'] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$args['name']         = sanitize_title( $value );
+				$args['name'] = sanitize_title($value);
 			} else {
-				$args[ $key ] = $value;
+				$args[$key] = $value;
 			}
 			$args['post_type'] = $post_type;
-			$post_statuses     = array( 'publish' );
-			if ( true === $push_drafts ) {
+			$post_statuses     = array('publish');
+			if (true === $push_drafts) {
 				$post_statuses[] = 'draft';
 			}
 			$args['post_status'] = $post_statuses;
 
-			$posts = $method( $args );
+			$posts = $method($args);
 
-			if ( isset( $posts[0]->{$id_field} ) ) {
+			if (isset($posts[0]->{$id_field} )) {
 				// Post does exist after checking the matching value. We want its id.
 				$post_id = $posts[0]->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $post_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Post does not exist after checking the matching value. create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->post_create( $params, $id_field, $post_type );
+				$result = $this->post_create($params, $id_field, $post_type);
 				return $result;
 			} else {
 				// Check only is true but there's not a post yet.
@@ -1270,38 +1270,38 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the post. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
 			// If we have a title, use it to check for existing post.
-			if ( isset( $params['post_title']['value'] ) ) {
+			if (isset($params['post_title']['value'])) {
 				$title = $params['post_title']['value'];
 			}
 
 			// If we have content, use it to check for existing post.
-			if ( isset( $params['post_content']['value'] ) ) {
+			if (isset($params['post_content']['value'])) {
 				$content = $params['post_content']['value'];
 			} else {
 				$content = '';
 			}
 
 			// If we have a date, use it to check for existing post.
-			if ( isset( $params['post_date']['value'] ) ) {
+			if (isset($params['post_date']['value'])) {
 				$date = $params['post_date']['value'];
 			} else {
 				$date = '';
 			}
 
-			$existing_id = post_exists( $title, $content, $date ); // Returns an id if there is a result. Returns 0 if not.
+			$existing_id = post_exists($title, $content, $date); // Returns an id if there is a result. Returns 0 if not.
 
 			// Post does not exist after more checking. maybe we want to create it.
-			if ( 0 === $existing_id && false === $check_only ) {
-				$result = $this->post_create( $params, $id_field, $post_type );
+			if (0 === $existing_id && false === $check_only) {
+				$result = $this->post_create($params, $id_field, $post_type);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -1313,22 +1313,22 @@ 
 
 		} // End if().
 
-		if ( isset( $post_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($post_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->post_update( $post_id, $params, $id_field, $post_type );
+			$result = $this->post_update($post_id, $params, $id_field, $post_type);
 			return $result;
 		}
 		// Create log entry for lack of a post id.
-		if ( isset( $this->logging ) ) {
+		if (isset($this->logging)) {
 			$logging = $this->logging;
-		} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-			$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+		} elseif (class_exists('Object_Sync_Sf_Logging')) {
+			$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 		}
 		$logging->setup(
 			// todo: can we be more explicit here about what post upsert failed?
-			esc_html__( 'Error: Posts: Tried to run post_upsert, and ended up without a post id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Posts: Tried to run post_upsert, and ended up without a post id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1350,38 +1350,38 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function post_update( $post_id, $params, $id_field = 'ID', $post_type = '' ) {
+	private function post_update($post_id, $params, $id_field = 'ID', $post_type = '') {
 		$content              = array();
-		$content[ $id_field ] = $post_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_post' === $value['method_modify'] ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $post_id;
+		foreach ($params as $key => $value) {
+			if ('wp_update_post' === $value['method_modify']) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		if ( '' !== $post_type ) {
+		if ('' !== $post_type) {
 			$content['post_type'] = $post_type;
 		}
 
-		$post_id = wp_update_post( $content, true ); // return an error instead of a 0 id
+		$post_id = wp_update_post($content, true); // return an error instead of a 0 id
 
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			$success = false;
 			$errors  = $post_id;
 		} else {
 			$success = true;
 			$errors  = array();
 			// If it's a custom post type, fix the methods.
-			if ( isset( $params['RecordTypeId']['value'] ) ) {
+			if (isset($params['RecordTypeId']['value'])) {
 				$params['RecordTypeId']['method_modify'] = 'update_post_meta';
 				$params['RecordTypeId']['method_read']   = 'get_post_meta';
 			}
-			if ( is_array( $params ) && ! empty( $params ) ) {
-				foreach ( $params as $key => $value ) {
+			if (is_array($params) && ! empty($params)) {
+				foreach ($params as $key => $value) {
 					$method  = $value['method_modify'];
-					$meta_id = $method( $post_id, $key, $value['value'] );
-					if ( false === $meta_id ) {
+					$meta_id = $method($post_id, $key, $value['value']);
+					if (false === $meta_id) {
 						$success  = false;
 						$errors[] = array(
 							'key'   => $key,
@@ -1392,7 +1392,7 @@ 
 			}
 
 			// Developers can use this hook to set any other post data.
-			do_action( 'object_sync_for_salesforce_set_more_post_data', $post_id, $params, 'update' );
+			do_action('object_sync_for_salesforce_set_more_post_data', $post_id, $params, 'update');
 
 		}
 
@@ -1414,8 +1414,8 @@ 
 	 *
 	 * @return mixed post object if successful, false if failed
 	 */
-	private function post_delete( $id, $force_delete = false ) {
-		$result = wp_delete_post( $id, $force_delete );
+	private function post_delete($id, $force_delete = false) {
+		$result = wp_delete_post($id, $force_delete);
 		return $result;
 	}
 
@@ -1431,56 +1431,56 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function attachment_create( $params, $id_field = 'ID' ) {
+	private function attachment_create($params, $id_field = 'ID') {
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( 'attachment' );
+		$structure = $this->get_wordpress_table_structure('attachment');
 		// WP requires post_title, post_content (can be empty), post_status, and post_mime_type to create an attachment.
-		foreach ( $params as $key => $value ) {
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		foreach ($params as $key => $value) {
+			if (in_array($value['method_modify'], $structure['content_methods'])) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
 		// Developers can use this hook to pass filename and parent data for the attachment.
-		$params = apply_filters( 'object_sync_for_salesforce_set_initial_attachment_data', $params );
+		$params = apply_filters('object_sync_for_salesforce_set_initial_attachment_data', $params);
 
-		if ( isset( $params['filename']['value'] ) ) {
+		if (isset($params['filename']['value'])) {
 			$filename = $params['filename']['value'];
 		} else {
 			$filename = false;
 		}
 
-		if ( isset( $params['parent']['value'] ) ) {
+		if (isset($params['parent']['value'])) {
 			$parent = $params['parent']['value'];
 		} else {
 			$parent = 0;
 		}
 
-		$attachment_id = wp_insert_attachment( $content, $filename, $parent );
+		$attachment_id = wp_insert_attachment($content, $filename, $parent);
 
-		if ( is_wp_error( $attachment_id ) ) {
+		if (is_wp_error($attachment_id)) {
 			$success = false;
 			$errors  = $attachment_id;
 		} else {
 			$success = true;
 			$errors  = array();
 
-			if ( false !== $filename ) {
+			if (false !== $filename) {
 				// According to https://codex.wordpress.org/Function_Reference/wp_insert_attachment we need this file.
-				require_once( ABSPATH . 'wp-admin/includes/image.php' );
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
 				// Generate metadata for the attachment.
-				$attach_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-				wp_update_attachment_metadata( $attachment_id, $attach_data );
+				$attach_data = wp_generate_attachment_metadata($attachment_id, $filename);
+				wp_update_attachment_metadata($attachment_id, $attach_data);
 			}
 
-			if ( 0 !== $parent ) {
-				set_post_thumbnail( $parent_post_id, $attachment_id );
+			if (0 !== $parent) {
+				set_post_thumbnail($parent_post_id, $attachment_id);
 			}
 
 			// Developers can use this hook to set any other attachment data.
-			do_action( 'object_sync_for_salesforce_set_more_attachment_data', $attachment_id, $params, 'create' );
+			do_action('object_sync_for_salesforce_set_more_attachment_data', $attachment_id, $params, 'create');
 
 		}
 
@@ -1512,64 +1512,64 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function attachment_upsert( $key, $value, $methods = array(), $params, $id_field = 'ID', $check_only = false ) {
+	private function attachment_upsert($key, $value, $methods = array(), $params, $id_field = 'ID', $check_only = false) {
 
 		$method = $methods['method_match'];
 
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// Get_posts is more helpful here, so that is the method attachment uses for 'read'.
 			// By default, posts use get_posts as the method. args can be like this.
 			// The args don't really make sense, and are inconsistently documented.
 			// This should give us the post object.
 			$args = array();
-			if ( 'post_title' === $key ) {
+			if ('post_title' === $key) {
 				$params['post_title'] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$args['name']         = sanitize_title( $value );
+				$args['name'] = sanitize_title($value);
 			} else {
-				$args[ $key ] = $value;
+				$args[$key] = $value;
 			}
 			$args['post_type'] = 'attachment';
 
-			$posts = $method( $args );
+			$posts = $method($args);
 
-			if ( isset( $posts[0]->{$id_field} ) ) {
+			if (isset($posts[0]->{$id_field} )) {
 				// Attachment does exist after checking the matching value. we want its id.
 				$attachment_id = $posts[0]->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $attachment_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Attachment does not exist after checking the matching value. create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->attachment_create( $params );
+				$result = $this->attachment_create($params);
 				return $result;
 			} else {
 				// Check only is true but there's not an attachment yet.
@@ -1577,38 +1577,38 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the post. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
 			// If we have a title, use it to check for existing post.
-			if ( isset( $params['post_title']['value'] ) ) {
+			if (isset($params['post_title']['value'])) {
 				$title = $params['post_title']['value'];
 			}
 
 			// If we have content, use it to check for existing post.
-			if ( isset( $params['post_content']['value'] ) ) {
+			if (isset($params['post_content']['value'])) {
 				$content = $params['post_content']['value'];
 			} else {
 				$content = '';
 			}
 
 			// If we have a date, use it to check for existing post.
-			if ( isset( $params['post_date']['value'] ) ) {
+			if (isset($params['post_date']['value'])) {
 				$date = $params['post_date']['value'];
 			} else {
 				$date = '';
 			}
 
-			$existing_id = post_exists( $title, $content, $date ); // Returns an id if there is a result. Returns 0 if not.
+			$existing_id = post_exists($title, $content, $date); // Returns an id if there is a result. Returns 0 if not.
 
 			// Attachment does not exist after more checking. maybe we want to create it.
-			if ( 0 === $existing_id && false === $check_only ) {
-				$result = $this->attachment_create( $params );
+			if (0 === $existing_id && false === $check_only) {
+				$result = $this->attachment_create($params);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -1620,22 +1620,22 @@ 
 
 		} // End if().
 
-		if ( isset( $attachment_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($attachment_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->attachment_update( $attachment_id, $params );
+			$result = $this->attachment_update($attachment_id, $params);
 			return $result;
 		}
 
 		// Create log entry for lack of an attachment id.
-		if ( isset( $this->logging ) ) {
+		if (isset($this->logging)) {
 			$logging = $this->logging;
-		} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-			$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+		} elseif (class_exists('Object_Sync_Sf_Logging')) {
+			$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 		}
 		$logging->setup(
-			esc_html__( 'Error: Attachment: Tried to run attachment_upsert, and ended up without an attachment id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Attachment: Tried to run attachment_upsert, and ended up without an attachment id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1660,60 +1660,60 @@ 
 	 * it does use wp_update_attachment_metadata for the meta fields, though.
 	 * Developers should use hooks to change this, if it does not meet their needs.
 	 */
-	private function attachment_update( $attachment_id, $params, $id_field = 'ID' ) {
+	private function attachment_update($attachment_id, $params, $id_field = 'ID') {
 		$content              = array();
-		$content[ $id_field ] = $attachment_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_insert_attachment' === $value['method_modify'] ) { // Should also be insert attachment maybe.
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $attachment_id;
+		foreach ($params as $key => $value) {
+			if ('wp_insert_attachment' === $value['method_modify']) { // Should also be insert attachment maybe.
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		if ( isset( $params['filename']['value'] ) ) {
+		if (isset($params['filename']['value'])) {
 			$filename = $params['filename']['value'];
 		} else {
 			$filename = false;
 		}
 
-		if ( isset( $params['parent']['value'] ) ) {
+		if (isset($params['parent']['value'])) {
 			$parent = $params['parent']['value'];
 		} else {
 			$parent = 0;
 		}
 
-		$attachment_id = wp_insert_attachment( $content, $filename, $parent );
+		$attachment_id = wp_insert_attachment($content, $filename, $parent);
 
-		if ( is_wp_error( $attachment_id ) ) {
+		if (is_wp_error($attachment_id)) {
 			$success = false;
 			$errors  = $attachment_id;
 		} else {
 			$success = true;
 			$errors  = array();
 
-			if ( false !== $filename ) {
+			if (false !== $filename) {
 				// According to https://codex.wordpress.org/Function_Reference/wp_insert_attachment we need this file.
-				require_once( ABSPATH . 'wp-admin/includes/image.php' );
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
 				// Generate metadata for the attachment.
-				$attach_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+				$attach_data = wp_generate_attachment_metadata($attachment_id, $filename);
 			}
 
 			// Put the data from salesforce into the meta array.
 			$attach_new_data = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method                  = $value['method_modify'];
-				$attach_new_data[ $key ] = $value['value'];
+				$attach_new_data[$key] = $value['value'];
 			}
 
-			if ( isset( $attach_data ) ) {
-				$attach_data = array_merge( $attach_data, $attach_new_data );
+			if (isset($attach_data)) {
+				$attach_data = array_merge($attach_data, $attach_new_data);
 			} else {
 				$attach_data = $attach_new_data;
 			}
 
-			$meta_updated = wp_update_attachment_metadata( $attachment_id, $attach_data );
+			$meta_updated = wp_update_attachment_metadata($attachment_id, $attach_data);
 
-			if ( false === $meta_updated ) {
+			if (false === $meta_updated) {
 				$success  = false;
 				$errors[] = array(
 					'key'   => $key,
@@ -1721,12 +1721,12 @@ 
 				);
 			}
 
-			if ( 0 !== $parent ) {
-				set_post_thumbnail( $parent_post_id, $attachment_id );
+			if (0 !== $parent) {
+				set_post_thumbnail($parent_post_id, $attachment_id);
 			}
 
 			// Developers can use this hook to set any other attachment data.
-			do_action( 'object_sync_for_salesforce_set_more_attachment_data', $attachment_id, $params, 'update' );
+			do_action('object_sync_for_salesforce_set_more_attachment_data', $attachment_id, $params, 'update');
 
 		} // End if().
 
@@ -1749,8 +1749,8 @@ 
 	 * @return mixed
 	 *   attachment object if successful, false if failed
 	 */
-	private function attachment_delete( $id, $force_delete = false ) {
-		$result = wp_delete_attachment( $id, $force_delete );
+	private function attachment_delete($id, $force_delete = false) {
+		$result = wp_delete_attachment($id, $force_delete);
 		return $result;
 	}
 
@@ -1767,45 +1767,45 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function term_create( $params, $taxonomy, $id_field = 'ID' ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_create($params, $taxonomy, $id_field = 'ID') {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( $taxonomy );
+		$structure = $this->get_wordpress_table_structure($taxonomy);
 		$args      = array();
-		foreach ( $params as $key => $value ) {
-			if ( 'name' === $key ) {
+		foreach ($params as $key => $value) {
+			if ('name' === $key) {
 				$name = $value['value'];
-				unset( $params[ $key ] );
+				unset($params[$key]);
 			}
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) && 'name' !== $key ) {
-				$args[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+			if (in_array($value['method_modify'], $structure['content_methods']) && 'name' !== $key) {
+				$args[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
-		if ( isset( $name ) ) {
-			$term = wp_insert_term( $name, $taxonomy, $args );
+		if (isset($name)) {
+			$term = wp_insert_term($name, $taxonomy, $args);
 		}
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
-			$term_id = $term[ "$id_field" ];
+			$term_id = $term["$id_field"];
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $term_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($term_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// translators: %1$s is a method name.
-							esc_html__( 'Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -1814,11 +1814,11 @@ 
 			}
 
 			// Developers can use this hook to set any other term data.
-			do_action( 'object_sync_for_salesforce_set_more_term_data', $term_id, $params, 'create' );
+			do_action('object_sync_for_salesforce_set_more_term_data', $term_id, $params, 'create');
 
 		}
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
@@ -1856,48 +1856,48 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function term_upsert( $key, $value, $methods = array(), $params, $taxonomy, $id_field = 'ID', $push_drafts = false, $check_only = false ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_upsert($key, $value, $methods = array(), $params, $taxonomy, $id_field = 'ID', $push_drafts = false, $check_only = false) {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
 		$method = $methods['method_match'];
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// This should give us the term object.
-			$term = $method( $key, $value, $taxonomy ); // We need to put the taxonomy in there probably.
-			if ( isset( $term->{$id_field} ) ) {
+			$term = $method($key, $value, $taxonomy); // We need to put the taxonomy in there probably.
+			if (isset($term->{$id_field} )) {
 				// Term does exist after checking the matching value. we want its id.
 				$term_id = $term->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $term_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Term does not exist after checking the matching value. Create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->term_create( $params, $taxonomy, $id_field );
+				$result = $this->term_create($params, $taxonomy, $id_field);
 				return $result;
 			} else {
 				// Check only is true but there's not a term yet.
@@ -1905,17 +1905,17 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the term. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
-			if ( isset( $params['name']['value'] ) ) {
+			if (isset($params['name']['value'])) {
 				$term = $params['name']['value'];
 			}
 
-			if ( isset( $params['parent']['value'] ) ) {
+			if (isset($params['parent']['value'])) {
 				$parent = $params['parent']['value'];
 			} else {
 				$parent = 0;
@@ -1923,17 +1923,17 @@ 
 
 			// Returns an id if there is a result. Returns null if it does not exist.
 			// wpcom_vip_term_exists is cached, and therefore preferred.
-			if ( function_exists( 'wpcom_vip_term_exists' ) ) {
-				$existing_id = wpcom_vip_term_exists( $term, $taxonomy, $parent );
+			if (function_exists('wpcom_vip_term_exists')) {
+				$existing_id = wpcom_vip_term_exists($term, $taxonomy, $parent);
 			} else {
-				$existing_id = term_exists( $term, $taxonomy, $parent );
+				$existing_id = term_exists($term, $taxonomy, $parent);
 			}
 
 			// Term does not exist after more checking. maybe we want to create it.
-			if ( null === $existing_id && false === $check_only ) {
-				$result = $this->term_create( $params, $taxonomy, $id_field );
+			if (null === $existing_id && false === $check_only) {
+				$result = $this->term_create($params, $taxonomy, $id_field);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -1942,21 +1942,21 @@ 
 			}
 		} // End if().
 
-		if ( isset( $term_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($term_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->term_update( $term_id, $params, $taxonomy, $id_field );
+			$result = $this->term_update($term_id, $params, $taxonomy, $id_field);
 			return $result;
 		}
 		// Create log entry for lack of a term id.
-		if ( isset( $this->logging ) ) {
+		if (isset($this->logging)) {
 			$logging = $this->logging;
-		} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-			$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+		} elseif (class_exists('Object_Sync_Sf_Logging')) {
+			$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 		}
 		$logging->setup(
-			esc_html__( 'Error: Terms: Tried to run term_upsert, and ended up without a term id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Terms: Tried to run term_upsert, and ended up without a term id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1978,36 +1978,36 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function term_update( $term_id, $params, $taxonomy, $id_field = 'ID' ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_update($term_id, $params, $taxonomy, $id_field = 'ID') {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
 		$args = array();
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_term' === $value['method_modify'] ) {
-				$args[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		foreach ($params as $key => $value) {
+			if ('wp_update_term' === $value['method_modify']) {
+				$args[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
-		$term = wp_update_term( $term_id, $taxonomy, $args );
+		$term = wp_update_term($term_id, $taxonomy, $args);
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
-			$term_id = $term[ "$id_field" ];
+			$term_id = $term["$id_field"];
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $term_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($term_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// translators: %1$s is a method name.
-							esc_html__( 'Tried to update meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to update meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -2016,11 +2016,11 @@ 
 			}
 
 			// Developers can use this hook to set any other term data.
-			do_action( 'object_sync_for_salesforce_set_more_term_data', $term_id, $params, 'update' );
+			do_action('object_sync_for_salesforce_set_more_term_data', $term_id, $params, 'update');
 
 		}
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
@@ -2048,11 +2048,11 @@ 
 	 *
 	 * @return bool True if successful, false if failed.
 	 */
-	private function term_delete( $term_id, $taxonomy ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_delete($term_id, $taxonomy) {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
-		$result = wp_delete_term( $term_id, $taxonomy );
+		$result = wp_delete_term($term_id, $taxonomy);
 		return $result;
 	}
 
@@ -2068,52 +2068,52 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function comment_create( $params, $id_field = 'comment_ID' ) {
+	private function comment_create($params, $id_field = 'comment_ID') {
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( 'comment' );
-		foreach ( $params as $key => $value ) {
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$structure = $this->get_wordpress_table_structure('comment');
+		foreach ($params as $key => $value) {
+			if (in_array($value['method_modify'], $structure['content_methods'])) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
 		// Fields that are required for comments, even if they are empty values.
-		if ( ! isset( $content['comment_author'] ) ) {
+		if ( ! isset($content['comment_author'])) {
 			$content['comment_author'] = '';
 		}
-		if ( ! isset( $content['comment_author_IP'] ) ) {
+		if ( ! isset($content['comment_author_IP'])) {
 			$content['comment_author_IP'] = '';
 		}
-		if ( ! isset( $content['comment_author_email'] ) ) {
+		if ( ! isset($content['comment_author_email'])) {
 			$content['comment_author_email'] = '';
 		}
-		if ( ! isset( $content['comment_author_url'] ) ) {
+		if ( ! isset($content['comment_author_url'])) {
 			$content['comment_author_url'] = '';
 		}
-		if ( ! isset( $content['comment_type'] ) ) {
+		if ( ! isset($content['comment_type'])) {
 			$content['comment_type'] = '';
 		}
 
-		$comment_id = wp_new_comment( $content );
+		$comment_id = wp_new_comment($content);
 
-		if ( is_wp_error( $comment_id ) ) {
+		if (is_wp_error($comment_id)) {
 			$success = false;
 			$errors  = $comment_id;
 		} else {
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $comment_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($comment_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// translators: %1$s is a method name.
-							esc_html__( 'Tried to add meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to add meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -2122,11 +2122,11 @@ 
 			}
 
 			// Developers can use this hook to set any other comment data.
-			do_action( 'object_sync_for_salesforce_set_more_comment_data', $comment_id, $params, 'create' );
+			do_action('object_sync_for_salesforce_set_more_comment_data', $comment_id, $params, 'create');
 
 		}
 
-		if ( is_wp_error( $comment_id ) ) {
+		if (is_wp_error($comment_id)) {
 			$success = false;
 			$errors  = $comment_id;
 		} else {
@@ -2163,79 +2163,79 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function comment_upsert( $key, $value, $methods, $params, $id_field = 'comment_ID', $push_drafts = false, $check_only = false ) {
+	private function comment_upsert($key, $value, $methods, $params, $id_field = 'comment_ID', $push_drafts = false, $check_only = false) {
 		$method = $methods['method_match'];
-		if ( 'get_comment' === $method ) {
+		if ('get_comment' === $method) {
 			$method = 'get_comments';
 		}
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// This should give us the comment object.
 			$match = array();
-			if ( 'comment_author' === $key ) {
-				$match['author__in'] = array( $value );
+			if ('comment_author' === $key) {
+				$match['author__in'] = array($value);
 			} else {
-				$key           = str_replace( 'comment_', '', $key );
-				$match[ $key ] = $value;
+				$key           = str_replace('comment_', '', $key);
+				$match[$key] = $value;
 			}
-			$comments = $method( $match );
+			$comments = $method($match);
 
-			if ( 1 === count( $comments ) ) {
+			if (1 === count($comments)) {
 				$comment = $comments[0];
 				// Comment does exist after checking the matching value. we want its id.
 				$comment_id = $comment->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $comment_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( count( $comments ) > 1 ) {
+			} elseif (count($comments) > 1) {
 				$status = 'error';
 				// Create log entry for multiple matches.
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 				$logging->setup(
 					sprintf(
 						// translators: %1$s is a number. %2$s is a key. %3$s is the value of that key. %4$s is a var_export'd array of comments.
-						esc_html__( 'Error: Comments: there are %1$s comment matches for the Salesforce key %2$s with the value of %3$s. Here they are: %4$s', 'object-sync-for-salesforce' ),
-						absint( count( $comments ) ),
-						esc_html( $key ),
-						esc_html( $value ),
-						esc_html( var_export( $comments ) ) // Debugging code in production because having useful error messages is good.
+						esc_html__('Error: Comments: there are %1$s comment matches for the Salesforce key %2$s with the value of %3$s. Here they are: %4$s', 'object-sync-for-salesforce'),
+						absint(count($comments)),
+						esc_html($key),
+						esc_html($value),
+						esc_html(var_export($comments)) // Debugging code in production because having useful error messages is good.
 					),
 					'',
 					0,
 					0,
 					$status
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Comment does not exist after checking the matching value. Create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->comment_create( $params, $id_field );
+				$result = $this->comment_create($params, $id_field);
 				return $result;
 			} else {
 				// Check only is true but there's not a comment yet.
@@ -2243,33 +2243,33 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the comment. We can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
-			if ( isset( $params['comment_author']['value'] ) ) {
+			if (isset($params['comment_author']['value'])) {
 				$comment_author = $params['comment_author']['value'];
 			}
 
-			if ( isset( $params['comment_date']['value'] ) ) {
+			if (isset($params['comment_date']['value'])) {
 				$comment_date = $params['comment_date']['value'];
 			}
 
-			if ( isset( $params['timezone']['value'] ) ) {
+			if (isset($params['timezone']['value'])) {
 				$timezone = $params['timezone']['value'];
 			} else {
 				$timezone = 'blog';
 			}
 
-			$existing_id = comment_exists( $comment_author, $comment_date, $timezone ); // Returns an id if there is a result. Uses $wpdb->get_var, so it returns null if there is no value
+			$existing_id = comment_exists($comment_author, $comment_date, $timezone); // Returns an id if there is a result. Uses $wpdb->get_var, so it returns null if there is no value
 
 			// Comment does not exist after more checking. We want to create it.
-			if ( null === $existing_id && false === $check_only ) {
-				$result = $this->comment_create( $params, $id_field );
+			if (null === $existing_id && false === $check_only) {
+				$result = $this->comment_create($params, $id_field);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -2278,22 +2278,22 @@ 
 			}
 		} // End if() that sets up the parameters in the $params array.
 
-		if ( isset( $comment_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($comment_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->comment_update( $comment_id, $params, $id_field );
+			$result = $this->comment_update($comment_id, $params, $id_field);
 			return $result;
 		}
 
 		// Create log entry for lack of a comment id.
-		if ( isset( $this->logging ) ) {
+		if (isset($this->logging)) {
 			$logging = $this->logging;
-		} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-			$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+		} elseif (class_exists('Object_Sync_Sf_Logging')) {
+			$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 		}
 		$logging->setup(
-			esc_html__( 'Error: Comments: Tried to run comment_upsert, and ended up without a comment id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Comments: Tried to run comment_upsert, and ended up without a comment id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -2314,34 +2314,34 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function comment_update( $comment_id, $params, $id_field = 'comment_ID' ) {
+	private function comment_update($comment_id, $params, $id_field = 'comment_ID') {
 		$content              = array();
-		$content[ $id_field ] = $comment_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_comment' === $value['method_modify'] ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $comment_id;
+		foreach ($params as $key => $value) {
+			if ('wp_update_comment' === $value['method_modify']) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		$updated = wp_update_comment( $content );
+		$updated = wp_update_comment($content);
 
-		if ( 0 === $updated ) {
+		if (0 === $updated) {
 			$success = false;
 			$errors  = $updated;
 		} else {
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $comment_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($comment_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// Translators: %1$s is a method name.
-							esc_html__( 'Tried to update meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to update meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -2350,11 +2350,11 @@ 
 			}
 
 			// Developers can use this hook to set any other comment data.
-			do_action( 'object_sync_for_salesforce_set_more_comment_data', $comment_id, $params, 'update' );
+			do_action('object_sync_for_salesforce_set_more_comment_data', $comment_id, $params, 'update');
 
 		}
 
-		if ( is_wp_error( $updated ) ) {
+		if (is_wp_error($updated)) {
 			$success = false;
 			$errors  = $updated;
 		} else {
@@ -2382,8 +2382,8 @@ 
 	 *
 	 * @return boolean true if successful, false if failed.
 	 */
-	private function comment_delete( $id, $force_delete = false ) {
-		$result = wp_delete_comment( $id, $force_delete );
+	private function comment_delete($id, $force_delete = false) {
+		$result = wp_delete_comment($id, $force_delete);
 		return $result;
 	}
 
@@ -2407,9 +2407,9 @@ 
 	 *
 	 * @param string $name The name of the field that lists all cache keys.
 	 */
-	public function __construct( $name ) {
+	public function __construct($name) {
 		$this->name         = $name;
-		$this->cache_prefix = esc_sql( 'sfwp_' );
+		$this->cache_prefix = esc_sql('sfwp_');
 	}
 
 	/**
@@ -2418,7 +2418,7 @@ 
 	 * @return mixed value of transient. False of empty, otherwise array.
 	 */
 	public function all_keys() {
-		return get_transient( $this->name );
+		return get_transient($this->name);
 	}
 
 	/**
@@ -2429,16 +2429,16 @@ 
 	 * @param int $cache_expiration. How long the plugin key cache, and this individual item cache, should last before expiring.
 	 * @return mixed value of transient. False of empty, otherwise array.
 	 */
-	public function set( $cachekey, $value, $cache_expiration = 0 ) {
+	public function set($cachekey, $value, $cache_expiration = 0) {
 
 		$prefix   = $this->cache_prefix;
 		$cachekey = $prefix . $cachekey;
 
 		$keys   = $this->all_keys();
 		$keys[] = $cachekey;
-		set_transient( $this->name, $keys, $cache_expiration );
+		set_transient($this->name, $keys, $cache_expiration);
 
-		return set_transient( $cachekey, $value, $cache_expiration );
+		return set_transient($cachekey, $value, $cache_expiration);
 	}
 
 	/**
@@ -2447,10 +2447,10 @@ 
 	 * @param string $cachekey the key for this cache item
 	 * @return mixed value of transient. False of empty, otherwise array.
 	 */
-	public function get( $cachekey ) {
+	public function get($cachekey) {
 		$prefix   = $this->cache_prefix;
 		$cachekey = $prefix . $cachekey;
-		return get_transient( $cachekey );
+		return get_transient($cachekey);
 	}
 
 	/**
@@ -2459,10 +2459,10 @@ 
 	 * @param string $cachekey the key for this cache item
 	 * @return bool True if successful, false otherwise.
 	 */
-	public function delete( $cachekey ) {
+	public function delete($cachekey) {
 		$prefix   = $this->cache_prefix;
 		$cachekey = $prefix . $cachekey;
-		return delete_transient( $cachekey );
+		return delete_transient($cachekey);
 	}
 
 	/**
@@ -2473,10 +2473,10 @@ 
 	public function flush() {
 		$keys   = $this->all_keys();
 		$result = true;
-		foreach ( $keys as $key ) {
-			$result = delete_transient( $key );
+		foreach ($keys as $key) {
+			$result = delete_transient($key);
 		}
-		$result = delete_transient( $this->name );
+		$result = delete_transient($this->name);
 		return $result;
 	}
 

object-sync-for-salesforce.php

Indentation +97 added lines, -97 removed lines

@@ -16,75 +16,75 @@ 
 class Object_Sync_Salesforce {
 
 	/**
-	* @var object
-	* Global object of `$wpdb`, the WordPress database
-	*/
+	 * @var object
+	 * Global object of `$wpdb`, the WordPress database
+	 */
 	private $wpdb;
 
 	/**
-	* @var array
-	* Login credentials for the Salesforce API; comes from wp-config or from the plugin settings
-	*/
+	 * @var array
+	 * Login credentials for the Salesforce API; comes from wp-config or from the plugin settings
+	 */
 	private $login_credentials;
 
 	/**
-	* @var string
-	* The plugin's slug so we can include it when necessary
-	*/
+	 * @var string
+	 * The plugin's slug so we can include it when necessary
+	 */
 	private $slug;
 
 	/**
-	* @var array
-	* Array of what classes in the plugin can be scheduled to occur with `wp_cron` events
-	*/
+	 * @var array
+	 * Array of what classes in the plugin can be scheduled to occur with `wp_cron` events
+	 */
 	public $schedulable_classes;
 
 	/**
-	* @var string
-	* Current version of the plugin
-	*/
+	 * @var string
+	 * Current version of the plugin
+	 */
 	private $version;
 
 	/**
-	* @var object
-	*/
+	 * @var object
+	 */
 	private $activated;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Logging class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Logging class
+	 */
 	private $logging;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Mapping class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Mapping class
+	 */
 	private $mappings;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_WordPress class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_WordPress class
+	 */
 	private $wordpress;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce class.
-	* This contains the Salesforce API methods
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce class.
+	 * This contains the Salesforce API methods
+	 */
 	public $salesforce;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce_Push class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce_Push class
+	 */
 	private $push;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce_Pull class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce_Pull class
+	 */
 	private $pull;
 
 	/**
@@ -95,13 +95,13 @@ 
 	static $instance = null;
 
 	/**
-	* Load the static $instance property that holds the instance of the class.
-	* This instance makes the class reusable by other plugins
-	*
-	* @return object
-	*   The sfapi object if it is authenticated (empty, otherwise)
-	*
-	*/
+	 * Load the static $instance property that holds the instance of the class.
+	 * This instance makes the class reusable by other plugins
+	 *
+	 * @return object
+	 *   The sfapi object if it is authenticated (empty, otherwise)
+	 *
+	 */
 	static public function get_instance() {
 		if ( null === self::$instance ) {
 			self::$instance = new Object_Sync_Salesforce();
@@ -222,17 +222,17 @@ 
 	}
 
 	/**
-	* Private helper to load methods for manipulating core WordPress data across the plugin
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param string $slug
-	* @param object $mappings
-	* @param object $logging
-	*
-	* @return object
-	*   Instance of Object_Sync_Sf_WordPress
-	*/
+	 * Private helper to load methods for manipulating core WordPress data across the plugin
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param string $slug
+	 * @param object $mappings
+	 * @param object $logging
+	 *
+	 * @return object
+	 *   Instance of Object_Sync_Sf_WordPress
+	 */
 	private function wordpress( $wpdb, $version, $slug, $mappings, $logging ) {
 		require_once plugin_dir_path( __FILE__ ) . 'classes/wordpress.php';
 		$wordpress = new Object_Sync_Sf_WordPress( $wpdb, $version, $slug, $mappings, $logging );
@@ -240,13 +240,13 @@ 
 	}
 
 	/**
-	* Public helper to load the Salesforce API and see if it is authenticated.
-	* This is public so other plugins can access the same SF API instance
-	*
-	* @return array
-	*   Whether Salesforce is authenticated (boolean)
-	*   The sfapi object if it is authenticated (empty, otherwise)
-	*/
+	 * Public helper to load the Salesforce API and see if it is authenticated.
+	 * This is public so other plugins can access the same SF API instance
+	 *
+	 * @return array
+	 *   Whether Salesforce is authenticated (boolean)
+	 *   The sfapi object if it is authenticated (empty, otherwise)
+	 */
 	public function salesforce_get_api() {
 		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce.php' );
 		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_query.php' ); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
@@ -352,24 +352,24 @@ 
 	}
 
 	/**
-	* Load the admin class.
-	* This also creates admin menu, unless the plugin that calls this library has indicated that it has its own menu
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $push
-	* @param object $pull
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @return object $admin
-	*   Instance of Object_Sync_Sf_Admin
-	*
-	*/
+	 * Load the admin class.
+	 * This also creates admin menu, unless the plugin that calls this library has indicated that it has its own menu
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $push
+	 * @param object $pull
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @return object $admin
+	 *   Instance of Object_Sync_Sf_Admin
+	 *
+	 */
 	private function load_admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes ) {
 		require_once( plugin_dir_path( __FILE__ ) . 'classes/admin.php' );
 		$admin = new Object_Sync_Sf_Admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes );
@@ -381,13 +381,13 @@ 
 	}
 
 	/**
-	* Display a Settings link on the main Plugins page
-	*
-	* @param array $links
-	* @param string $file
-	* @return array $links
-	*   These are the links that go with this plugin's entry
-	*/
+	 * Display a Settings link on the main Plugins page
+	 *
+	 * @param array $links
+	 * @param string $file
+	 * @return array $links
+	 *   These are the links that go with this plugin's entry
+	 */
 	public function plugin_action_links( $links, $file ) {
 		if ( plugin_basename( __FILE__ ) === $file ) {
 			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __( 'Settings', 'object-sync-for-salesforce' ) . '</a>';
@@ -399,10 +399,10 @@ 
 
 
 	/**
-	* Admin styles. Load the CSS and JavaScript for the plugin's settings
-	*
-	* @return void
-	*/
+	 * Admin styles. Load the CSS and JavaScript for the plugin's settings
+	 *
+	 * @return void
+	 */
 	public function admin_scripts_and_styles() {
 		wp_enqueue_script( $this->slug . '-admin', plugins_url( 'assets/js/object-sync-for-salesforce-admin.min.js', __FILE__ ), array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'assets/js/object-sync-for-salesforce-admin.js' ), true );
 		wp_enqueue_style( $this->slug . '-admin', plugins_url( 'assets/css/object-sync-for-salesforce-admin.min.css', __FILE__ ), array(), filemtime( plugin_dir_path( __FILE__ ) . 'assets/css/object-sync-for-salesforce-admin.css' ), 'all' );
@@ -418,13 +418,13 @@ 
 	}
 
 	/**
-	* Get the pre-login Salesforce credentials.
-	* These depend on the plugin's settings or constants defined in wp-config.php.
-	*
-	* @return array $login_credentials
-	*   Includes all settings necessary to log into the Salesforce API.
-	*   Replaces settings options with wp-config.php values if they exist.
-	*/
+	 * Get the pre-login Salesforce credentials.
+	 * These depend on the plugin's settings or constants defined in wp-config.php.
+	 *
+	 * @return array $login_credentials
+	 *   Includes all settings necessary to log into the Salesforce API.
+	 *   Replaces settings options with wp-config.php values if they exist.
+	 */
 	private function get_login_credentials() {
 
 		$consumer_key       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option( 'object_sync_for_salesforce_consumer_key', '' );

Spacing +59 added lines, -59 removed lines

@@ -103,7 +103,7 @@ 
 	*
 	*/
 	static public function get_instance() {
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new Object_Sync_Salesforce();
 		}
 		return self::$instance;
@@ -142,7 +142,7 @@ 
 		);
 
 		// users can modify the list of schedulable classes
-		$this->schedulable_classes = apply_filters( 'object_sync_for_salesforce_modify_schedulable_classes', $this->schedulable_classes );
+		$this->schedulable_classes = apply_filters('object_sync_for_salesforce_modify_schedulable_classes', $this->schedulable_classes);
 
 		/*
 		 * example to modify the array of classes by adding one and removing one
@@ -167,21 +167,21 @@ 
 		 * }
 		*/
 
-		$this->activated = $this->activate( $this->wpdb, $this->version, $this->slug );
-		$this->deactivate( $this->wpdb, $this->version, $this->slug, $this->schedulable_classes );
+		$this->activated = $this->activate($this->wpdb, $this->version, $this->slug);
+		$this->deactivate($this->wpdb, $this->version, $this->slug, $this->schedulable_classes);
 
-		$this->logging = $this->logging( $this->wpdb, $this->version );
+		$this->logging = $this->logging($this->wpdb, $this->version);
 
-		$this->mappings = $this->mappings( $this->wpdb, $this->version, $this->slug, $this->logging );
+		$this->mappings = $this->mappings($this->wpdb, $this->version, $this->slug, $this->logging);
 
-		$this->wordpress  = $this->wordpress( $this->wpdb, $this->version, $this->slug, $this->mappings, $this->logging );
+		$this->wordpress  = $this->wordpress($this->wpdb, $this->version, $this->slug, $this->mappings, $this->logging);
 		$this->salesforce = $this->salesforce_get_api();
 
-		$this->push = $this->push( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes );
+		$this->push = $this->push($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes);
 
-		$this->pull = $this->pull( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes );
+		$this->pull = $this->pull($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes);
 
-		$this->load_admin( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->push, $this->pull, $this->logging, $this->schedulable_classes );
+		$this->load_admin($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->push, $this->pull, $this->logging, $this->schedulable_classes);
 
 	}
 
@@ -195,12 +195,12 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Logging
 	 */
-	private function logging( $wpdb, $version ) {
-		if ( ! class_exists( 'WP_Logging' ) && file_exists( plugin_dir_path( __FILE__ ) . 'vendor/autoload.php' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
-			require_once plugin_dir_path( __FILE__ ) . 'classes/logging.php';
+	private function logging($wpdb, $version) {
+		if ( ! class_exists('WP_Logging') && file_exists(plugin_dir_path(__FILE__) . 'vendor/autoload.php')) {
+			require_once plugin_dir_path(__FILE__) . 'vendor/autoload.php';
+			require_once plugin_dir_path(__FILE__) . 'classes/logging.php';
 		}
-		$logging = new Object_Sync_Sf_Logging( $wpdb, $version );
+		$logging = new Object_Sync_Sf_Logging($wpdb, $version);
 		return $logging;
 	}
 
@@ -215,9 +215,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Mapping
 	 */
-	private function mappings( $wpdb, $version, $slug, $logging ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_mapping.php' );
-		$mappings = new Object_Sync_Sf_Mapping( $wpdb, $version, $slug, $logging );
+	private function mappings($wpdb, $version, $slug, $logging) {
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce_mapping.php');
+		$mappings = new Object_Sync_Sf_Mapping($wpdb, $version, $slug, $logging);
 		return $mappings;
 	}
 
@@ -233,9 +233,9 @@ 
 	* @return object
 	*   Instance of Object_Sync_Sf_WordPress
 	*/
-	private function wordpress( $wpdb, $version, $slug, $mappings, $logging ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/wordpress.php';
-		$wordpress = new Object_Sync_Sf_WordPress( $wpdb, $version, $slug, $mappings, $logging );
+	private function wordpress($wpdb, $version, $slug, $mappings, $logging) {
+		require_once plugin_dir_path(__FILE__) . 'classes/wordpress.php';
+		$wordpress = new Object_Sync_Sf_WordPress($wpdb, $version, $slug, $mappings, $logging);
 		return $wordpress;
 	}
 
@@ -248,8 +248,8 @@ 
 	*   The sfapi object if it is authenticated (empty, otherwise)
 	*/
 	public function salesforce_get_api() {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce.php' );
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_query.php' ); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce.php');
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce_query.php'); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
 		$consumer_key        = $this->login_credentials['consumer_key'];
 		$consumer_secret     = $this->login_credentials['consumer_secret'];
 		$login_url           = $this->login_credentials['login_url'];
@@ -263,9 +263,9 @@ 
 		$schedulable_classes = $this->schedulable_classes;
 		$is_authorized       = false;
 		$sfapi               = '';
-		if ( $consumer_key && $consumer_secret ) {
-			$sfapi = new Object_Sync_Sf_Salesforce( $consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes );
-			if ( $sfapi->is_authorized() === true ) {
+		if ($consumer_key && $consumer_secret) {
+			$sfapi = new Object_Sync_Sf_Salesforce($consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes);
+			if ($sfapi->is_authorized() === true) {
 				$is_authorized = true;
 			}
 		}
@@ -285,9 +285,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Activate
 	 */
-	private function activate( $wpdb, $version, $slug ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/activate.php';
-		$activate = new Object_Sync_Sf_Activate( $wpdb, $version, $slug );
+	private function activate($wpdb, $version, $slug) {
+		require_once plugin_dir_path(__FILE__) . 'classes/activate.php';
+		$activate = new Object_Sync_Sf_Activate($wpdb, $version, $slug);
 		return $activate;
 	}
 
@@ -302,9 +302,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Deactivate
 	 */
-	private function deactivate( $wpdb, $version, $slug, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/deactivate.php';
-		$deactivate = new Object_Sync_Sf_Deactivate( $wpdb, $version, $slug, $schedulable_classes );
+	private function deactivate($wpdb, $version, $slug, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/deactivate.php';
+		$deactivate = new Object_Sync_Sf_Deactivate($wpdb, $version, $slug, $schedulable_classes);
 	}
 
 
@@ -324,9 +324,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Push
 	 */
-	private function push( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/salesforce_push.php';
-		$push = new Object_Sync_Sf_Salesforce_Push( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes );
+	private function push($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/salesforce_push.php';
+		$push = new Object_Sync_Sf_Salesforce_Push($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes);
 		return $push;
 	}
 
@@ -345,9 +345,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Pull
 	 */
-	private function pull( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/salesforce_pull.php';
-		$pull = new Object_Sync_Sf_Salesforce_Pull( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes );
+	private function pull($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/salesforce_pull.php';
+		$pull = new Object_Sync_Sf_Salesforce_Pull($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes);
 		return $pull;
 	}
 
@@ -370,13 +370,13 @@ 
 	*   Instance of Object_Sync_Sf_Admin
 	*
 	*/
-	private function load_admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/admin.php' );
-		$admin = new Object_Sync_Sf_Admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes );
-		add_action( 'admin_menu', array( $admin, 'create_admin_menu' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts_and_styles' ) );
-		add_action( 'plugins_loaded', array( $this, 'textdomain' ) );
-		add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 5 );
+	private function load_admin($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes) {
+		require_once(plugin_dir_path(__FILE__) . 'classes/admin.php');
+		$admin = new Object_Sync_Sf_Admin($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes);
+		add_action('admin_menu', array($admin, 'create_admin_menu'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts_and_styles'));
+		add_action('plugins_loaded', array($this, 'textdomain'));
+		add_filter('plugin_action_links', array($this, 'plugin_action_links'), 10, 5);
 		return $admin;
 	}
 
@@ -388,11 +388,11 @@ 
 	* @return array $links
 	*   These are the links that go with this plugin's entry
 	*/
-	public function plugin_action_links( $links, $file ) {
-		if ( plugin_basename( __FILE__ ) === $file ) {
-			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __( 'Settings', 'object-sync-for-salesforce' ) . '</a>';
+	public function plugin_action_links($links, $file) {
+		if (plugin_basename(__FILE__) === $file) {
+			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __('Settings', 'object-sync-for-salesforce') . '</a>';
 			// make the 'Settings' link appear first
-			array_unshift( $links, $settings );
+			array_unshift($links, $settings);
 		}
 		return $links;
 	}
@@ -404,8 +404,8 @@ 
 	* @return void
 	*/
 	public function admin_scripts_and_styles() {
-		wp_enqueue_script( $this->slug . '-admin', plugins_url( 'assets/js/object-sync-for-salesforce-admin.min.js', __FILE__ ), array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'assets/js/object-sync-for-salesforce-admin.js' ), true );
-		wp_enqueue_style( $this->slug . '-admin', plugins_url( 'assets/css/object-sync-for-salesforce-admin.min.css', __FILE__ ), array(), filemtime( plugin_dir_path( __FILE__ ) . 'assets/css/object-sync-for-salesforce-admin.css' ), 'all' );
+		wp_enqueue_script($this->slug . '-admin', plugins_url('assets/js/object-sync-for-salesforce-admin.min.js', __FILE__), array('jquery'), filemtime(plugin_dir_path(__FILE__) . 'assets/js/object-sync-for-salesforce-admin.js'), true);
+		wp_enqueue_style($this->slug . '-admin', plugins_url('assets/css/object-sync-for-salesforce-admin.min.css', __FILE__), array(), filemtime(plugin_dir_path(__FILE__) . 'assets/css/object-sync-for-salesforce-admin.css'), 'all');
 	}
 
 	/**
@@ -414,7 +414,7 @@ 
 	 * @return void
 	 */
 	public function textdomain() {
-		load_plugin_textdomain( 'object-sync-for-salesforce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+		load_plugin_textdomain('object-sync-for-salesforce', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 	}
 
 	/**
@@ -427,13 +427,13 @@ 
 	*/
 	private function get_login_credentials() {
 
-		$consumer_key       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option( 'object_sync_for_salesforce_consumer_key', '' );
-		$consumer_secret    = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option( 'object_sync_for_salesforce_consumer_secret', '' );
-		$callback_url       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option( 'object_sync_for_salesforce_callback_url', '' );
-		$login_base_url     = defined( 'OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option( 'object_sync_for_salesforce_login_base_url', '' );
-		$authorize_url_path = defined( 'OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option( 'object_sync_for_salesforce_authorize_url_path', '' );
-		$token_url_path     = defined( 'OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option( 'object_sync_for_salesforce_token_url_path', '' );
-		$api_version        = defined( 'OBJECT_SYNC_SF_SALESFORCE_API_VERSION' ) ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option( 'object_sync_for_salesforce_api_version', '' );
+		$consumer_key       = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option('object_sync_for_salesforce_consumer_key', '');
+		$consumer_secret    = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option('object_sync_for_salesforce_consumer_secret', '');
+		$callback_url       = defined('OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL') ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option('object_sync_for_salesforce_callback_url', '');
+		$login_base_url     = defined('OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL') ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option('object_sync_for_salesforce_login_base_url', '');
+		$authorize_url_path = defined('OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option('object_sync_for_salesforce_authorize_url_path', '');
+		$token_url_path     = defined('OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option('object_sync_for_salesforce_token_url_path', '');
+		$api_version        = defined('OBJECT_SYNC_SF_SALESFORCE_API_VERSION') ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option('object_sync_for_salesforce_api_version', '');
 
 		$login_credentials = array(
 			'consumer_key'     => $consumer_key,

templates/admin/fieldmaps-add-edit-clone.php

Spacing +138 added lines, -138 removed lines

@@ -1,35 +1,35 @@ 
-<form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" class="fieldmap">
-	<input type="hidden" name="redirect_url_error" value="<?php echo esc_url( $error_url ); ?>" />
-	<input type="hidden" name="redirect_url_success" value="<?php echo esc_url( $success_url ); ?>" />
-	<?php if ( isset( $transient ) ) { ?>
-	<input type="hidden" name="transient" value="<?php echo esc_html( $transient ); ?>" />
+<form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>" class="fieldmap">
+	<input type="hidden" name="redirect_url_error" value="<?php echo esc_url($error_url); ?>" />
+	<input type="hidden" name="redirect_url_success" value="<?php echo esc_url($success_url); ?>" />
+	<?php if (isset($transient)) { ?>
+	<input type="hidden" name="transient" value="<?php echo esc_html($transient); ?>" />
 	<?php } ?>
 	<input type="hidden" name="action" value="post_fieldmap" >
-	<input type="hidden" name="method" value="<?php echo esc_attr( $method ); ?>" />
-	<?php if ( 'edit' === $method ) { ?>
-	<input type="hidden" name="id" value="<?php echo absint( $map['id'] ); ?>" />
+	<input type="hidden" name="method" value="<?php echo esc_attr($method); ?>" />
+	<?php if ('edit' === $method) { ?>
+	<input type="hidden" name="id" value="<?php echo absint($map['id']); ?>" />
 	<?php } ?>
 	<div class="fieldmap_label">
-		<label for="label"><?php echo esc_html__( 'Label', 'object-sync-for-salesforce' ); ?>: </label>
-		<input type="text" id="label" name="label" required value="<?php echo isset( $label ) ? esc_html( $label ) : ''; ?>" />
+		<label for="label"><?php echo esc_html__('Label', 'object-sync-for-salesforce'); ?>: </label>
+		<input type="text" id="label" name="label" required value="<?php echo isset($label) ? esc_html($label) : ''; ?>" />
 	</div>
 	<fieldset class="wordpress_side">
 		<div class="wordpress_object">
-			<label for="wordpress_object"><?php echo esc_html__( 'WordPress Object', 'object-sync-for-salesforce' ); ?>: </label>
+			<label for="wordpress_object"><?php echo esc_html__('WordPress Object', 'object-sync-for-salesforce'); ?>: </label>
 			<select id="wordpress_object" name="wordpress_object" required>
-				<option value="">- <?php echo esc_html__( 'Select object type', 'object-sync-for-salesforce' ); ?> -</option>
+				<option value="">- <?php echo esc_html__('Select object type', 'object-sync-for-salesforce'); ?> -</option>
 				<?php
 				$wordpress_objects = $this->wordpress->wordpress_objects;
-				foreach ( $wordpress_objects as $object ) {
-					if ( isset( $wordpress_object ) && $wordpress_object === $object ) {
+				foreach ($wordpress_objects as $object) {
+					if (isset($wordpress_object) && $wordpress_object === $object) {
 						$selected = ' selected';
 					} else {
 						$selected = '';
 					}
-					echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-						esc_html( $object ),
-						esc_attr( $selected ),
-						esc_html( $object )
+					echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+						esc_html($object),
+						esc_attr($selected),
+						esc_html($object)
 					);
 				}
 				?>
@@ -38,31 +38,31 @@ 
 	</fieldset>
 	<fieldset class="salesforce_side">
 		<div class="salesforce_object">
-			<label for="salesforce_object"><?php echo esc_html__( 'Salesforce Object', 'object-sync-for-salesforce' ); ?>: </label>
+			<label for="salesforce_object"><?php echo esc_html__('Salesforce Object', 'object-sync-for-salesforce'); ?>: </label>
 			<div class="spinner"></div>
 			<select id="salesforce_object" name="salesforce_object" required>
-				<option value="">- <?php echo esc_html__( 'Select object type', 'object-sync-for-salesforce' ); ?> -</option>
+				<option value="">- <?php echo esc_html__('Select object type', 'object-sync-for-salesforce'); ?> -</option>
 				<?php
 				$sfapi          = $this->salesforce['sfapi'];
-				$object_filters = maybe_unserialize( get_option( 'salesforce_api_object_filters' ), array() );
+				$object_filters = maybe_unserialize(get_option('salesforce_api_object_filters'), array());
 				$conditions     = array();
-				if ( is_array( $object_filters ) && in_array( 'updateable', $object_filters, true ) ) {
+				if (is_array($object_filters) && in_array('updateable', $object_filters, true)) {
 					$conditions['updateable'] = true;
 				}
-				if ( is_array( $object_filters ) && in_array( 'triggerable', $object_filters, true ) ) {
+				if (is_array($object_filters) && in_array('triggerable', $object_filters, true)) {
 					$conditions['triggerable'] = true;
 				}
-				$salesforce_objects = $sfapi->objects( $conditions );
-				foreach ( $salesforce_objects as $object ) {
-					if ( isset( $salesforce_object ) && $salesforce_object === $object['name'] ) {
+				$salesforce_objects = $sfapi->objects($conditions);
+				foreach ($salesforce_objects as $object) {
+					if (isset($salesforce_object) && $salesforce_object === $object['name']) {
 						$selected = ' selected';
 					} else {
 						$selected = '';
 					}
-					echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-						esc_html( $object['name'] ),
-						esc_attr( $selected ),
-						esc_html( $object['label'] )
+					echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+						esc_html($object['name']),
+						esc_attr($selected),
+						esc_html($object['label'])
 					);
 				}
 				?>
@@ -70,30 +70,30 @@ 
 		</div>
 		<div class="salesforce_record_types_allowed">
 			<?php
-			if ( isset( $salesforce_record_types_allowed ) ) :
+			if (isset($salesforce_record_types_allowed)) :
 				$record_types = $this->get_salesforce_object_description(
 					array(
 						'salesforce_object' => $salesforce_object,
 						'include'           => 'recordTypeInfos',
 					)
 				);
-				if ( isset( $record_types['recordTypeInfos'] ) ) :
+				if (isset($record_types['recordTypeInfos'])) :
 					?>
-					<label for="salesforce_record_types_allowed"><?php echo __( 'Allowed Record Types', 'object-sync-for-salesforce' ); ?>:</label>
+					<label for="salesforce_record_types_allowed"><?php echo __('Allowed Record Types', 'object-sync-for-salesforce'); ?>:</label>
 					<div class="checkboxes">
-					<?php foreach ( $record_types['recordTypeInfos'] as $key => $value ) : ?>
+					<?php foreach ($record_types['recordTypeInfos'] as $key => $value) : ?>
 						<?php
-						if ( in_array( $key, $salesforce_record_types_allowed, true ) ) {
+						if (in_array($key, $salesforce_record_types_allowed, true)) {
 							$checked = ' checked';
 						} else {
 							$checked = '';
 						}
-						echo sprintf( '<label><input type="checkbox" class="form-checkbox" value="%1$s" name="%2$s" id="%3$s"%4$s>%5$s</label>',
-							esc_html( $key ),
-							esc_attr( 'salesforce_record_types_allowed[' . $key . ']' ),
-							esc_attr( 'salesforce_record_types_allowed-' . $key ),
-							esc_html( $checked ),
-							esc_html( $value )
+						echo sprintf('<label><input type="checkbox" class="form-checkbox" value="%1$s" name="%2$s" id="%3$s"%4$s>%5$s</label>',
+							esc_html($key),
+							esc_attr('salesforce_record_types_allowed[' . $key . ']'),
+							esc_attr('salesforce_record_types_allowed-' . $key),
+							esc_html($checked),
+							esc_html($value)
 						);
 						?>
 					<?php endforeach; ?>
@@ -103,29 +103,29 @@ 
 		</div>
 		<div class="salesforce_record_type_default">
 			<?php
-			if ( isset( $salesforce_record_type_default ) ) :
+			if (isset($salesforce_record_type_default)) :
 				$record_types = $this->get_salesforce_object_description(
 					array(
 						'salesforce_object' => $salesforce_object,
 						'include'           => 'recordTypeInfos',
 					)
 				);
-				if ( isset( $record_types['recordTypeInfos'] ) ) :
+				if (isset($record_types['recordTypeInfos'])) :
 					?>
-					<label for="salesforce_record_type_default"><?php echo __( 'Default Record Type', 'object-sync-for-salesforce' ); ?>:</label>
-					<select id="salesforce_record_type_default" name="salesforce_record_type_default" required><option value="">- <?php echo __( 'Select record type', 'object-sync-for-salesforce' ); ?> -</option>
+					<label for="salesforce_record_type_default"><?php echo __('Default Record Type', 'object-sync-for-salesforce'); ?>:</label>
+					<select id="salesforce_record_type_default" name="salesforce_record_type_default" required><option value="">- <?php echo __('Select record type', 'object-sync-for-salesforce'); ?> -</option>
 					<?php
-					foreach ( $record_types['recordTypeInfos'] as $key => $value ) :
-						if ( isset( $salesforce_record_type_default ) && $salesforce_record_type_default === $key ) {
+					foreach ($record_types['recordTypeInfos'] as $key => $value) :
+						if (isset($salesforce_record_type_default) && $salesforce_record_type_default === $key) {
 							$selected = ' selected';
 						} else {
 							$selected = '';
 						}
-						if ( ! isset( $salesforce_record_types_allowed ) || in_array( $key, $salesforce_record_types_allowed, true ) ) {
-							echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-								esc_attr( $key ),
-								esc_attr( $selected ),
-								esc_html( $value )
+						if ( ! isset($salesforce_record_types_allowed) || in_array($key, $salesforce_record_types_allowed, true)) {
+							echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+								esc_attr($key),
+								esc_attr($selected),
+								esc_html($value)
 							);
 						}
 					endforeach;
@@ -137,8 +137,8 @@ 
 			?>
 		</div>
 		<div class="pull_trigger_field">
-			<?php if ( isset( $pull_trigger_field ) ) : ?>
-				<label for="pull_trigger_field"><?php echo __( 'Date field to trigger pull', 'object-sync-for-salesforce' ); ?>:</label>
+			<?php if (isset($pull_trigger_field)) : ?>
+				<label for="pull_trigger_field"><?php echo __('Date field to trigger pull', 'object-sync-for-salesforce'); ?>:</label>
 				<?php
 				$object_fields = $this->get_salesforce_object_fields(
 					array(
@@ -149,35 +149,35 @@ 
 				?>
 				<select name="pull_trigger_field" id="pull_trigger_field">
 				<?php
-				foreach ( $object_fields as $key => $value ) {
-					if ( $pull_trigger_field === $value['name'] ) {
+				foreach ($object_fields as $key => $value) {
+					if ($pull_trigger_field === $value['name']) {
 						$selected = ' selected';
 					} else {
 						$selected = '';
 					}
-					echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-						esc_attr( $value['name'] ),
-						esc_attr( $selected ),
-						esc_html( $value['label'] )
+					echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+						esc_attr($value['name']),
+						esc_attr($selected),
+						esc_html($value['label'])
 					);
 				}
 				?>
 				</select>
-				<p class="description"><?php echo esc_html__( 'When the plugin checks for data to bring from Salesforce into WordPress, it will use the selected field to determine what relevant changes have occurred in Salesforce.', 'object-sync-for-salesforce' ); ?></p>
+				<p class="description"><?php echo esc_html__('When the plugin checks for data to bring from Salesforce into WordPress, it will use the selected field to determine what relevant changes have occurred in Salesforce.', 'object-sync-for-salesforce'); ?></p>
 			<?php endif; ?>
 		</div>
 	</fieldset>
 	<fieldset class="fields">
-		<legend><?php echo esc_html__( 'Fieldmap', 'object-sync-for-salesforce' ); ?></legend>
+		<legend><?php echo esc_html__('Fieldmap', 'object-sync-for-salesforce'); ?></legend>
 		<table class="wp-list-table widefat striped fields">
 			<thead>
 				<tr>
-					<th class="column-wordpress_field"><?php echo esc_html__( 'WordPress Field', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-salesforce_field"><?php echo esc_html__( 'Salesforce Field', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-is_prematch"><?php echo esc_html__( 'Prematch', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-is_key"><?php echo esc_html__( 'Salesforce Key', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-direction"><?php echo esc_html__( 'Direction', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-is_delete"><?php echo esc_html__( 'Delete', 'object-sync-for-salesforce' ); ?></th>
+					<th class="column-wordpress_field"><?php echo esc_html__('WordPress Field', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-salesforce_field"><?php echo esc_html__('Salesforce Field', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-is_prematch"><?php echo esc_html__('Prematch', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-is_key"><?php echo esc_html__('Salesforce Key', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-direction"><?php echo esc_html__('Direction', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-is_delete"><?php echo esc_html__('Delete', 'object-sync-for-salesforce'); ?></th>
 				</tr>
 			</thead>
 			<tfoot>
@@ -186,9 +186,9 @@ 
 						<p><small>
 							<?php
 							// translators: the placeholders refer to: 1) the cache clear link, 2) the cache clear link text
-							echo sprintf( '<strong>' . esc_html__( 'Note:', 'object-sync-for-salesforce' ) . '</strong>' . esc_html__( ' to map a custom meta field (such as wp_postmeta, wp_usermeta, wp_termmeta, etc.), WordPress must have at least one value for that field. If you add a new meta field and want to map it, make sure to add a value for it and ', 'object-sync-for-salesforce' ) . '<a href="%1$s" id="clear-sfwp-cache">%2$s</a>' . esc_html__( ' to see the field listed here', 'object-sync-for-salesforce' ),
-								esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=clear_cache' ) ),
-								esc_html__( 'clear the plugin cache', 'object-sync-for-salesforce' )
+							echo sprintf('<strong>' . esc_html__('Note:', 'object-sync-for-salesforce') . '</strong>' . esc_html__(' to map a custom meta field (such as wp_postmeta, wp_usermeta, wp_termmeta, etc.), WordPress must have at least one value for that field. If you add a new meta field and want to map it, make sure to add a value for it and ', 'object-sync-for-salesforce') . '<a href="%1$s" id="clear-sfwp-cache">%2$s</a>' . esc_html__(' to see the field listed here', 'object-sync-for-salesforce'),
+								esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=clear_cache')),
+								esc_html__('clear the plugin cache', 'object-sync-for-salesforce')
 							);
 							?>
 						</small></p>
@@ -197,26 +197,26 @@ 
 			</tfoot>
 			<tbody>
 				<?php
-				if ( isset( $fieldmap_fields ) && null !== $fieldmap_fields && is_array( $fieldmap_fields ) ) {
-					foreach ( $fieldmap_fields as $key => $value ) {
-						$key = md5( $key . time() );
+				if (isset($fieldmap_fields) && null !== $fieldmap_fields && is_array($fieldmap_fields)) {
+					foreach ($fieldmap_fields as $key => $value) {
+						$key = md5($key . time());
 				?>
 				<tr>
 					<td class="column-wordpress_field">
-						<select name="wordpress_field[<?php echo esc_attr( $key ); ?>]" id="wordpress_field-<?php echo esc_attr( $key ); ?>">
-							<option value="">- <?php echo esc_html__( 'Select WordPress field', 'object-sync-for-salesforce' ); ?> -</option>
+						<select name="wordpress_field[<?php echo esc_attr($key); ?>]" id="wordpress_field-<?php echo esc_attr($key); ?>">
+							<option value="">- <?php echo esc_html__('Select WordPress field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
-							$wordpress_fields = $this->get_wordpress_object_fields( $wordpress_object );
-							foreach ( $wordpress_fields as $wordpress_field ) {
-								if ( isset( $value['wordpress_field']['label'] ) && $value['wordpress_field']['label'] === $wordpress_field['key'] ) {
+							$wordpress_fields = $this->get_wordpress_object_fields($wordpress_object);
+							foreach ($wordpress_fields as $wordpress_field) {
+								if (isset($value['wordpress_field']['label']) && $value['wordpress_field']['label'] === $wordpress_field['key']) {
 									$selected = ' selected';
 								} else {
 									$selected = '';
 								}
-								echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-									esc_attr( $wordpress_field['key'] ),
-									esc_attr( $selected ),
-									esc_html( $wordpress_field['key'] )
+								echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+									esc_attr($wordpress_field['key']),
+									esc_attr($selected),
+									esc_html($wordpress_field['key'])
 								);
 							}
 							?>
@@ -224,27 +224,27 @@ 
 
 					</td>
 					<td class="column-salesforce_field">
-						<select name="salesforce_field[<?php echo esc_attr( $key ); ?>]" id="salesforce_field-<?php echo esc_attr( $key ); ?>">
-							<option value="">- <?php echo esc_html__( 'Select Salesforce field', 'object-sync-for-salesforce' ); ?> -</option>
+						<select name="salesforce_field[<?php echo esc_attr($key); ?>]" id="salesforce_field-<?php echo esc_attr($key); ?>">
+							<option value="">- <?php echo esc_html__('Select Salesforce field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
 							$salesforce_fields = $this->get_salesforce_object_fields(
 								array(
 									'salesforce_object' => $salesforce_object,
 								)
 							);
-							foreach ( $salesforce_fields as $salesforce_field ) {
-								if ( isset( $value['salesforce_field']['name'] ) && $value['salesforce_field']['name'] === $salesforce_field['name'] ) {
+							foreach ($salesforce_fields as $salesforce_field) {
+								if (isset($value['salesforce_field']['name']) && $value['salesforce_field']['name'] === $salesforce_field['name']) {
 									$selected = ' selected';
-								} elseif ( isset( $value['salesforce_field']['label'] ) && $value['salesforce_field']['label'] === $salesforce_field['name'] ) {
+								} elseif (isset($value['salesforce_field']['label']) && $value['salesforce_field']['label'] === $salesforce_field['name']) {
 									// this conditional is for versions up to 1.1.2, but i think it's fine to leave it for now. if we remove it, people's fieldmaps will not show correctly in the admin.
 									$selected = ' selected';
 								} else {
 									$selected = '';
 								}
-								echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-									esc_attr( $salesforce_field['name'] ),
-									esc_attr( $selected ),
-									esc_html( $salesforce_field['label'] )
+								echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+									esc_attr($salesforce_field['name']),
+									esc_attr($selected),
+									esc_html($salesforce_field['label'])
 								);
 							}
 							?>
@@ -253,32 +253,32 @@ 
 					</td>
 					<td class="column-is_prematch">
 						<?php
-						if ( isset( $value['is_prematch'] ) && '1' === $value['is_prematch'] ) {
+						if (isset($value['is_prematch']) && '1' === $value['is_prematch']) {
 							$checked = ' checked';
 						} else {
 							$checked = '';
 						}
 						?>
-						<input type="checkbox" name="is_prematch[<?php echo esc_attr( $key ); ?>]" id="is_prematch-<?php echo esc_attr( $key ); ?>" value="1" <?php echo esc_attr( $checked ); ?> title="<?php echo esc_html__( 'This pair should be checked for existing matches in Salesforce before adding', 'object-sync-for-salesforce' ); ?>" />
+						<input type="checkbox" name="is_prematch[<?php echo esc_attr($key); ?>]" id="is_prematch-<?php echo esc_attr($key); ?>" value="1" <?php echo esc_attr($checked); ?> title="<?php echo esc_html__('This pair should be checked for existing matches in Salesforce before adding', 'object-sync-for-salesforce'); ?>" />
 					</td>
 					<td class="column-is_key">
 						<?php
-						if ( isset( $value['is_key'] ) && '1' === $value['is_key'] ) {
+						if (isset($value['is_key']) && '1' === $value['is_key']) {
 							$checked = ' checked';
 						} else {
 							$checked = '';
 						}
 						?>
-						<input type="checkbox" name="is_key[<?php echo esc_attr( $key ); ?>]" id="is_key-<?php echo esc_attr( $key ); ?>" value="1" <?php echo esc_attr( $checked ); ?> title="<?php echo esc_html__( 'This Salesforce field is an External ID in Salesforce', 'object-sync-for-salesforce' ); ?>" />
+						<input type="checkbox" name="is_key[<?php echo esc_attr($key); ?>]" id="is_key-<?php echo esc_attr($key); ?>" value="1" <?php echo esc_attr($checked); ?> title="<?php echo esc_html__('This Salesforce field is an External ID in Salesforce', 'object-sync-for-salesforce'); ?>" />
 					</td>
 					<td class="column-direction">
 						<?php
-						if ( isset( $value['direction'] ) ) {
-							if ( 'sf_wp' === $value['direction'] ) {
+						if (isset($value['direction'])) {
+							if ('sf_wp' === $value['direction']) {
 								$checked_sf_wp = ' checked';
 								$checked_wp_sf = '';
 								$checked_sync  = '';
-							} elseif ( 'wp_sf' === $value['direction'] ) {
+							} elseif ('wp_sf' === $value['direction']) {
 								$checked_sf_wp = '';
 								$checked_wp_sf = ' checked';
 								$checked_sync  = '';
@@ -294,29 +294,29 @@ 
 						}
 						?>
 						<div class="radios">
-							<label><input type="radio" value="sf_wp" name="direction[<?php echo esc_attr( $key ); ?>]" id="direction-<?php echo esc_attr( $key ); ?>-sf-wp" <?php echo esc_attr( $checked_sf_wp ); ?> required> <?php echo esc_html__( 'Salesforce to WordPress', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="wp_sf" name="direction[<?php echo esc_attr( $key ); ?>]" id="direction-<?php echo esc_attr( $key ); ?>-wp-sf" <?php echo esc_attr( $checked_wp_sf ); ?> required> <?php echo esc_html__( 'WordPress to Salesforce', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="sync" name="direction[<?php echo esc_attr( $key ); ?>]" id="direction-<?php echo esc_attr( $key ); ?>-sync" <?php echo esc_attr( $checked_sync ); ?> required> <?php echo esc_html__( 'Sync', 'object-sync-for-salesforce' ); ?></label>
+							<label><input type="radio" value="sf_wp" name="direction[<?php echo esc_attr($key); ?>]" id="direction-<?php echo esc_attr($key); ?>-sf-wp" <?php echo esc_attr($checked_sf_wp); ?> required> <?php echo esc_html__('Salesforce to WordPress', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="wp_sf" name="direction[<?php echo esc_attr($key); ?>]" id="direction-<?php echo esc_attr($key); ?>-wp-sf" <?php echo esc_attr($checked_wp_sf); ?> required> <?php echo esc_html__('WordPress to Salesforce', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="sync" name="direction[<?php echo esc_attr($key); ?>]" id="direction-<?php echo esc_attr($key); ?>-sync" <?php echo esc_attr($checked_sync); ?> required> <?php echo esc_html__('Sync', 'object-sync-for-salesforce'); ?></label>
 						</div>
 					</td>
 					<td class="column-is_delete">
-						<input type="checkbox" name="is_delete[<?php echo esc_attr( $key ); ?>]" id="is_delete-<?php echo esc_attr( $key ); ?>" value="1" />
+						<input type="checkbox" name="is_delete[<?php echo esc_attr($key); ?>]" id="is_delete-<?php echo esc_attr($key); ?>" value="1" />
 					</td>
 				</tr>
 				<?php
 					} // End foreach().
-				} elseif ( isset( $wordpress_object ) && isset( $salesforce_object ) ) {
+				} elseif (isset($wordpress_object) && isset($salesforce_object)) {
 				?>
 				<tr>
 					<td class="column-wordpress_field">
 						<select name="wordpress_field[0]" id="wordpress_field-0">
-							<option value="">- <?php echo esc_html__( 'Select WordPress field', 'object-sync-for-salesforce' ); ?> -</option>
+							<option value="">- <?php echo esc_html__('Select WordPress field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
-							$wordpress_fields = $this->get_wordpress_object_fields( $wordpress_object );
-							foreach ( $wordpress_fields as $wordpress_field ) {
-								echo sprintf( '<option value="%1$s">%2$s</option>',
-									esc_attr( $wordpress_field['key'] ),
-									esc_html( $wordpress_field['key'] )
+							$wordpress_fields = $this->get_wordpress_object_fields($wordpress_object);
+							foreach ($wordpress_fields as $wordpress_field) {
+								echo sprintf('<option value="%1$s">%2$s</option>',
+									esc_attr($wordpress_field['key']),
+									esc_html($wordpress_field['key'])
 								);
 							}
 							?>
@@ -324,17 +324,17 @@ 
 					</td>
 					<td class="column-salesforce_field">
 						<select name="salesforce_field[0]" id="salesforce_field-0">
-							<option value="">- <?php echo esc_html__( 'Select Salesforce field', 'object-sync-for-salesforce' ); ?> -</option>
+							<option value="">- <?php echo esc_html__('Select Salesforce field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
 							$salesforce_fields = $this->get_salesforce_object_fields(
 								array(
 									'salesforce_object' => $salesforce_object,
 								)
 							);
-							foreach ( $salesforce_fields as $salesforce_field ) {
-								echo sprintf( '<option value="%1$s">%2$s</option>',
-									esc_attr( $salesforce_field['name'] ),
-									esc_html( $salesforce_field['label'] )
+							foreach ($salesforce_fields as $salesforce_field) {
+								echo sprintf('<option value="%1$s">%2$s</option>',
+									esc_attr($salesforce_field['name']),
+									esc_html($salesforce_field['label'])
 								);
 							}
 							?>
@@ -348,9 +348,9 @@ 
 					</td>
 					<td class="column-direction">
 						<div class="radios">
-							<label><input type="radio" value="sf_wp" name="direction[0]" id="direction-0-sf-wp" required> <?php echo esc_html__( 'Salesforce to WordPress', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="wp_sf" name="direction[0]" id="direction-0-wp-sf" required> <?php echo esc_html__( 'WordPress to Salesforce', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="sync" name="direction[0]" id="direction-0-sync" required checked> <?php echo esc_html__( 'Sync', 'object-sync-for-salesforce' ); ?></label>
+							<label><input type="radio" value="sf_wp" name="direction[0]" id="direction-0-sf-wp" required> <?php echo esc_html__('Salesforce to WordPress', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="wp_sf" name="direction[0]" id="direction-0-wp-sf" required> <?php echo esc_html__('WordPress to Salesforce', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="sync" name="direction[0]" id="direction-0-sync" required checked> <?php echo esc_html__('Sync', 'object-sync-for-salesforce'); ?></label>
 						</div>
 					</td>
 					<td class="column-is_delete">
@@ -364,17 +364,17 @@ 
 		</table>
 		<!--<div class="spinner"></div>-->
 		<?php
-		if ( isset( $fieldmap_fields ) && null !== $fieldmap_fields ) {
-			$add_button_label = esc_html__( 'Add another field mapping', 'object-sync-for-salesforce' );
+		if (isset($fieldmap_fields) && null !== $fieldmap_fields) {
+			$add_button_label = esc_html__('Add another field mapping', 'object-sync-for-salesforce');
 		} else {
-			$add_button_label = esc_html__( 'Add field mapping', 'object-sync-for-salesforce' );
+			$add_button_label = esc_html__('Add field mapping', 'object-sync-for-salesforce');
 		}
 		?>
 		<p><button type="button" id="add-field-mapping" class="button button-secondary"><?php echo $add_button_label; ?></button></p>
-		<p class="description"><?php echo esc_html__( 'Prematch tells the plugin to match records that have the same value before sending data to Salesforce. Salesforce Key indicates the Salesforce field is an External ID. If either of these is checked, the plugin will do an UPSERT to avoid duplicate data when possible.', 'object-sync-for-salesforce' ); ?></p>
+		<p class="description"><?php echo esc_html__('Prematch tells the plugin to match records that have the same value before sending data to Salesforce. Salesforce Key indicates the Salesforce field is an External ID. If either of these is checked, the plugin will do an UPSERT to avoid duplicate data when possible.', 'object-sync-for-salesforce'); ?></p>
 	</fieldset>
 	<fieldset class="sync_triggers">
-		<legend><?php echo esc_html__( 'Action triggers', 'object-sync-for-salesforce' ); ?></legend>
+		<legend><?php echo esc_html__('Action triggers', 'object-sync-for-salesforce'); ?></legend>
 		<div class="checkboxes">
 			<?php
 			$wordpress_create_checked  = '';
@@ -383,9 +383,9 @@ 
 			$salesforce_create_checked = '';
 			$salesforce_update_checked = '';
 			$salesforce_delete_checked = '';
-			if ( isset( $sync_triggers ) && is_array( $sync_triggers ) ) {
-				foreach ( $sync_triggers as $trigger ) {
-					switch ( $trigger ) {
+			if (isset($sync_triggers) && is_array($sync_triggers)) {
+				foreach ($sync_triggers as $trigger) {
+					switch ($trigger) {
 						case $this->mappings->sync_wordpress_create:
 							$wordpress_create_checked = ' checked';
 							break;
@@ -408,31 +408,31 @@ 
 				}
 			}
 			?>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_wordpress_create ); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-create" <?php echo esc_attr( $wordpress_create_checked ); ?>><?php echo esc_html__( 'WordPress create', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_wordpress_update ); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-update" <?php echo esc_attr( $wordpress_update_checked ); ?>><?php echo esc_html__( 'WordPress update', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_wordpress_delete ); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-delete" <?php echo esc_attr( $wordpress_delete_checked ); ?>><?php echo esc_html__( 'WordPress delete', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_sf_create ); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-create" <?php echo esc_attr( $salesforce_create_checked ); ?>><?php echo esc_html__( 'Salesforce create', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_sf_update ); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-update" <?php echo esc_attr( $salesforce_update_checked ); ?>><?php echo esc_html__( 'Salesforce update', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_sf_delete ); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-delete" <?php echo esc_attr( $salesforce_delete_checked ); ?>><?php echo esc_html__( 'Salesforce delete', 'object-sync-for-salesforce' ); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_wordpress_create); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-create" <?php echo esc_attr($wordpress_create_checked); ?>><?php echo esc_html__('WordPress create', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_wordpress_update); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-update" <?php echo esc_attr($wordpress_update_checked); ?>><?php echo esc_html__('WordPress update', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_wordpress_delete); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-delete" <?php echo esc_attr($wordpress_delete_checked); ?>><?php echo esc_html__('WordPress delete', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_sf_create); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-create" <?php echo esc_attr($salesforce_create_checked); ?>><?php echo esc_html__('Salesforce create', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_sf_update); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-update" <?php echo esc_attr($salesforce_update_checked); ?>><?php echo esc_html__('Salesforce update', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_sf_delete); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-delete" <?php echo esc_attr($salesforce_delete_checked); ?>><?php echo esc_html__('Salesforce delete', 'object-sync-for-salesforce'); ?></label>
 			<p class="description">
 				<?php
 				// translators: placeholders are for the class names: salesforce_push and salesforce_pull
-				echo sprintf( esc_html__( 'Select which actions on WordPress objects and Salesforce objects should trigger a synchronization. These settings are used by the %1$s and %2$s classes respectively.', 'object-sync-for-salesforce' ), '<code>salesforce_push</code>', '<code>salesforce_pull</code>' );
+				echo sprintf(esc_html__('Select which actions on WordPress objects and Salesforce objects should trigger a synchronization. These settings are used by the %1$s and %2$s classes respectively.', 'object-sync-for-salesforce'), '<code>salesforce_push</code>', '<code>salesforce_pull</code>');
 				?>
 			</p>
 		</div>
 		<div class="checkboxes">
-			<label><input type="checkbox" name="push_async" id="process-async" value="1" <?php echo isset( $push_async ) && '1' === $push_async ? ' checked' : ''; ?>><?php echo esc_html__( 'Process asynchronously', 'object-sync-for-salesforce' ); ?></label>
+			<label><input type="checkbox" name="push_async" id="process-async" value="1" <?php echo isset($push_async) && '1' === $push_async ? ' checked' : ''; ?>><?php echo esc_html__('Process asynchronously', 'object-sync-for-salesforce'); ?></label>
 			<p class="description">
 				<?php
 				// translators: placeholder is for WordPress cron method name
-				echo sprintf( esc_html__( 'If selected, push data will be queued for processing and synchronized when %s is run. This may increase site performance, but changes will not be reflected in real time.', 'object-sync-for-salesforce' ), '<code>wp_cron</code>' );
+				echo sprintf(esc_html__('If selected, push data will be queued for processing and synchronized when %s is run. This may increase site performance, but changes will not be reflected in real time.', 'object-sync-for-salesforce'), '<code>wp_cron</code>');
 				?>
 			</p>
 		</div>
 		<div class="checkboxes">
-			<label><input type="checkbox" name="push_drafts" id="push-drafts" value="1" <?php echo isset( $push_drafts ) && '1' === $push_drafts ? ' checked' : ''; ?>><?php echo esc_html__( 'Push drafts', 'object-sync-for-salesforce' ); ?></label>
-			<p class="description"><?php echo esc_html__( 'If selected, WordPress will send drafts of this object type (if it creates drafts for it) to Salesforce.', 'object-sync-for-salesforce' ); ?></p>
+			<label><input type="checkbox" name="push_drafts" id="push-drafts" value="1" <?php echo isset($push_drafts) && '1' === $push_drafts ? ' checked' : ''; ?>><?php echo esc_html__('Push drafts', 'object-sync-for-salesforce'); ?></label>
+			<p class="description"><?php echo esc_html__('If selected, WordPress will send drafts of this object type (if it creates drafts for it) to Salesforce.', 'object-sync-for-salesforce'); ?></p>
 		</div>
 		<?php
 		/*
@@ -451,7 +451,7 @@ 
 	<?php
 		submit_button(
 			// translators: the placeholder refers to the currently selected method (add, edit, or clone)
-			sprintf( esc_html__( '%1$s fieldmap', 'object-sync-for-salesforce' ), ucfirst( $method ) )
+			sprintf(esc_html__('%1$s fieldmap', 'object-sync-for-salesforce'), ucfirst($method))
 		);
 	?>
 </form>

classes/salesforce_mapping.php

Spacing +234 added lines, -234 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -60,7 +60,7 @@ 
 	 * @param object $logging Object_Sync_Sf_Logging.
 	 * @throws \Exception
 	 */
-	public function __construct( $wpdb, $version, $slug, $logging ) {
+	public function __construct($wpdb, $version, $slug, $logging) {
 		$this->wpdb    = $wpdb;
 		$this->version = $version;
 		$this->slug    = $slug;
@@ -83,16 +83,16 @@ 
 		$this->sync_sf_delete        = 0x0020;
 
 		// Define which events are initialized by which system.
-		$this->wordpress_events  = array( $this->sync_wordpress_create, $this->sync_wordpress_update, $this->sync_wordpress_delete );
-		$this->salesforce_events = array( $this->sync_sf_create, $this->sync_sf_update, $this->sync_sf_delete );
+		$this->wordpress_events  = array($this->sync_wordpress_create, $this->sync_wordpress_update, $this->sync_wordpress_delete);
+		$this->salesforce_events = array($this->sync_sf_create, $this->sync_sf_update, $this->sync_sf_delete);
 
 		// Constants for the directions to map things.
 		$this->direction_wordpress_sf = 'wp_sf';
 		$this->direction_sf_wordpress = 'sf_wp';
 		$this->direction_sync         = 'sync';
 
-		$this->direction_wordpress  = array( $this->direction_wordpress_sf, $this->direction_sync );
-		$this->direction_salesforce = array( $this->direction_sf_wordpress, $this->direction_sync );
+		$this->direction_wordpress  = array($this->direction_wordpress_sf, $this->direction_sync);
+		$this->direction_salesforce = array($this->direction_sf_wordpress, $this->direction_sync);
 
 		// This is used when we map a record with default or Master.
 		$this->salesforce_default_record_type = 'default';
@@ -100,11 +100,11 @@ 
 		// Salesforce has multipicklists and they have a delimiter.
 		$this->array_delimiter = ';';
 		// What data types in Salesforce should be an array?
-		$this->array_types_from_salesforce = array( 'multipicklist' );
+		$this->array_types_from_salesforce = array('multipicklist');
 		// What data types in Salesforce should be a date field?
-		$this->date_types_from_salesforce = array( 'date', 'datetime' );
+		$this->date_types_from_salesforce = array('date', 'datetime');
 		// What data types in Salesforce should be an integer?
-		$this->int_types_from_salesforce = array( 'integer', 'boolean' );
+		$this->int_types_from_salesforce = array('integer', 'boolean');
 
 		// Max length for a mapping field.
 		$this->name_length = 128;
@@ -123,13 +123,13 @@ 
 	 * @param array $salesforce_fields The fields for the Salesforce side of the mapping.
 	 * @throws \Exception
 	 */
-	public function create_fieldmap( $posted = array(), $wordpress_fields = array(), $salesforce_fields = array() ) {
-		$data = $this->setup_fieldmap_data( $posted, $wordpress_fields, $salesforce_fields );
-		if ( version_compare( $this->version, '1.2.5', '>=' ) ) {
+	public function create_fieldmap($posted = array(), $wordpress_fields = array(), $salesforce_fields = array()) {
+		$data = $this->setup_fieldmap_data($posted, $wordpress_fields, $salesforce_fields);
+		if (version_compare($this->version, '1.2.5', '>=')) {
 			$data['version'] = $this->version;
 		}
-		$insert = $this->wpdb->insert( $this->fieldmap_table, $data );
-		if ( 1 === $insert ) {
+		$insert = $this->wpdb->insert($this->fieldmap_table, $data);
+		if (1 === $insert) {
 			return $this->wpdb->insert_id;
 		} else {
 			return false;
@@ -145,29 +145,29 @@ 
 	 * @return Array $map a single mapping or $mappings, an array of mappings.
 	 * @throws \Exception
 	 */
-	public function get_fieldmaps( $id = null, $conditions = array(), $reset = false ) {
+	public function get_fieldmaps($id = null, $conditions = array(), $reset = false) {
 		$table = $this->fieldmap_table;
-		if ( null !== $id ) { // get one fieldmap.
-			$map                                    = $this->wpdb->get_row( 'SELECT * FROM ' . $table . ' WHERE id = ' . $id, ARRAY_A );
-			$map['salesforce_record_types_allowed'] = maybe_unserialize( $map['salesforce_record_types_allowed'] );
+		if (null !== $id) { // get one fieldmap.
+			$map                                    = $this->wpdb->get_row('SELECT * FROM ' . $table . ' WHERE id = ' . $id, ARRAY_A);
+			$map['salesforce_record_types_allowed'] = maybe_unserialize($map['salesforce_record_types_allowed']);
 
-			$map['fields']        = maybe_unserialize( $map['fields'] );
-			$map['sync_triggers'] = maybe_unserialize( $map['sync_triggers'] );
+			$map['fields']        = maybe_unserialize($map['fields']);
+			$map['sync_triggers'] = maybe_unserialize($map['sync_triggers']);
 			return $map;
-		} elseif ( ! empty( $conditions ) ) { // get multiple but with a limitation.
+		} elseif ( ! empty($conditions)) { // get multiple but with a limitation.
 			$mappings    = array();
 			$record_type = '';
 
 			// Assemble the SQL.
-			if ( ! empty( $conditions ) ) {
+			if ( ! empty($conditions)) {
 				$where = ' WHERE ';
 				$i     = 0;
-				foreach ( $conditions as $key => $value ) {
-					if ( 'salesforce_record_type' === $key ) {
-						$record_type = sanitize_text_field( $value );
+				foreach ($conditions as $key => $value) {
+					if ('salesforce_record_type' === $key) {
+						$record_type = sanitize_text_field($value);
 					} else {
 						$i++;
-						if ( $i > 1 ) {
+						if ($i > 1) {
 							$where .= ' AND ';
 						}
 						$where .= '`' . $key . '` = "' . $value . '"';
@@ -177,10 +177,10 @@ 
 				$where = '';
 			}
 
-			$mappings = $this->wpdb->get_results( 'SELECT * FROM ' . $table . $where . ' ORDER BY `weight`', ARRAY_A );
+			$mappings = $this->wpdb->get_results('SELECT * FROM ' . $table . $where . ' ORDER BY `weight`', ARRAY_A);
 
-			if ( ! empty( $mappings ) ) {
-				$mappings = $this->prepare_fieldmap_data( $mappings, $record_type );
+			if ( ! empty($mappings)) {
+				$mappings = $this->prepare_fieldmap_data($mappings, $record_type);
 			}
 
 			return $mappings;
@@ -188,14 +188,14 @@ 
 		} else { // get all of the mappings. ALL THE MAPPINGS.
 
 			// if the version is greater than or equal to 1.2.5, the fieldmap table has a version column
-			if ( version_compare( $this->version, '1.2.5', '>=' ) ) {
-				$mappings = $this->wpdb->get_results( "SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight`, `version` FROM $table", ARRAY_A );
+			if (version_compare($this->version, '1.2.5', '>=')) {
+				$mappings = $this->wpdb->get_results("SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight`, `version` FROM $table", ARRAY_A);
 			} else {
-				$mappings = $this->wpdb->get_results( "SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight` FROM $table", ARRAY_A );
+				$mappings = $this->wpdb->get_results("SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight` FROM $table", ARRAY_A);
 			}
 
-			if ( ! empty( $mappings ) ) {
-				$mappings = $this->prepare_fieldmap_data( $mappings );
+			if ( ! empty($mappings)) {
+				$mappings = $this->prepare_fieldmap_data($mappings);
 			}
 
 			return $mappings;
@@ -211,29 +211,29 @@ 
 	 *
 	 * @return Array of mapped fields
 	 */
-	public function get_mapped_fields( $mapping, $directions = array() ) {
+	public function get_mapped_fields($mapping, $directions = array()) {
 		$mapped_fields = array();
-		foreach ( $mapping['fields'] as $fields ) {
-			if ( empty( $directions ) || in_array( $fields['direction'], $directions, true ) ) {
+		foreach ($mapping['fields'] as $fields) {
+			if (empty($directions) || in_array($fields['direction'], $directions, true)) {
 
-				if ( version_compare( $this->version, '1.2.0', '>=' ) && isset( $fields['salesforce_field']['name'] ) ) {
+				if (version_compare($this->version, '1.2.0', '>=') && isset($fields['salesforce_field']['name'])) {
 					$array_key = 'name';
 				} else {
 					$array_key = 'label';
 				}
 
 				// Some field map types (Relation) store a collection of SF objects.
-				if ( is_array( $fields['salesforce_field'] ) && ! isset( $fields['salesforce_field'][ $array_key ] ) ) {
-					foreach ( $fields['salesforce_field'] as $sf_field ) {
-						$mapped_fields[ $sf_field[ $array_key ] ] = $sf_field[ $array_key ];
+				if (is_array($fields['salesforce_field']) && ! isset($fields['salesforce_field'][$array_key])) {
+					foreach ($fields['salesforce_field'] as $sf_field) {
+						$mapped_fields[$sf_field[$array_key]] = $sf_field[$array_key];
 					}
 				} else { // The rest are just a name/value pair.
-					$mapped_fields[ $fields['salesforce_field'][ $array_key ] ] = $fields['salesforce_field'][ $array_key ];
+					$mapped_fields[$fields['salesforce_field'][$array_key]] = $fields['salesforce_field'][$array_key];
 				}
 			}
 		}
 
-		if ( ! empty( $this->get_mapped_record_types ) ) {
+		if ( ! empty($this->get_mapped_record_types)) {
 			$mapped_fields['RecordTypeId'] = 'RecordTypeId';
 		}
 
@@ -246,8 +246,8 @@ 
 	 * @param Array $mapping A mapping from which we wish to estract the record type.
 	 * @return Array of mappings. Empty if the mapping's record type is default, else full of the record types.
 	 */
-	public function get_mapped_record_types( $mapping ) {
-		return $mapping['salesforce_record_type_default'] === $this->salesforce_default_record_type ? array() : array_filter( maybe_unserialize( $mapping['salesforce_record_types_allowed'] ) );
+	public function get_mapped_record_types($mapping) {
+		return $mapping['salesforce_record_type_default'] === $this->salesforce_default_record_type ? array() : array_filter(maybe_unserialize($mapping['salesforce_record_types_allowed']));
 	}
 
 	/**
@@ -260,9 +260,9 @@ 
 	 * @return $map
 	 * @throws \Exception
 	 */
-	public function update_fieldmap( $posted = array(), $wordpress_fields = array(), $salesforce_fields = array(), $id = '' ) {
-		$data = $this->setup_fieldmap_data( $posted, $wordpress_fields, $salesforce_fields );
-		if ( version_compare( $this->version, '1.2.5', '>=' ) && ! isset( $data['updated'] ) ) {
+	public function update_fieldmap($posted = array(), $wordpress_fields = array(), $salesforce_fields = array(), $id = '') {
+		$data = $this->setup_fieldmap_data($posted, $wordpress_fields, $salesforce_fields);
+		if (version_compare($this->version, '1.2.5', '>=') && ! isset($data['updated'])) {
 			$data['version'] = $this->version;
 		}
 		$update = $this->wpdb->update(
@@ -272,7 +272,7 @@ 
 				'id' => $id,
 			)
 		);
-		if ( false === $update ) {
+		if (false === $update) {
 			return false;
 		} else {
 			return true;
@@ -288,76 +288,76 @@ 
 	 * @param array $salesforce_fields The fields for the Salesforce side of the mapping.
 	 * @return $data
 	 */
-	private function setup_fieldmap_data( $posted = array(), $wordpress_fields = array(), $salesforce_fields = array() ) {
+	private function setup_fieldmap_data($posted = array(), $wordpress_fields = array(), $salesforce_fields = array()) {
 		$data = array(
 			'label'             => $posted['label'],
-			'name'              => sanitize_title( $posted['label'] ),
+			'name'              => sanitize_title($posted['label']),
 			'salesforce_object' => $posted['salesforce_object'],
 			'wordpress_object'  => $posted['wordpress_object'],
 		);
-		if ( isset( $posted['wordpress_field'] ) && is_array( $posted['wordpress_field'] ) && isset( $posted['salesforce_field'] ) && is_array( $posted['salesforce_field'] ) ) {
+		if (isset($posted['wordpress_field']) && is_array($posted['wordpress_field']) && isset($posted['salesforce_field']) && is_array($posted['salesforce_field'])) {
 			$setup['fields'] = array();
-			foreach ( $posted['wordpress_field'] as $key => $value ) {
-				$method_key = array_search( $value, array_column( $wordpress_fields, 'key' ), true );
-				if ( ! isset( $posted['direction'][ $key ] ) ) {
-					$posted['direction'][ $key ] = 'sync';
+			foreach ($posted['wordpress_field'] as $key => $value) {
+				$method_key = array_search($value, array_column($wordpress_fields, 'key'), true);
+				if ( ! isset($posted['direction'][$key])) {
+					$posted['direction'][$key] = 'sync';
 				}
-				if ( ! isset( $posted['is_prematch'][ $key ] ) ) {
-					$posted['is_prematch'][ $key ] = false;
+				if ( ! isset($posted['is_prematch'][$key])) {
+					$posted['is_prematch'][$key] = false;
 				}
-				if ( ! isset( $posted['is_key'][ $key ] ) ) {
-					$posted['is_key'][ $key ] = false;
+				if ( ! isset($posted['is_key'][$key])) {
+					$posted['is_key'][$key] = false;
 				}
-				if ( ! isset( $posted['is_delete'][ $key ] ) ) {
-					$posted['is_delete'][ $key ] = false;
+				if ( ! isset($posted['is_delete'][$key])) {
+					$posted['is_delete'][$key] = false;
 				}
-				if ( false === $posted['is_delete'][ $key ] ) {
+				if (false === $posted['is_delete'][$key]) {
 					// I think it's good to over-mention that updateable is really how the Salesforce api spells it.
-					$updateable_key = array_search( $posted['salesforce_field'][ $key ], array_column( $salesforce_fields, 'name' ), true );
+					$updateable_key = array_search($posted['salesforce_field'][$key], array_column($salesforce_fields, 'name'), true);
 
 					$salesforce_field_attributes = array();
-					foreach ( $salesforce_fields[ $updateable_key ] as $sf_key => $sf_value ) {
-						if ( isset( $sf_value ) && ! is_array( $sf_value ) ) {
-							$salesforce_field_attributes[ $sf_key ] = esc_attr( $sf_value );
-						} elseif ( ! empty( $sf_value ) && is_array( $sf_value ) ) {
-							$salesforce_field_attributes[ $sf_key ] = maybe_unserialize( $sf_value );
+					foreach ($salesforce_fields[$updateable_key] as $sf_key => $sf_value) {
+						if (isset($sf_value) && ! is_array($sf_value)) {
+							$salesforce_field_attributes[$sf_key] = esc_attr($sf_value);
+						} elseif ( ! empty($sf_value) && is_array($sf_value)) {
+							$salesforce_field_attributes[$sf_key] = maybe_unserialize($sf_value);
 						} else {
-							$salesforce_field_attributes[ $sf_key ] = '';
+							$salesforce_field_attributes[$sf_key] = '';
 						}
 					}
 
-					$setup['fields'][ $key ] = array(
+					$setup['fields'][$key] = array(
 						'wordpress_field'  => array(
-							'label'   => sanitize_text_field( $posted['wordpress_field'][ $key ] ),
-							'methods' => maybe_unserialize( $wordpress_fields[ $method_key ]['methods'] ),
-							'type'    => isset( $wordpress_fields[ $method_key ]['type'] ) ? sanitize_text_field( $wordpress_fields[ $method_key ]['type'] ) : 'text',
+							'label'   => sanitize_text_field($posted['wordpress_field'][$key]),
+							'methods' => maybe_unserialize($wordpress_fields[$method_key]['methods']),
+							'type'    => isset($wordpress_fields[$method_key]['type']) ? sanitize_text_field($wordpress_fields[$method_key]['type']) : 'text',
 						),
 						'salesforce_field' => $salesforce_field_attributes,
-						'is_prematch'      => sanitize_text_field( $posted['is_prematch'][ $key ] ),
-						'is_key'           => sanitize_text_field( $posted['is_key'][ $key ] ),
-						'direction'        => sanitize_text_field( $posted['direction'][ $key ] ),
-						'is_delete'        => sanitize_text_field( $posted['is_delete'][ $key ] ),
+						'is_prematch'      => sanitize_text_field($posted['is_prematch'][$key]),
+						'is_key'           => sanitize_text_field($posted['is_key'][$key]),
+						'direction'        => sanitize_text_field($posted['direction'][$key]),
+						'is_delete'        => sanitize_text_field($posted['is_delete'][$key]),
 					);
 
 					// If the WordPress key or the Salesforce key are blank, remove this incomplete mapping.
 					// This prevents https://github.com/MinnPost/object-sync-for-salesforce/issues/82 .
 					if (
-						empty( $setup['fields'][ $key ]['wordpress_field']['label'] )
+						empty($setup['fields'][$key]['wordpress_field']['label'])
 						||
-						empty( $setup['fields'][ $key ]['salesforce_field']['name'] )
+						empty($setup['fields'][$key]['salesforce_field']['name'])
 					) {
-						unset( $setup['fields'][ $key ] );
+						unset($setup['fields'][$key]);
 					}
 				}
 			} // End foreach() on WordPress fields.
-			$data['fields'] = maybe_serialize( $setup['fields'] );
-		} elseif ( isset( $posted['fields'] ) && is_array( $posted['fields'] ) ) {
+			$data['fields'] = maybe_serialize($setup['fields']);
+		} elseif (isset($posted['fields']) && is_array($posted['fields'])) {
 			// if $posted['fields'] is already set, use that
-			$data['fields'] = maybe_serialize( $posted['fields'] );
+			$data['fields'] = maybe_serialize($posted['fields']);
 		} // End if() WordPress fields are present.
 
-		if ( isset( $posted['salesforce_record_types_allowed'] ) ) {
-			$data['salesforce_record_types_allowed'] = maybe_serialize( $posted['salesforce_record_types_allowed'] );
+		if (isset($posted['salesforce_record_types_allowed'])) {
+			$data['salesforce_record_types_allowed'] = maybe_serialize($posted['salesforce_record_types_allowed']);
 		} else {
 			$data['salesforce_record_types_allowed'] = maybe_serialize(
 				array(
@@ -365,29 +365,29 @@ 
 				)
 			);
 		}
-		if ( isset( $posted['salesforce_record_type_default'] ) ) {
+		if (isset($posted['salesforce_record_type_default'])) {
 			$data['salesforce_record_type_default'] = $posted['salesforce_record_type_default'];
 		} else {
-			$data['salesforce_record_type_default'] = maybe_serialize( $this->salesforce_default_record_type );
+			$data['salesforce_record_type_default'] = maybe_serialize($this->salesforce_default_record_type);
 		}
-		if ( isset( $posted['pull_trigger_field'] ) ) {
+		if (isset($posted['pull_trigger_field'])) {
 			$data['pull_trigger_field'] = $posted['pull_trigger_field'];
 		}
-		if ( isset( $posted['sync_triggers'] ) && is_array( $posted['sync_triggers'] ) ) {
+		if (isset($posted['sync_triggers']) && is_array($posted['sync_triggers'])) {
 			$setup['sync_triggers'] = array();
-			foreach ( $posted['sync_triggers'] as $key => $value ) {
-				$setup['sync_triggers'][ $key ] = esc_html( $posted['sync_triggers'][ $key ] );
+			foreach ($posted['sync_triggers'] as $key => $value) {
+				$setup['sync_triggers'][$key] = esc_html($posted['sync_triggers'][$key]);
 			}
 		} else {
 			$setup['sync_triggers'] = array();
 		}
-		$data['sync_triggers'] = maybe_serialize( $setup['sync_triggers'] );
-		if ( isset( $posted['pull_trigger_field'] ) ) {
+		$data['sync_triggers'] = maybe_serialize($setup['sync_triggers']);
+		if (isset($posted['pull_trigger_field'])) {
 			$data['pull_trigger_field'] = $posted['pull_trigger_field'];
 		}
-		$data['push_async']  = isset( $posted['push_async'] ) ? $posted['push_async'] : '';
-		$data['push_drafts'] = isset( $posted['push_drafts'] ) ? $posted['push_drafts'] : '';
-		$data['weight']      = isset( $posted['weight'] ) ? $posted['weight'] : '';
+		$data['push_async']  = isset($posted['push_async']) ? $posted['push_async'] : '';
+		$data['push_drafts'] = isset($posted['push_drafts']) ? $posted['push_drafts'] : '';
+		$data['weight']      = isset($posted['weight']) ? $posted['weight'] : '';
 		return $data;
 	}
 
@@ -398,12 +398,12 @@ 
 	 * @return Boolean
 	 * @throws \Exception
 	 */
-	public function delete_fieldmap( $id = '' ) {
+	public function delete_fieldmap($id = '') {
 		$data   = array(
 			'id' => $id,
 		);
-		$delete = $this->wpdb->delete( $this->fieldmap_table, $data );
-		if ( 1 === $delete ) {
+		$delete = $this->wpdb->delete($this->fieldmap_table, $data);
+		if (1 === $delete) {
 			return true;
 		} else {
 			return false;
@@ -417,27 +417,27 @@ 
 	 * @return false|Int of field mapping between WordPress and Salesforce objects
 	 * @throws \Exception
 	 */
-	public function create_object_map( $posted = array() ) {
-		$data            = $this->setup_object_map_data( $posted );
-		$data['created'] = current_time( 'mysql' );
+	public function create_object_map($posted = array()) {
+		$data            = $this->setup_object_map_data($posted);
+		$data['created'] = current_time('mysql');
 		// Check to see if we don't know the salesforce id and it is not a temporary id, or if this is pending.
 		// If it is using a temporary id, the map will get updated after it finishes running; it won't call this method unless there's an error, which we should log.
-		if ( substr( $data['salesforce_id'], 0, 7 ) !== 'tmp_sf_' || 'pending' === $data['action'] ) {
-			unset( $data['action'] );
-			$insert = $this->wpdb->insert( $this->object_map_table, $data );
+		if (substr($data['salesforce_id'], 0, 7) !== 'tmp_sf_' || 'pending' === $data['action']) {
+			unset($data['action']);
+			$insert = $this->wpdb->insert($this->object_map_table, $data);
 		} else {
 			$status = 'error';
-			if ( isset( $this->logging ) ) {
+			if (isset($this->logging)) {
 				$logging = $this->logging;
-			} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-				$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+			} elseif (class_exists('Object_Sync_Sf_Logging')) {
+				$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 			}
 			$logging->setup(
 				sprintf(
 					// translators: %1$s is the name of a WordPress object. %2$s is the id of that object.
-					esc_html__( 'Error Mapping: error caused by trying to map the WordPress %1$s with ID of %2$s to Salesforce ID starting with "tmp_sf_", which is invalid.', 'object-sync-for-salesforce' ),
-					esc_attr( $data['wordpress_object'] ),
-					absint( $data['wordpress_id'] )
+					esc_html__('Error Mapping: error caused by trying to map the WordPress %1$s with ID of %2$s to Salesforce ID starting with "tmp_sf_", which is invalid.', 'object-sync-for-salesforce'),
+					esc_attr($data['wordpress_object']),
+					absint($data['wordpress_id'])
 				),
 				'',
 				0,
@@ -446,23 +446,23 @@ 
 			);
 			return false;
 		}
-		if ( 1 === $insert ) {
+		if (1 === $insert) {
 			return $this->wpdb->insert_id;
-		} elseif ( false !== strpos( $this->wpdb->last_error, 'Duplicate entry' ) ) {
-			$mapping = $this->load_by_salesforce( $data['salesforce_id'] );
+		} elseif (false !== strpos($this->wpdb->last_error, 'Duplicate entry')) {
+			$mapping = $this->load_by_salesforce($data['salesforce_id']);
 			$id      = $mapping['id'];
 			$status  = 'error';
-			if ( isset( $this->logging ) ) {
+			if (isset($this->logging)) {
 				$logging = $this->logging;
-			} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-				$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+			} elseif (class_exists('Object_Sync_Sf_Logging')) {
+				$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 			}
 			$logging->setup(
 				sprintf(
 					// translators: %1$s is the status word "Error". %1$s is the Id of a Salesforce object. %2$s is the ID of a mapping object.
-					esc_html__( 'Error: Mapping: there is already a WordPress object mapped to the Salesforce object %1$s and the mapping object ID is %2$s', 'object-sync-for-salesforce' ),
-					esc_attr( $data['salesforce_id'] ),
-					absint( $id )
+					esc_html__('Error: Mapping: there is already a WordPress object mapped to the Salesforce object %1$s and the mapping object ID is %2$s', 'object-sync-for-salesforce'),
+					esc_attr($data['salesforce_id']),
+					absint($id)
 				),
 				'',
 				0,
@@ -483,18 +483,18 @@ 
 	 * @return $map or $mappings
 	 * @throws \Exception
 	 */
-	public function get_object_maps( $conditions = array(), $reset = false ) {
+	public function get_object_maps($conditions = array(), $reset = false) {
 		$table = $this->object_map_table;
 		$order = ' ORDER BY object_updated, created';
-		if ( ! empty( $conditions ) ) { // get multiple but with a limitation.
+		if ( ! empty($conditions)) { // get multiple but with a limitation.
 			$mappings = array();
 
-			if ( ! empty( $conditions ) ) {
+			if ( ! empty($conditions)) {
 				$where = ' WHERE ';
 				$i     = 0;
-				foreach ( $conditions as $key => $value ) {
+				foreach ($conditions as $key => $value) {
 					$i++;
-					if ( $i > 1 ) {
+					if ($i > 1) {
 						$where .= ' AND ';
 					}
 					$where .= '`' . $key . '` = "' . $value . '"';
@@ -503,13 +503,13 @@ 
 				$where = '';
 			}
 
-			$mappings = $this->wpdb->get_results( 'SELECT * FROM ' . $table . $where . $order, ARRAY_A );
-			if ( ! empty( $mappings ) && 1 === $this->wpdb->num_rows ) {
+			$mappings = $this->wpdb->get_results('SELECT * FROM ' . $table . $where . $order, ARRAY_A);
+			if ( ! empty($mappings) && 1 === $this->wpdb->num_rows) {
 				$mappings = $mappings[0];
 			}
 		} else { // get all of the mappings. ALL THE MAPPINGS.
-			$mappings = $this->wpdb->get_results( 'SELECT * FROM ' . $table . $order, ARRAY_A );
-			if ( ! empty( $mappings ) && 1 === $this->wpdb->num_rows ) {
+			$mappings = $this->wpdb->get_results('SELECT * FROM ' . $table . $order, ARRAY_A);
+			if ( ! empty($mappings) && 1 === $this->wpdb->num_rows) {
 				$mappings = $mappings[0];
 			}
 		}
@@ -526,10 +526,10 @@ 
 	 * @return $map
 	 * @throws \Exception
 	 */
-	public function update_object_map( $posted = array(), $id = '' ) {
-		$data = $this->setup_object_map_data( $posted );
-		if ( ! isset( $data['object_updated'] ) ) {
-			$data['object_updated'] = current_time( 'mysql' );
+	public function update_object_map($posted = array(), $id = '') {
+		$data = $this->setup_object_map_data($posted);
+		if ( ! isset($data['object_updated'])) {
+			$data['object_updated'] = current_time('mysql');
 		}
 		$update = $this->wpdb->update(
 			$this->object_map_table,
@@ -538,7 +538,7 @@ 
 				'id' => $id,
 			)
 		);
-		if ( false === $update ) {
+		if (false === $update) {
 			return false;
 		} else {
 			return true;
@@ -551,11 +551,11 @@ 
 	 * @param array $posted It's $_POST.
 	 * @return $data Filtered array with only the keys that are in the object map database table. Strips out things from WordPress form if they're present.
 	 */
-	private function setup_object_map_data( $posted = array() ) {
-		$allowed_fields   = $this->wpdb->get_col( "DESC {$this->object_map_table}", 0 );
+	private function setup_object_map_data($posted = array()) {
+		$allowed_fields   = $this->wpdb->get_col("DESC {$this->object_map_table}", 0);
 		$allowed_fields[] = 'action'; // we use this in both directions even though it isn't in the database; we remove it from the array later if it is present
 
-		$data = array_intersect_key( $posted, array_flip( $allowed_fields ) );
+		$data = array_intersect_key($posted, array_flip($allowed_fields));
 		return $data;
 	}
 
@@ -565,12 +565,12 @@ 
 	 * @param array $id The ID of the object map row.
 	 * @throws \Exception
 	 */
-	public function delete_object_map( $id = '' ) {
+	public function delete_object_map($id = '') {
 		$data   = array(
 			'id' => $id,
 		);
-		$delete = $this->wpdb->delete( $this->object_map_table, $data );
-		if ( 1 === $delete ) {
+		$delete = $this->wpdb->delete($this->object_map_table, $data);
+		if (1 === $delete) {
 			return true;
 		} else {
 			return false;
@@ -583,13 +583,13 @@ 
 	 * @param string $direction Whether this is part of a push or pull action
 	 * @return $id is a temporary string that will be replaced if the modification is successful
 	 */
-	public function generate_temporary_id( $direction ) {
-		if ( 'push' === $direction ) {
+	public function generate_temporary_id($direction) {
+		if ('push' === $direction) {
 			$prefix = 'tmp_sf_';
-		} elseif ( 'pull' === $direction ) {
+		} elseif ('pull' === $direction) {
 			$prefix = 'tmp_wp_';
 		}
-		$id = uniqid( $prefix, true );
+		$id = uniqid($prefix, true);
 		return $id;
 	}
 
@@ -603,12 +603,12 @@ 
 	 * @return SalesforceMappingObject
 	 *   The requested SalesforceMappingObject or FALSE if none was found.
 	 */
-	public function load_by_wordpress( $object_type, $object_id, $reset = false ) {
+	public function load_by_wordpress($object_type, $object_id, $reset = false) {
 		$conditions = array(
 			'wordpress_id'     => $object_id,
 			'wordpress_object' => $object_type,
 		);
-		return $this->get_object_maps( $conditions, $reset );
+		return $this->get_object_maps($conditions, $reset);
 	}
 
 	/**
@@ -620,24 +620,24 @@ 
 	 * @return array $map
 	 *   The most recent fieldmap
 	 */
-	public function load_by_salesforce( $salesforce_id, $reset = false ) {
+	public function load_by_salesforce($salesforce_id, $reset = false) {
 		$conditions = array(
 			'salesforce_id' => $salesforce_id,
 		);
 
-		$map = $this->get_object_maps( $conditions, $reset );
+		$map = $this->get_object_maps($conditions, $reset);
 
-		if ( isset( $map[0] ) && is_array( $map[0] ) && count( $map ) > 1 ) {
+		if (isset($map[0]) && is_array($map[0]) && count($map) > 1) {
 			$status = 'notice';
 			$log    = '';
 			$log   .= 'Mapping: there is more than one mapped WordPress object for the Salesforce object ' . $salesforce_id . '. These WordPress IDs are: ';
 			$i      = 0;
-			foreach ( $map as $mapping ) {
+			foreach ($map as $mapping) {
 				$i++;
-				if ( isset( $mapping['wordpress_id'] ) ) {
+				if (isset($mapping['wordpress_id'])) {
 					$log .= 'object type: ' . $mapping['wordpress_object'] . ', id: ' . $mapping['wordpress_id'];
 				}
-				if ( count( $map ) !== $i ) {
+				if (count($map) !== $i) {
 					$log .= '; ';
 				} else {
 					$log .= '.';
@@ -645,16 +645,16 @@ 
 			}
 			$map = $map[0];
 			// Create log entry for multiple maps.
-			if ( isset( $this->logging ) ) {
+			if (isset($this->logging)) {
 				$logging = $this->logging;
-			} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-				$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+			} elseif (class_exists('Object_Sync_Sf_Logging')) {
+				$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 			}
 			$logging->setup(
 				sprintf(
 					// translators: %1$s is the Id of a Salesforce object.
-					esc_html__( 'Notice: Mapping: there is more than one mapped WordPress object for the Salesforce object %2$s', 'object-sync-for-salesforce' ),
-					esc_attr( $salesforce_id )
+					esc_html__('Notice: Mapping: there is more than one mapped WordPress object for the Salesforce object %2$s', 'object-sync-for-salesforce'),
+					esc_attr($salesforce_id)
 				),
 				$log,
 				0,
@@ -677,20 +677,20 @@ 
 	 *
 	 * @return array Associative array of key value pairs.
 	 */
-	public function map_params( $mapping, $object, $trigger, $use_soap = false, $is_new = true ) {
+	public function map_params($mapping, $object, $trigger, $use_soap = false, $is_new = true) {
 
 		$params = array();
 
-		foreach ( $mapping['fields'] as $fieldmap ) {
+		foreach ($mapping['fields'] as $fieldmap) {
 
-			$wordpress_haystack  = array_values( $this->wordpress_events );
-			$salesforce_haystack = array_values( $this->salesforce_events );
+			$wordpress_haystack  = array_values($this->wordpress_events);
+			$salesforce_haystack = array_values($this->salesforce_events);
 
-			$fieldmap['wordpress_field']['methods'] = maybe_unserialize( $fieldmap['wordpress_field']['methods'] );
+			$fieldmap['wordpress_field']['methods'] = maybe_unserialize($fieldmap['wordpress_field']['methods']);
 
 			$wordpress_field = $fieldmap['wordpress_field']['label'];
 
-			if ( version_compare( $this->version, '1.2.0', '>=' ) && isset( $fieldmap['salesforce_field']['name'] ) ) {
+			if (version_compare($this->version, '1.2.0', '>=') && isset($fieldmap['salesforce_field']['name'])) {
 				$salesforce_field = $fieldmap['salesforce_field']['name'];
 				// Load the type of the Salesforce field. We can use this to handle Salesforce field value issues that come up based on what the field sends into WordPress or expects from WordPress.
 				$salesforce_field_type = $fieldmap['salesforce_field']['type'];
@@ -699,113 +699,113 @@ 
 			}
 
 			// A WordPress event caused this.
-			if ( in_array( $trigger, array_values( $wordpress_haystack ), true ) ) {
+			if (in_array($trigger, array_values($wordpress_haystack), true)) {
 
 				// Is the field in WordPress an array, if we unserialize it? Salesforce wants it to be an imploded string.
-				if ( is_array( maybe_unserialize( $object[ $wordpress_field ] ) ) ) {
-					$object[ $wordpress_field ] = implode( $this->array_delimiter, $object[ $wordpress_field ] );
+				if (is_array(maybe_unserialize($object[$wordpress_field]))) {
+					$object[$wordpress_field] = implode($this->array_delimiter, $object[$wordpress_field]);
 				}
 
-				if ( isset( $salesforce_field_type ) ) {
+				if (isset($salesforce_field_type)) {
 					// Is the Salesforce field a date, and is the WordPress value a valid date?
 					// According to https://salesforce.stackexchange.com/questions/57032/date-format-with-salesforce-rest-api
-					if ( in_array( $salesforce_field_type, $this->date_types_from_salesforce ) ) {
-						if ( '' === $object[ $wordpress_field ] ) {
-							$object[ $wordpress_field ] = null;
+					if (in_array($salesforce_field_type, $this->date_types_from_salesforce)) {
+						if ('' === $object[$wordpress_field]) {
+							$object[$wordpress_field] = null;
 						} else {
-							if ( false !== strtotime( $object[ $wordpress_field ] ) ) {
-								$timestamp = strtotime( $object[ $wordpress_field ] );
+							if (false !== strtotime($object[$wordpress_field])) {
+								$timestamp = strtotime($object[$wordpress_field]);
 							} else {
-								$timestamp = $object[ $wordpress_field ];
+								$timestamp = $object[$wordpress_field];
 							}
-							if ( 'datetime' === $salesforce_field_type ) {
-								$object[ $wordpress_field ] = date_i18n( 'c', $timestamp );
+							if ('datetime' === $salesforce_field_type) {
+								$object[$wordpress_field] = date_i18n('c', $timestamp);
 							} else {
-								$object[ $wordpress_field ] = date_i18n( 'Y-m-d', $timestamp );
+								$object[$wordpress_field] = date_i18n('Y-m-d', $timestamp);
 							}
 						}
 					}
 
 					// Boolean SF fields only want real boolean values. NULL is also not allowed.
-					if ( 'boolean' === $salesforce_field_type ) {
-						$object[ $wordpress_field ] = (bool) $object[ $wordpress_field ];
+					if ('boolean' === $salesforce_field_type) {
+						$object[$wordpress_field] = (bool) $object[$wordpress_field];
 					}
 				}
 
-				$params[ $salesforce_field ] = $object[ $wordpress_field ];
+				$params[$salesforce_field] = $object[$wordpress_field];
 
 				// If the field is a key in Salesforce, remove it from $params to avoid upsert errors from Salesforce,
 				// but still put its name in the params array so we can check for it later.
-				if ( '1' === $fieldmap['is_key'] ) {
-					if ( ! $use_soap ) {
-						unset( $params[ $salesforce_field ] );
+				if ('1' === $fieldmap['is_key']) {
+					if ( ! $use_soap) {
+						unset($params[$salesforce_field]);
 					}
 					$params['key'] = array(
 						'salesforce_field' => $salesforce_field,
 						'wordpress_field'  => $wordpress_field,
-						'value'            => $object[ $wordpress_field ],
+						'value'            => $object[$wordpress_field],
 					);
 				}
 
 				// If the field is a prematch in Salesforce, put its name in the params array so we can check for it later.
-				if ( '1' === $fieldmap['is_prematch'] ) {
+				if ('1' === $fieldmap['is_prematch']) {
 					$params['prematch'] = array(
 						'salesforce_field' => $salesforce_field,
 						'wordpress_field'  => $wordpress_field,
-						'value'            => $object[ $wordpress_field ],
+						'value'            => $object[$wordpress_field],
 					);
 				}
 
 				// Skip fields that aren't being pushed to Salesforce.
-				if ( ! in_array( $fieldmap['direction'], array_values( $this->direction_wordpress ), true ) ) {
+				if ( ! in_array($fieldmap['direction'], array_values($this->direction_wordpress), true)) {
 					// The trigger is a WordPress trigger, but the fieldmap direction is not a WordPress direction.
-					unset( $params[ $salesforce_field ] );
+					unset($params[$salesforce_field]);
 				}
 
 				// I think it's good to over-mention that updateable is really how the Salesforce api spells it.
 				// Skip fields that aren't updateable when mapping params because Salesforce will error otherwise.
 				// This happens after dealing with the field types because key and prematch should still be available to the plugin, even if the values are not updateable in Salesforce.
-				if ( 1 !== (int) $fieldmap['salesforce_field']['updateable'] ) {
-					unset( $params[ $salesforce_field ] );
+				if (1 !== (int) $fieldmap['salesforce_field']['updateable']) {
+					unset($params[$salesforce_field]);
 				}
 
 				// we don't need a continue with the unset methods because there's no array being created down here
-			} elseif ( in_array( $trigger, $salesforce_haystack, true ) ) {
+			} elseif (in_array($trigger, $salesforce_haystack, true)) {
 
 				// A Salesforce event caused this.
 
-				if ( isset( $salesforce_field_type ) ) {
+				if (isset($salesforce_field_type)) {
 					// Salesforce provides multipicklist values as a delimited string. If the
 					// destination field in WordPress accepts multiple values, explode the string into an array and then serialize it.
-					if ( in_array( $salesforce_field_type, $this->array_types_from_salesforce ) ) {
-						$object[ $salesforce_field ] = explode( $this->array_delimiter, $object[ $salesforce_field ] );
+					if (in_array($salesforce_field_type, $this->array_types_from_salesforce)) {
+						$object[$salesforce_field] = explode($this->array_delimiter, $object[$salesforce_field]);
 					}
 
 					// Handle specific data types from Salesforce.
-					switch ( $salesforce_field_type ) {
-						case ( in_array( $salesforce_field_type, $this->date_types_from_salesforce ) ):
-							$format = get_option( 'date_format', 'U' );
-							if ( isset( $fieldmap['wordpress_field']['type'] ) && 'datetime' === $fieldmap['wordpress_field']['type'] ) {
+					switch ($salesforce_field_type) {
+						case (in_array($salesforce_field_type, $this->date_types_from_salesforce)):
+							$format = get_option('date_format', 'U');
+							if (isset($fieldmap['wordpress_field']['type']) && 'datetime' === $fieldmap['wordpress_field']['type']) {
 								$format = 'Y-m-d H:i:s';
 							}
-							$object[ $salesforce_field ] = date_i18n( $format, strtotime( $object[ $salesforce_field ] ) );
+							$object[$salesforce_field] = date_i18n($format, strtotime($object[$salesforce_field]));
 							break;
-						case ( in_array( $salesforce_field_type, $this->int_types_from_salesforce ) ):
-							$object[ $salesforce_field ] = isset( $object[ $salesforce_field ] ) ? (int) $object[ $salesforce_field ] : 0;
+						case (in_array($salesforce_field_type, $this->int_types_from_salesforce)):
+							$object[$salesforce_field] = isset($object[$salesforce_field]) ? (int) $object[$salesforce_field] : 0;
 							break;
 						case 'text':
-							$object[ $salesforce_field ] = (string) $object[ $salesforce_field ];
+							$object[$salesforce_field] = (string) $object[$salesforce_field];
 							break;
 						case 'url':
-							$object[ $salesforce_field ] = esc_url_raw( $object[ $salesforce_field ] );
+							$object[$salesforce_field] = esc_url_raw($object[$salesforce_field]);
 							break;
 					}
 				}
 
 				// Make an array because we need to store the methods for each field as well.
-				if ( '' !== $object[ $salesforce_field ] ) {
-					$params[ $wordpress_field ]          = array();
-					$params[ $wordpress_field ]['value'] = $object[ $salesforce_field ];
+				if ('' !== $object[$salesforce_field]) {
+					$params[$wordpress_field]          = array();
+					$params[$wordpress_field]['value'] = $object[$salesforce_field];
 				} else {
 					// If we try to save certain fields with empty values, WordPress will silently start skipping stuff. This keeps that from happening.
 					continue;
@@ -813,15 +813,15 @@ 
 
 				// If the field is a key in Salesforce, remove it from $params to avoid upsert errors from Salesforce,
 				// but still put its name in the params array so we can check for it later.
-				if ( '1' === $fieldmap['is_key'] ) {
-					if ( ! $use_soap ) {
-						unset( $params[ $wordpress_field ] );
+				if ('1' === $fieldmap['is_key']) {
+					if ( ! $use_soap) {
+						unset($params[$wordpress_field]);
 						continue;
 					}
 					$params['key'] = array(
 						'salesforce_field' => $salesforce_field,
 						'wordpress_field'  => $wordpress_field,
-						'value'            => $object[ $salesforce_field ],
+						'value'            => $object[$salesforce_field],
 						'method_read'      => $fieldmap['wordpress_field']['methods']['read'],
 						'method_create'    => $fieldmap['wordpress_field']['methods']['create'],
 						'method_update'    => $fieldmap['wordpress_field']['methods']['update'],
@@ -829,11 +829,11 @@ 
 				}
 
 				// If the field is a prematch in Salesforce, put its name in the params array so we can check for it later.
-				if ( '1' === $fieldmap['is_prematch'] ) {
+				if ('1' === $fieldmap['is_prematch']) {
 					$params['prematch'] = array(
 						'salesforce_field' => $salesforce_field,
 						'wordpress_field'  => $wordpress_field,
-						'value'            => $object[ $salesforce_field ],
+						'value'            => $object[$salesforce_field],
 						'method_read'      => $fieldmap['wordpress_field']['methods']['read'],
 						'method_create'    => $fieldmap['wordpress_field']['methods']['create'],
 						'method_update'    => $fieldmap['wordpress_field']['methods']['update'],
@@ -841,26 +841,26 @@ 
 				}
 
 				// Skip fields that aren't being pulled from Salesforce.
-				if ( ! in_array( $fieldmap['direction'], array_values( $this->direction_salesforce ), true ) ) {
+				if ( ! in_array($fieldmap['direction'], array_values($this->direction_salesforce), true)) {
 					// The trigger is a Salesforce trigger, but the fieldmap direction is not a Salesforce direction.
-					unset( $params[ $wordpress_field ] );
+					unset($params[$wordpress_field]);
 					// we also need to continue here, so it doesn't create an empty array below for fields that are WordPress -> Salesforce only
 					continue;
 				}
 
-				switch ( $trigger ) {
+				switch ($trigger) {
 					case $this->sync_sf_create:
-						$params[ $wordpress_field ]['method_modify'] = $fieldmap['wordpress_field']['methods']['create'];
+						$params[$wordpress_field]['method_modify'] = $fieldmap['wordpress_field']['methods']['create'];
 						break;
 					case $this->sync_sf_update:
-						$params[ $wordpress_field ]['method_modify'] = $fieldmap['wordpress_field']['methods']['update'];
+						$params[$wordpress_field]['method_modify'] = $fieldmap['wordpress_field']['methods']['update'];
 						break;
 					case $this->sync_sf_delete:
-						$params[ $wordpress_field ]['method_modify'] = $fieldmap['wordpress_field']['methods']['delete'];
+						$params[$wordpress_field]['method_modify'] = $fieldmap['wordpress_field']['methods']['delete'];
 						break;
 				}
 
-				$params[ $wordpress_field ]['method_read'] = $fieldmap['wordpress_field']['methods']['read'];
+				$params[$wordpress_field]['method_read'] = $fieldmap['wordpress_field']['methods']['read'];
 
 			} // End if().
 		} // End foreach().
@@ -877,14 +877,14 @@ 
 	 *
 	 * @return array $mappings Associative array of field maps ready to use
 	 */
-	private function prepare_fieldmap_data( $mappings, $record_type = '' ) {
-
-		foreach ( $mappings as $id => $mapping ) {
-			$mappings[ $id ]['salesforce_record_types_allowed'] = maybe_unserialize( $mapping['salesforce_record_types_allowed'] );
-			$mappings[ $id ]['fields']                          = maybe_unserialize( $mapping['fields'] );
-			$mappings[ $id ]['sync_triggers']                   = maybe_unserialize( $mapping['sync_triggers'] );
-			if ( '' !== $record_type && ! in_array( $record_type, $mappings[ $id ]['salesforce_record_types_allowed'], true ) ) {
-				unset( $mappings[ $id ] );
+	private function prepare_fieldmap_data($mappings, $record_type = '') {
+
+		foreach ($mappings as $id => $mapping) {
+			$mappings[$id]['salesforce_record_types_allowed'] = maybe_unserialize($mapping['salesforce_record_types_allowed']);
+			$mappings[$id]['fields']                          = maybe_unserialize($mapping['fields']);
+			$mappings[$id]['sync_triggers']                   = maybe_unserialize($mapping['sync_triggers']);
+			if ('' !== $record_type && ! in_array($record_type, $mappings[$id]['salesforce_record_types_allowed'], true)) {
+				unset($mappings[$id]);
 			}
 		}
 
@@ -900,12 +900,12 @@ 
 	public function get_failed_object_maps() {
 		$table       = $this->object_map_table;
 		$errors      = array();
-		$push_errors = $this->wpdb->get_results( 'SELECT * FROM ' . $table . ' WHERE salesforce_id LIKE "tmp_sf_%"', ARRAY_A );
-		$pull_errors = $this->wpdb->get_results( 'SELECT * FROM ' . $table . ' WHERE wordpress_id LIKE "tmp_wp_%"', ARRAY_A );
-		if ( ! empty( $push_errors ) ) {
+		$push_errors = $this->wpdb->get_results('SELECT * FROM ' . $table . ' WHERE salesforce_id LIKE "tmp_sf_%"', ARRAY_A);
+		$pull_errors = $this->wpdb->get_results('SELECT * FROM ' . $table . ' WHERE wordpress_id LIKE "tmp_wp_%"', ARRAY_A);
+		if ( ! empty($push_errors)) {
 			$errors['push_errors'] = $push_errors;
 		}
-		if ( ! empty( $pull_errors ) ) {
+		if ( ! empty($pull_errors)) {
 			$errors['pull_errors'] = $pull_errors;
 		}
 		return $errors;
@@ -918,11 +918,11 @@ 
 	 *
 	 * @return array $error Associative array of single row that failed to finish based on id
 	 */
-	public function get_failed_object_map( $id ) {
+	public function get_failed_object_map($id) {
 		$table     = $this->object_map_table;
 		$error     = array();
-		$error_row = $this->wpdb->get_row( 'SELECT * FROM ' . $table . ' WHERE id = "' . $id . '"', ARRAY_A );
-		if ( ! empty( $error_row ) ) {
+		$error_row = $this->wpdb->get_row('SELECT * FROM ' . $table . ' WHERE id = "' . $id . '"', ARRAY_A);
+		if ( ! empty($error_row)) {
 			$error = $error_row;
 		}
 		return $error;