MinnPost / object-sync-for-salesforce

classes/salesforce_push.php

Indentation +139 added lines, -139 removed lines

@@ -24,24 +24,24 @@ 
 	protected $schedulable_classes;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	public $schedule_name; // allow for naming the queue in case there are multiple queues
 
 	/**
-	* Constructor which sets up push schedule
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @throws \Object_Sync_Sf_Exception
-	*/
+	 * Constructor which sets up push schedule
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @throws \Object_Sync_Sf_Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -62,10 +62,10 @@ 
 	}
 
 	/**
-	* Create the action hooks based on what object maps exist from the admin settings.
-	* We do not have any actions for blogroll at this time.
-	*
-	*/
+	 * Create the action hooks based on what object maps exist from the admin settings.
+	 * We do not have any actions for blogroll at this time.
+	 *
+	 */
 	private function add_actions() {
 		$db_version = get_option( 'object_sync_for_salesforce_db_version', false );
 		if ( $db_version === $this->version ) {
@@ -97,54 +97,54 @@ 
 	}
 
 	/**
-	* Method for ajax hooks to call for pushing manually
-	*
-	* @param array $object
-	* @param string $type
-	*
-	*/
+	 * Method for ajax hooks to call for pushing manually
+	 *
+	 * @param array $object
+	 * @param string $type
+	 *
+	 */
 	public function manual_object_update( $object, $type ) {
 		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_update, true );
 	}
 
 	/**
-	* Callback method for adding a user
-	*
-	* @param string $user_id
-	*/
+	 * Callback method for adding a user
+	 *
+	 * @param string $user_id
+	 */
 	public function add_user( $user_id ) {
 		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
 		$this->object_insert( $user, 'user' );
 	}
 
 	/**
-	* Callback method for editing a user
-	*
-	* @param string $user_id
-	* @param object $old_user_data
-	*/
+	 * Callback method for editing a user
+	 *
+	 * @param string $user_id
+	 * @param object $old_user_data
+	 */
 	public function edit_user( $user_id, $old_user_data ) {
 		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
 		$this->object_update( $user, 'user' );
 	}
 
 	/**
-	* Callback method for deleting a user
-	*
-	* @param string $user_id
-	*/
+	 * Callback method for deleting a user
+	 *
+	 * @param string $user_id
+	 */
 	public function delete_user( $user_id ) {
 		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
 		$this->object_delete( $user, 'user' );
 	}
 
 	/**
-	* Callback method for posts of any type
-	* This can handle create, update, and delete actions
-	*
-	* @param string $post_id
-	* @param object $post
-	*/
+	 * Callback method for posts of any type
+	 * This can handle create, update, and delete actions
+	 *
+	 * @param string $post_id
+	 * @param object $post
+	 */
 	public function post_actions( $post_id, $post ) {
 
 		$post_type = $post->post_type;
@@ -191,66 +191,66 @@ 
 	}
 
 	/**
-	* Callback method for adding an attachment
-	*
-	* @param string $post_id
-	*/
+	 * Callback method for adding an attachment
+	 *
+	 * @param string $post_id
+	 */
 	public function add_attachment( $post_id ) {
 		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
 		$this->object_insert( $attachment, 'attachment' );
 	}
 
 	/**
-	* Callback method for editing an attachment
-	*
-	* @param string $post_id
-	*/
+	 * Callback method for editing an attachment
+	 *
+	 * @param string $post_id
+	 */
 	public function edit_attachment( $post_id ) {
 		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
 		$this->object_update( $attachment, 'attachment' );
 	}
 
 	/**
-	* Callback method for editing an attachment
-	*
-	* @param string $post_id
-	*/
+	 * Callback method for editing an attachment
+	 *
+	 * @param string $post_id
+	 */
 	public function delete_attachment( $post_id ) {
 		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
 		$this->object_delete( $attachment, 'attachment' );
 	}
 
 	/**
-	* Callback method for adding a term
-	*
-	* @param string $term_id
-	* @param string $tt_id
-	* @param string $taxonomy
-	*/
+	 * Callback method for adding a term
+	 *
+	 * @param string $term_id
+	 * @param string $tt_id
+	 * @param string $taxonomy
+	 */
 	public function add_term( $term_id, $tt_id, $taxonomy ) {
 		$term = $this->wordpress->get_wordpress_object_data( $taxonomy, $term_id );
 		$this->object_insert( $term, $taxonomy );
 	}
 
 	/**
-	* Callback method for editing a term
-	*
-	* @param string $term_id
-	* @param string $taxonomy
-	*/
+	 * Callback method for editing a term
+	 *
+	 * @param string $term_id
+	 * @param string $taxonomy
+	 */
 	public function edit_term( $term_id, $taxonomy ) {
 		$term = $this->wordpress->get_wordpress_object_data( $taxonomy, $term_id );
 		$this->object_update( $term, $taxonomy );
 	}
 
 	/**
-	* Callback method for deleting a term
-	*
-	* @param int $term (id)
-	* @param int $term_taxonomy_id
-	* @param string $taxonomy (slug)
-	* @param object $deleted_term
-	*/
+	 * Callback method for deleting a term
+	 *
+	 * @param int $term (id)
+	 * @param int $term_taxonomy_id
+	 * @param string $taxonomy (slug)
+	 * @param object $deleted_term
+	 */
 	public function delete_term( $term, $tt_id, $taxonomy, $deleted_term ) {
 		$deleted_term = (array) $deleted_term;
 		$type         = $deleted_term['taxonomy'];
@@ -258,75 +258,75 @@ 
 	}
 
 	/**
-	* Callback method for adding a comment
-	*
-	* @param string $comment_id
-	* @param int|string comment_approved
-	* @param array $commentdata
-	*/
+	 * Callback method for adding a comment
+	 *
+	 * @param string $comment_id
+	 * @param int|string comment_approved
+	 * @param array $commentdata
+	 */
 	public function add_comment( $comment_id, $comment_approved, $commentdata = array() ) {
 		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
 		$this->object_insert( $comment, 'comment' );
 	}
 
 	/**
-	* Callback method for editing a comment
-	*
-	* @param string $comment_id
-	*/
+	 * Callback method for editing a comment
+	 *
+	 * @param string $comment_id
+	 */
 	public function edit_comment( $comment_id ) {
 		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
 		$this->object_update( $comment, 'comment' );
 	}
 
 	/**
-	* Callback method for deleting a comment
-	*
-	* @param string $comment_id
-	*/
+	 * Callback method for deleting a comment
+	 *
+	 * @param string $comment_id
+	 */
 	public function delete_comment( $comment_id ) {
 		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
 		$this->object_delete( $comment, 'comment' );
 	}
 
 	/**
-	* Insert a new object
-	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
-	*/
+	 * Insert a new object
+	 * This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
+	 */
 	private function object_insert( $object, $type ) {
 		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_create );
 	}
 
 	/**
-	* Update an existing object
-	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
-	*/
+	 * Update an existing object
+	 * This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
+	 */
 	private function object_update( $object, $type ) {
 		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_update );
 	}
 
 	/**
-	* Delete an existing object
-	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
-	*/
+	 * Delete an existing object
+	 * This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
+	 */
 	private function object_delete( $object, $type ) {
 		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_delete );
 	}
 
 	/**
-	* Push objects to Salesforce.
-	* This method decides whether to do the processing immediately or queue it to the schedule class (or skip it based on another plugin's activity)
-	*
-	* @param string $object_type
-	*   Type of WordPress object.
-	* @param array $object
-	*   The WordPress data that needs to be sent to Salesforce.
-	* @param int $sf_sync_trigger
-	*   The trigger being responded to.
-	* @param bool $manual
-	*   Are we calling this manually?
-	*
-	*/
+	 * Push objects to Salesforce.
+	 * This method decides whether to do the processing immediately or queue it to the schedule class (or skip it based on another plugin's activity)
+	 *
+	 * @param string $object_type
+	 *   Type of WordPress object.
+	 * @param array $object
+	 *   The WordPress data that needs to be sent to Salesforce.
+	 * @param int $sf_sync_trigger
+	 *   The trigger being responded to.
+	 * @param bool $manual
+	 *   Are we calling this manually?
+	 *
+	 */
 	private function salesforce_push_object_crud( $object_type, $object, $sf_sync_trigger, $manual = false ) {
 
 		$structure       = $this->wordpress->get_wordpress_table_structure( $object_type );
@@ -451,20 +451,20 @@ 
 	}
 
 	/**
-	* Sync WordPress objects and Salesforce objects using the REST API.
-	*
-	* @param string $object_type
-	*   Type of WordPress object.
-	* @param object $object
-	*   The object object.
-	* @param object $mapping
-	*   Salesforce mapping object.
-	* @param int $sf_sync_trigger
-	*   Trigger for this sync.
-	*
-	* @return true or exit the method
-	*
-	*/
+	 * Sync WordPress objects and Salesforce objects using the REST API.
+	 *
+	 * @param string $object_type
+	 *   Type of WordPress object.
+	 * @param object $object
+	 *   The object object.
+	 * @param object $mapping
+	 *   Salesforce mapping object.
+	 * @param int $sf_sync_trigger
+	 *   Trigger for this sync.
+	 *
+	 * @return true or exit the method
+	 *
+	 */
 	public function salesforce_push_sync_rest( $object_type, $object, $mapping, $sf_sync_trigger ) {
 
 		// If Salesforce is not authorized, don't do anything.
@@ -1006,21 +1006,21 @@ 
 	}
 
 	/**
-	* Create an object map between a WordPress object and a Salesforce object
-	*
-	* @param array $wordpress_object
-	*   Array of the WordPress object's data
-	* @param string $id_field_name
-	*   How this object names its primary field. ie Id or comment_id or whatever
-	* @param string $salesforce_id
-	*   Unique identifier for the Salesforce object
-	* @param array $field_mapping
-	*   The row that maps the object types together, including which fields match which other fields
-	*
-	* @return int $wpdb->insert_id
-	*   This is the database row for the map object
-	*
-	*/
+	 * Create an object map between a WordPress object and a Salesforce object
+	 *
+	 * @param array $wordpress_object
+	 *   Array of the WordPress object's data
+	 * @param string $id_field_name
+	 *   How this object names its primary field. ie Id or comment_id or whatever
+	 * @param string $salesforce_id
+	 *   Unique identifier for the Salesforce object
+	 * @param array $field_mapping
+	 *   The row that maps the object types together, including which fields match which other fields
+	 *
+	 * @return int $wpdb->insert_id
+	 *   This is the database row for the map object
+	 *
+	 */
 	private function create_object_map( $wordpress_object, $id_field_name, $salesforce_id, $field_mapping, $pending = false ) {
 
 		if ( true === $pending ) {

Spacing +292 added lines, -292 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
 	* @throws \Object_Sync_Sf_Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -57,7 +57,7 @@ 
 		$this->schedule      = $this->schedule();
 		$this->add_actions();
 
-		$this->debug = get_option( 'object_sync_for_salesforce_debug_mode', false );
+		$this->debug = get_option('object_sync_for_salesforce_debug_mode', false);
 
 	}
 
@@ -67,30 +67,30 @@ 
 	*
 	*/
 	private function add_actions() {
-		$db_version = get_option( 'object_sync_for_salesforce_db_version', false );
-		if ( $db_version === $this->version ) {
-			foreach ( $this->mappings->get_fieldmaps() as $mapping ) {
+		$db_version = get_option('object_sync_for_salesforce_db_version', false);
+		if ($db_version === $this->version) {
+			foreach ($this->mappings->get_fieldmaps() as $mapping) {
 				$object_type = $mapping['wordpress_object'];
-				if ( 'user' === $object_type ) {
-					add_action( 'user_register', array( $this, 'add_user' ), 11, 1 );
-					add_action( 'profile_update', array( $this, 'edit_user' ), 11, 2 );
-					add_action( 'delete_user', array( $this, 'delete_user' ) );
-				} elseif ( 'post' === $object_type ) {
-					add_action( 'save_post', array( $this, 'post_actions' ), 11, 2 );
-				} elseif ( 'attachment' === $object_type ) {
-					add_action( 'add_attachment', array( $this, 'add_attachment' ) );
-					add_action( 'edit_attachment', array( $this, 'edit_attachment' ) );
-					add_action( 'delete_attachment', array( $this, 'delete_attachment' ) );
-				} elseif ( 'category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type ) {
-					add_action( 'create_term', array( $this, 'add_term' ), 11, 3 );
-					add_action( 'edit_terms', array( $this, 'edit_term' ), 11, 2 );
-					add_action( 'delete_term', array( $this, 'delete_term' ), 10, 4 );
-				} elseif ( 'comment' === $object_type ) {
-					add_action( 'comment_post', array( $this, 'add_comment' ), 11, 3 );
-					add_action( 'edit_comment', array( $this, 'edit_comment' ) );
-					add_action( 'delete_comment', array( $this, 'delete_comment' ) ); // to be clear: this only runs when the comment gets deleted from the trash, either manually or automatically
+				if ('user' === $object_type) {
+					add_action('user_register', array($this, 'add_user'), 11, 1);
+					add_action('profile_update', array($this, 'edit_user'), 11, 2);
+					add_action('delete_user', array($this, 'delete_user'));
+				} elseif ('post' === $object_type) {
+					add_action('save_post', array($this, 'post_actions'), 11, 2);
+				} elseif ('attachment' === $object_type) {
+					add_action('add_attachment', array($this, 'add_attachment'));
+					add_action('edit_attachment', array($this, 'edit_attachment'));
+					add_action('delete_attachment', array($this, 'delete_attachment'));
+				} elseif ('category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type) {
+					add_action('create_term', array($this, 'add_term'), 11, 3);
+					add_action('edit_terms', array($this, 'edit_term'), 11, 2);
+					add_action('delete_term', array($this, 'delete_term'), 10, 4);
+				} elseif ('comment' === $object_type) {
+					add_action('comment_post', array($this, 'add_comment'), 11, 3);
+					add_action('edit_comment', array($this, 'edit_comment'));
+					add_action('delete_comment', array($this, 'delete_comment')); // to be clear: this only runs when the comment gets deleted from the trash, either manually or automatically
 				} else { // this is for custom post types
-					add_action( 'save_post_{' . $object_type . '}', array( $this, 'post_actions' ), 11, 2 );
+					add_action('save_post_{' . $object_type . '}', array($this, 'post_actions'), 11, 2);
 				}
 			}
 		}
@@ -103,8 +103,8 @@ 
 	* @param string $type
 	*
 	*/
-	public function manual_object_update( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_update, true );
+	public function manual_object_update($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_update, true);
 	}
 
 	/**
@@ -112,9 +112,9 @@ 
 	*
 	* @param string $user_id
 	*/
-	public function add_user( $user_id ) {
-		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
-		$this->object_insert( $user, 'user' );
+	public function add_user($user_id) {
+		$user = $this->wordpress->get_wordpress_object_data('user', $user_id);
+		$this->object_insert($user, 'user');
 	}
 
 	/**
@@ -123,9 +123,9 @@ 
 	* @param string $user_id
 	* @param object $old_user_data
 	*/
-	public function edit_user( $user_id, $old_user_data ) {
-		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
-		$this->object_update( $user, 'user' );
+	public function edit_user($user_id, $old_user_data) {
+		$user = $this->wordpress->get_wordpress_object_data('user', $user_id);
+		$this->object_update($user, 'user');
 	}
 
 	/**
@@ -133,9 +133,9 @@ 
 	*
 	* @param string $user_id
 	*/
-	public function delete_user( $user_id ) {
-		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
-		$this->object_delete( $user, 'user' );
+	public function delete_user($user_id) {
+		$user = $this->wordpress->get_wordpress_object_data('user', $user_id);
+		$this->object_delete($user, 'user');
 	}
 
 	/**
@@ -145,48 +145,48 @@ 
 	* @param string $post_id
 	* @param object $post
 	*/
-	public function post_actions( $post_id, $post ) {
+	public function post_actions($post_id, $post) {
 
 		$post_type = $post->post_type;
 
-		if ( isset( $post->post_status ) && 'auto-draft' === $post->post_status ) {
+		if (isset($post->post_status) && 'auto-draft' === $post->post_status) {
 			return;
 		}
 		// this plugin does not sync log or revision posts with salesforce
-		if ( isset( $post->post_type ) && in_array( $post->post_type, array( 'wp_log', 'revision' ), true ) ) {
+		if (isset($post->post_type) && in_array($post->post_type, array('wp_log', 'revision'), true)) {
 			return;
 		}
-		if ( $post->post_modified_gmt === $post->post_date_gmt && 'trash' !== $post->post_status ) {
+		if ($post->post_modified_gmt === $post->post_date_gmt && 'trash' !== $post->post_status) {
 			$update = 0;
 			$delete = 0;
-		} elseif ( 'trash' !== $post->post_status ) {
+		} elseif ('trash' !== $post->post_status) {
 			$update = 1;
 			$delete = 0;
-		} elseif ( 'trash' === $post->post_status ) {
+		} elseif ('trash' === $post->post_status) {
 			$update = 0;
 			$delete = 1;
 		}
 
 		// add support for woocommerce if it is installed
-		if ( defined( 'WC_VERSION' ) ) {
+		if (defined('WC_VERSION')) {
 			// statuses to ignore
-			if ( isset( $post->post_status ) && in_array( $post->post_status, array( 'wc-pending' ), true ) ) {
+			if (isset($post->post_status) && in_array($post->post_status, array('wc-pending'), true)) {
 				return;
 			}
 			// statuses to count as new. note that the api will also check to see if it already has been mapped before saving.
-			if ( isset( $post->post_status ) && in_array( $post->post_status, array( 'wc-on-hold', 'wc-processing' ), true ) ) {
+			if (isset($post->post_status) && in_array($post->post_status, array('wc-on-hold', 'wc-processing'), true)) {
 				$update = 0;
 				$delete = 0;
 			}
 		}
 
-		$post = $this->wordpress->get_wordpress_object_data( $post->post_type, $post_id );
-		if ( 1 === $update ) {
-			$this->object_update( $post, $post_type );
-		} elseif ( 1 === $delete ) {
-			$this->object_delete( $post, $post_type );
+		$post = $this->wordpress->get_wordpress_object_data($post->post_type, $post_id);
+		if (1 === $update) {
+			$this->object_update($post, $post_type);
+		} elseif (1 === $delete) {
+			$this->object_delete($post, $post_type);
 		} else {
-			$this->object_insert( $post, $post_type );
+			$this->object_insert($post, $post_type);
 		}
 	}
 
@@ -195,9 +195,9 @@ 
 	*
 	* @param string $post_id
 	*/
-	public function add_attachment( $post_id ) {
-		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
-		$this->object_insert( $attachment, 'attachment' );
+	public function add_attachment($post_id) {
+		$attachment = $this->wordpress->get_wordpress_object_data('attachment', $post_id);
+		$this->object_insert($attachment, 'attachment');
 	}
 
 	/**
@@ -205,9 +205,9 @@ 
 	*
 	* @param string $post_id
 	*/
-	public function edit_attachment( $post_id ) {
-		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
-		$this->object_update( $attachment, 'attachment' );
+	public function edit_attachment($post_id) {
+		$attachment = $this->wordpress->get_wordpress_object_data('attachment', $post_id);
+		$this->object_update($attachment, 'attachment');
 	}
 
 	/**
@@ -215,9 +215,9 @@ 
 	*
 	* @param string $post_id
 	*/
-	public function delete_attachment( $post_id ) {
-		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
-		$this->object_delete( $attachment, 'attachment' );
+	public function delete_attachment($post_id) {
+		$attachment = $this->wordpress->get_wordpress_object_data('attachment', $post_id);
+		$this->object_delete($attachment, 'attachment');
 	}
 
 	/**
@@ -227,9 +227,9 @@ 
 	* @param string $tt_id
 	* @param string $taxonomy
 	*/
-	public function add_term( $term_id, $tt_id, $taxonomy ) {
-		$term = $this->wordpress->get_wordpress_object_data( $taxonomy, $term_id );
-		$this->object_insert( $term, $taxonomy );
+	public function add_term($term_id, $tt_id, $taxonomy) {
+		$term = $this->wordpress->get_wordpress_object_data($taxonomy, $term_id);
+		$this->object_insert($term, $taxonomy);
 	}
 
 	/**
@@ -238,9 +238,9 @@ 
 	* @param string $term_id
 	* @param string $taxonomy
 	*/
-	public function edit_term( $term_id, $taxonomy ) {
-		$term = $this->wordpress->get_wordpress_object_data( $taxonomy, $term_id );
-		$this->object_update( $term, $taxonomy );
+	public function edit_term($term_id, $taxonomy) {
+		$term = $this->wordpress->get_wordpress_object_data($taxonomy, $term_id);
+		$this->object_update($term, $taxonomy);
 	}
 
 	/**
@@ -251,10 +251,10 @@ 
 	* @param string $taxonomy (slug)
 	* @param object $deleted_term
 	*/
-	public function delete_term( $term, $tt_id, $taxonomy, $deleted_term ) {
+	public function delete_term($term, $tt_id, $taxonomy, $deleted_term) {
 		$deleted_term = (array) $deleted_term;
 		$type         = $deleted_term['taxonomy'];
-		$this->object_delete( $deleted_term, $type );
+		$this->object_delete($deleted_term, $type);
 	}
 
 	/**
@@ -264,9 +264,9 @@ 
 	* @param int|string comment_approved
 	* @param array $commentdata
 	*/
-	public function add_comment( $comment_id, $comment_approved, $commentdata = array() ) {
-		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
-		$this->object_insert( $comment, 'comment' );
+	public function add_comment($comment_id, $comment_approved, $commentdata = array()) {
+		$comment = $this->wordpress->get_wordpress_object_data('comment', $comment_id);
+		$this->object_insert($comment, 'comment');
 	}
 
 	/**
@@ -274,9 +274,9 @@ 
 	*
 	* @param string $comment_id
 	*/
-	public function edit_comment( $comment_id ) {
-		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
-		$this->object_update( $comment, 'comment' );
+	public function edit_comment($comment_id) {
+		$comment = $this->wordpress->get_wordpress_object_data('comment', $comment_id);
+		$this->object_update($comment, 'comment');
 	}
 
 	/**
@@ -284,33 +284,33 @@ 
 	*
 	* @param string $comment_id
 	*/
-	public function delete_comment( $comment_id ) {
-		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
-		$this->object_delete( $comment, 'comment' );
+	public function delete_comment($comment_id) {
+		$comment = $this->wordpress->get_wordpress_object_data('comment', $comment_id);
+		$this->object_delete($comment, 'comment');
 	}
 
 	/**
 	* Insert a new object
 	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
 	*/
-	private function object_insert( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_create );
+	private function object_insert($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_create);
 	}
 
 	/**
 	* Update an existing object
 	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
 	*/
-	private function object_update( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_update );
+	private function object_update($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_update);
 	}
 
 	/**
 	* Delete an existing object
 	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
 	*/
-	private function object_delete( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_delete );
+	private function object_delete($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_delete);
 	}
 
 	/**
@@ -327,50 +327,50 @@ 
 	*   Are we calling this manually?
 	*
 	*/
-	private function salesforce_push_object_crud( $object_type, $object, $sf_sync_trigger, $manual = false ) {
+	private function salesforce_push_object_crud($object_type, $object, $sf_sync_trigger, $manual = false) {
 
-		$structure       = $this->wordpress->get_wordpress_table_structure( $object_type );
+		$structure       = $this->wordpress->get_wordpress_table_structure($object_type);
 		$object_id_field = $structure['id_field'];
 
 		// there is a WordPress object to push
-		if ( isset( $object[ $object_id_field ] ) ) {
-			$mapping_object = $this->mappings->load_by_wordpress( $object_type, $object[ $object_id_field ] );
+		if (isset($object[$object_id_field])) {
+			$mapping_object = $this->mappings->load_by_wordpress($object_type, $object[$object_id_field]);
 
 			// there is already a mapping object for this WordPress object
-			if ( isset( $mapping_object['id'] ) ) {
+			if (isset($mapping_object['id'])) {
 				$mapping_object_id_transient = $mapping_object['id'];
 			} else {
 				// there is not a mapping object for this WordPress object id yet
 				// check for that transient with the currently pulling id
-				$mapping_object_id_transient = (int) get_transient( 'salesforce_pulling_object_id' );
+				$mapping_object_id_transient = (int) get_transient('salesforce_pulling_object_id');
 			}
 
-			$salesforce_pulling = (int) get_transient( 'salesforce_pulling_' . $mapping_object_id_transient );
-			if ( 1 === $salesforce_pulling ) {
-				delete_transient( 'salesforce_pulling_' . $mapping_object_id_transient );
-				$pulling_id = get_transient( 'salesforce_pulling_object_id' );
-				if ( $pulling_id === $mapping_object_id_transient ) {
-					delete_transient( 'salesforce_pulling_object_id' );
+			$salesforce_pulling = (int) get_transient('salesforce_pulling_' . $mapping_object_id_transient);
+			if (1 === $salesforce_pulling) {
+				delete_transient('salesforce_pulling_' . $mapping_object_id_transient);
+				$pulling_id = get_transient('salesforce_pulling_object_id');
+				if ($pulling_id === $mapping_object_id_transient) {
+					delete_transient('salesforce_pulling_object_id');
 				}
 				return false;
 			}
 		} else {
 			// if we don't have a WordPress object id, we've got no business doing stuff in Salesforce
 			$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 name of the WordPress id field
-			$title = sprintf( esc_html__( 'Error: Salesforce Push: unable to process queue item because it has no WordPress %1$s.', 'object-sync-for-salesforce' ),
-				esc_attr( $object_id_field )
+			$title = sprintf(esc_html__('Error: Salesforce Push: unable to process queue item because it has no WordPress %1$s.', 'object-sync-for-salesforce'),
+				esc_attr($object_id_field)
 			);
 
 			$logging->setup(
 				$title,
-				print_r( $object, true ), // print this array because if this happens, something weird has happened and we want to log whatever we have
+				print_r($object, true), // print this array because if this happens, something weird has happened and we want to log whatever we have
 				$sf_sync_trigger,
 				0, // parent id goes here but we don't have one, so make it 0
 				$status
@@ -387,14 +387,14 @@ 
 			)
 		);
 
-		foreach ( $sf_mappings as $mapping ) { // for each mapping of this object
+		foreach ($sf_mappings as $mapping) { // for each mapping of this object
 			$map_sync_triggers = $mapping['sync_triggers'];
 
 			// these are bit operators, so we leave out the strict
-			if ( isset( $map_sync_triggers ) && isset( $sf_sync_trigger ) && in_array( $sf_sync_trigger, $map_sync_triggers ) ) { // wp or sf crud event
+			if (isset($map_sync_triggers) && isset($sf_sync_trigger) && in_array($sf_sync_trigger, $map_sync_triggers)) { // wp or sf crud event
 
 				// hook to allow other plugins to prevent a push per-mapping.
-				$push_allowed = apply_filters( 'object_sync_for_salesforce_push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping );
+				$push_allowed = apply_filters('object_sync_for_salesforce_push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping);
 
 				// example to keep from pushing the user with id of 1
 				/*
@@ -407,17 +407,17 @@ 
 				}
 				*/
 
-				if ( false === $push_allowed ) {
+				if (false === $push_allowed) {
 					continue;
 				}
 
 				// push drafts if the setting says so
 				// post status is draft, or post status is inherit and post type is not attachment
-				if ( ( ! isset( $mapping['push_drafts'] ) || '1' !== $mapping['push_drafts'] ) && isset( $object['post_status'] ) && ( 'draft' === $object['post_status'] || ( 'inherit' === $object['post_status'] && 'attachment' !== $object['post_type'] ) ) ) {
+				if (( ! isset($mapping['push_drafts']) || '1' !== $mapping['push_drafts']) && isset($object['post_status']) && ('draft' === $object['post_status'] || ('inherit' === $object['post_status'] && 'attachment' !== $object['post_type']))) {
 					// skip this object if it is a draft and the fieldmap settings told us to ignore it
 					continue;
 				}
-				if ( isset( $mapping['push_async'] ) && ( '1' === $mapping['push_async'] ) && false === $manual ) {
+				if (isset($mapping['push_async']) && ('1' === $mapping['push_async']) && false === $manual) {
 					// this item is async and we want to save it to the queue
 					$data = array(
 						'object_type'     => $object_type,
@@ -428,24 +428,24 @@ 
 
 					// create new schedule based on the options for this current class
 					// this will use the existing schedule if it already exists; otherwise it'll create one
-					$this->schedule->use_schedule( $this->schedule_name );
-					$this->schedule->push_to_queue( $data );
+					$this->schedule->use_schedule($this->schedule_name);
+					$this->schedule->push_to_queue($data);
 					$this->schedule->save()->dispatch();
 
 				} else {
 					// this one is not async. do it immediately.
-					$push = $this->salesforce_push_sync_rest( $object_type, $object, $mapping, $sf_sync_trigger );
+					$push = $this->salesforce_push_sync_rest($object_type, $object, $mapping, $sf_sync_trigger);
 				} // End if().
 			} // End if(). if the trigger does not match our requirements, skip it
 		} // End foreach().
 	}
 
 	private function schedule() {
-		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && 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/schedule.php';
+		if ( ! class_exists('Object_Sync_Sf_Schedule') && 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/schedule.php';
 		}
-		$schedule       = new Object_Sync_Sf_Schedule( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->schedule_name, $this->logging, $this->schedulable_classes );
+		$schedule       = new Object_Sync_Sf_Schedule($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->schedule_name, $this->logging, $this->schedulable_classes);
 		$this->schedule = $schedule;
 		return $schedule;
 	}
@@ -465,25 +465,25 @@ 
 	* @return true or exit the method
 	*
 	*/
-	public function salesforce_push_sync_rest( $object_type, $object, $mapping, $sf_sync_trigger ) {
+	public function salesforce_push_sync_rest($object_type, $object, $mapping, $sf_sync_trigger) {
 
 		// If Salesforce is not authorized, don't do anything.
 		// it's unclear to me if we need to do something else here or if this is sufficient. This is all Drupal does.
-		if ( true !== $this->salesforce['is_authorized'] ) {
+		if (true !== $this->salesforce['is_authorized']) {
 			return;
 		}
 
 		$sfapi = $this->salesforce['sfapi'];
 
 		// we need to get the WordPress id here so we can check to see if the object already has a map
-		$structure = $this->wordpress->get_wordpress_table_structure( $object_type );
+		$structure = $this->wordpress->get_wordpress_table_structure($object_type);
 		$object_id = $structure['id_field'];
 
 		// this returns the row that maps the individual WordPress row to the individual Salesfoce row
-		$mapping_object = $this->mappings->load_by_wordpress( $object_type, $object[ "$object_id" ] );
+		$mapping_object = $this->mappings->load_by_wordpress($object_type, $object["$object_id"]);
 
 		// hook to allow other plugins to define or alter the mapping object
-		$mapping_object = apply_filters( 'object_sync_for_salesforce_push_mapping_object', $mapping_object, $object, $mapping );
+		$mapping_object = apply_filters('object_sync_for_salesforce_push_mapping_object', $mapping_object, $object, $mapping);
 
 		// we already have the data from WordPress at this point; we just need to work with it in Salesforce
 		$synced_object = array(
@@ -497,84 +497,84 @@ 
 
 		// deleting mapped objects
 		// these are bit operators, so we leave out the strict
-		if ( $sf_sync_trigger == $this->mappings->sync_wordpress_delete ) {
-			if ( isset( $mapping_object['id'] ) ) {
+		if ($sf_sync_trigger == $this->mappings->sync_wordpress_delete) {
+			if (isset($mapping_object['id'])) {
 				$op = 'Delete';
 
-				$salesforce_check = $this->mappings->load_by_salesforce( $mapping_object['salesforce_id'] );
+				$salesforce_check = $this->mappings->load_by_salesforce($mapping_object['salesforce_id']);
 
-				if ( count( $salesforce_check ) === count( $salesforce_check, COUNT_RECURSIVE ) ) {
+				if (count($salesforce_check) === count($salesforce_check, COUNT_RECURSIVE)) {
 					try {
-						$result = $sfapi->object_delete( $mapping['salesforce_object'], $mapping_object['salesforce_id'] );
-					} catch ( Object_Sync_Sf_Exception $e ) {
+						$result = $sfapi->object_delete($mapping['salesforce_object'], $mapping_object['salesforce_id']);
+					} catch (Object_Sync_Sf_Exception $e) {
 						$status = 'error';
 						// create log entry for failed delete
-						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: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-						$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] ),
-							esc_attr( $mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $object[ "$object_id" ] )
+						$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id']),
+							esc_attr($mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($object["$object_id"])
 						);
 
 						$logging->setup(
 							$title,
 							$e->getMessage(),
 							$sf_sync_trigger,
-							$object[ "$object_id" ],
+							$object["$object_id"],
 							$status
 						);
 
 						// hook for push fail
-						do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object, $object_id );
+						do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object, $object_id);
 
 					}
 
-					if ( ! isset( $e ) ) {
+					if ( ! isset($e)) {
 						// create log entry for successful delete if the result had no errors
 						$status = 'success';
-						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: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-						$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] ),
-							esc_attr( $mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $object[ "$object_id" ] )
+						$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id']),
+							esc_attr($mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($object["$object_id"])
 						);
 
 						$logging->setup(
 							$title,
 							'',
 							$sf_sync_trigger,
-							$object[ "$object_id" ],
+							$object["$object_id"],
 							$status
 						);
 
 						// hook for push success
-						do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+						do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 					}
 				} else {
 					$more_ids = '<p>The Salesforce record was not deleted because there are multiple WordPress IDs that match this Salesforce ID. They are: ';
 					$i        = 0;
-					foreach ( $salesforce_check as $match ) {
+					foreach ($salesforce_check as $match) {
 						$i++;
 						$more_ids .= $match['wordpress_id'];
-						if ( count( $salesforce_check ) !== $i ) {
+						if (count($salesforce_check) !== $i) {
 							$more_ids .= ', ';
 						} else {
 							$more_ids .= '.</p>';
@@ -584,34 +584,34 @@ 
 					$more_ids .= '<p>The map row between this WordPress object and the Salesforce object, as stored in the WordPress database, will be deleted, and this WordPress object has been deleted, but Salesforce will remain untouched.</p>';
 
 					$status = 'notice';
-					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: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-					$title = sprintf( esc_html__( 'Notice: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s did not delete the Salesforce item.)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $mapping['salesforce_object'] ),
-						esc_attr( $mapping_object['salesforce_id'] ),
-						esc_attr( $mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $object[ "$object_id" ] )
+					$title = sprintf(esc_html__('Notice: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s did not delete the Salesforce item.)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($mapping['salesforce_object']),
+						esc_attr($mapping_object['salesforce_id']),
+						esc_attr($mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($object["$object_id"])
 					);
 
 					$logging->setup(
 						$title,
 						$more_ids,
 						$sf_sync_trigger,
-						$object[ "$object_id" ],
+						$object["$object_id"],
 						$status
 					);
 				} // End if().
 
 				// delete the map row from WordPress after the Salesforce row has been deleted
 				// we delete the map row even if the Salesforce delete failed, because the WordPress object is gone
-				$this->mappings->delete_object_map( $mapping_object['id'] );
+				$this->mappings->delete_object_map($mapping_object['id']);
 
 			} // End if(). there is no map row
 
@@ -619,51 +619,51 @@ 
 		} // End if().
 
 		// are these objects already connected in WordPress?
-		if ( isset( $mapping_object['id'] ) ) {
+		if (isset($mapping_object['id'])) {
 			$is_new = false;
 		} else {
 			$is_new = true;
 		}
 
 		// map the WordPress values to salesforce fields
-		$params = $this->mappings->map_params( $mapping, $object, $sf_sync_trigger, false, $is_new );
+		$params = $this->mappings->map_params($mapping, $object, $sf_sync_trigger, false, $is_new);
 
 		// hook to allow other plugins to modify the $params array
 		// use hook to map fields between the WordPress and Salesforce objects
 		// returns $params.
-		$params = apply_filters( 'object_sync_for_salesforce_push_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new );
+		$params = apply_filters('object_sync_for_salesforce_push_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new);
 
 		// if we don't get any params, there are no fields that should be sent to Salesforce
-		if ( empty( $params ) ) {
+		if (empty($params)) {
 			return;
 		}
 
 		// if there is a prematch WordPress field - ie email - on the fieldmap object
-		if ( isset( $params['prematch'] ) && is_array( $params['prematch'] ) ) {
+		if (isset($params['prematch']) && is_array($params['prematch'])) {
 			$prematch_field_wordpress  = $params['prematch']['wordpress_field'];
 			$prematch_field_salesforce = $params['prematch']['salesforce_field'];
 			$prematch_value            = $params['prematch']['value'];
-			unset( $params['prematch'] );
+			unset($params['prematch']);
 		}
 
 		// if there is an external key field in Salesforce - ie mailchimp user id - on the fieldmap object
-		if ( isset( $params['key'] ) && is_array( $params['key'] ) ) {
+		if (isset($params['key']) && is_array($params['key'])) {
 			$key_field_wordpress  = $params['key']['wordpress_field'];
 			$key_field_salesforce = $params['key']['salesforce_field'];
 			$key_value            = $params['key']['value'];
-			unset( $params['key'] );
+			unset($params['key']);
 		}
 
-		$seconds = $this->schedule->get_schedule_frequency_seconds( $this->schedule_name ) + 60;
+		$seconds = $this->schedule->get_schedule_frequency_seconds($this->schedule_name) + 60;
 
-		if ( true === $is_new ) {
+		if (true === $is_new) {
 
 			// right here we should set the pushing transient
 			// this means we have to create the mapping object here as well, and update it with the correct IDs after successful response
 			// create the mapping object between the rows
-			$mapping_object_id = $this->create_object_map( $object, $object_id, $this->mappings->generate_temporary_id( 'push' ), $mapping, true );
-			set_transient( 'salesforce_pushing_' . $mapping_object_id, 1, $seconds );
-			set_transient( 'salesforce_pushing_object_id', $mapping_object_id );
+			$mapping_object_id = $this->create_object_map($object, $object_id, $this->mappings->generate_temporary_id('push'), $mapping, true);
+			set_transient('salesforce_pushing_' . $mapping_object_id, 1, $seconds);
+			set_transient('salesforce_pushing_object_id', $mapping_object_id);
 			$mapping_object = $this->mappings->get_object_maps(
 				array(
 					'id' => $mapping_object_id,
@@ -672,7 +672,7 @@ 
 
 			// setup SF record type. CampaignMember objects get their Campaign's type
 			// i am still a bit confused about this
-			if ( $mapping['salesforce_record_type_default'] !== $this->mappings->salesforce_default_record_type && empty( $params['RecordTypeId'] ) && ( 'CampaignMember' !== $mapping['salesforce_object'] ) ) {
+			if ($mapping['salesforce_record_type_default'] !== $this->mappings->salesforce_default_record_type && empty($params['RecordTypeId']) && ('CampaignMember' !== $mapping['salesforce_object'])) {
 				$params['RecordTypeId'] = $mapping['salesforce_record_type_default'];
 			}
 
@@ -684,61 +684,61 @@ 
 				// returns a $salesforce_id.
 				// it should keep NULL if there is no match
 				// the function that calls this hook needs to check the mapping to make sure the WordPress object is the right type
-				$salesforce_id = apply_filters( 'object_sync_for_salesforce_find_sf_object_match', null, $object, $mapping, 'push' );
+				$salesforce_id = apply_filters('object_sync_for_salesforce_find_sf_object_match', null, $object, $mapping, 'push');
 
 				// hook to allow other plugins to do something right before Salesforce data is saved
 				// ex: run WordPress methods on an object if it exists, or do something in preparation for it if it doesn't
-				do_action( 'object_sync_for_salesforce_pre_push', $salesforce_id, $mapping, $object, $object_id, $params );
+				do_action('object_sync_for_salesforce_pre_push', $salesforce_id, $mapping, $object, $object_id, $params);
 
 				// hook to allow other plugins to change params on update actions only
 				// use hook to map fields between the WordPress and Salesforce objects
 				// returns $params.
-				$params = apply_filters( 'object_sync_for_salesforce_push_update_params_modify', $params, $salesforce_id, $mapping, $object );
+				$params = apply_filters('object_sync_for_salesforce_push_update_params_modify', $params, $salesforce_id, $mapping, $object);
 
-				if ( isset( $prematch_field_wordpress ) || isset( $key_field_wordpress ) || null !== $salesforce_id ) {
+				if (isset($prematch_field_wordpress) || isset($key_field_wordpress) || null !== $salesforce_id) {
 
 					// if either prematch criteria exists, make the values queryable
 
-					if ( isset( $prematch_field_wordpress ) ) {
+					if (isset($prematch_field_wordpress)) {
 						// a prematch has been specified, attempt an upsert().
 						// prematch values with punctuation need to be escaped
-						$encoded_prematch_value = rawurlencode( $prematch_value );
+						$encoded_prematch_value = rawurlencode($prematch_value);
 						// for at least 'email' fields, periods also need to be escaped:
 						// https://developer.salesforce.com/forums?id=906F000000099xPIAQ
-						$encoded_prematch_value = str_replace( '.', '%2E', $encoded_prematch_value );
+						$encoded_prematch_value = str_replace('.', '%2E', $encoded_prematch_value);
 					}
 
-					if ( isset( $key_field_wordpress ) ) {
+					if (isset($key_field_wordpress)) {
 						// an external key has been specified, attempt an upsert().
 						// external key values with punctuation need to be escaped
-						$encoded_key_value = rawurlencode( $key_value );
+						$encoded_key_value = rawurlencode($key_value);
 						// for at least 'email' fields, periods also need to be escaped:
 						// https://developer.salesforce.com/forums?id=906F000000099xPIAQ
-						$encoded_key_value = str_replace( '.', '%2E', $encoded_key_value );
+						$encoded_key_value = str_replace('.', '%2E', $encoded_key_value);
 					}
 
-					if ( isset( $prematch_field_wordpress ) ) {
+					if (isset($prematch_field_wordpress)) {
 						$upsert_key   = $prematch_field_salesforce;
 						$upsert_value = $encoded_prematch_value;
-					} elseif ( isset( $key_field_wordpress ) ) {
+					} elseif (isset($key_field_wordpress)) {
 						$upsert_key   = $key_field_salesforce;
 						$upsert_value = $encoded_key_value;
 					}
 
-					if ( null !== $salesforce_id ) {
+					if (null !== $salesforce_id) {
 						$upsert_key   = 'Id';
 						$upsert_value = $salesforce_id;
 					}
 
 					$op = 'Upsert';
 
-					$result = $sfapi->object_upsert( $mapping['salesforce_object'], $upsert_key, $upsert_value, $params );
+					$result = $sfapi->object_upsert($mapping['salesforce_object'], $upsert_key, $upsert_value, $params);
 
 					// Handle upsert responses.
-					switch ( $sfapi->response['code'] ) {
+					switch ($sfapi->response['code']) {
 						// On Upsert:update retrieved object.
 						case '204':
-							$sf_object             = $sfapi->object_readby_external_id( $mapping['salesforce_object'], $upsert_key, $upsert_value );
+							$sf_object             = $sfapi->object_readby_external_id($mapping['salesforce_object'], $upsert_key, $upsert_value);
 							$salesforce_data['id'] = $sf_object['data']['Id'];
 							break;
 						// Handle duplicate records.
@@ -749,43 +749,43 @@ 
 				} else {
 					// No key or prematch field exists on this field map object, create a new object in Salesforce.
 					$op     = 'Create';
-					$result = $sfapi->object_create( $mapping['salesforce_object'], $params );
+					$result = $sfapi->object_create($mapping['salesforce_object'], $params);
 				} // End if().
-			} catch ( Object_Sync_Sf_Exception $e ) {
+			} catch (Object_Sync_Sf_Exception $e) {
 				// create log entry for failed create or upsert
 				$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: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value if there is one, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					isset( $salesforce_id ) ? ' ' . esc_attr( $salesforce_id ) : '',
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					isset($salesforce_id) ? ' ' . esc_attr($salesforce_id) : '',
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					$e->getMessage(),
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 				return;
 			} // End try().
 
-			if ( ! isset( $salesforce_data ) ) {
+			if ( ! isset($salesforce_data)) {
 				// if we didn't set $salesforce_data already, set it now to api call result
 				$salesforce_data = $result['data'];
 			}
@@ -794,78 +794,78 @@ 
 			// this means the object has already been created/updated in Salesforce
 			// this is not redundant because this is where it creates the object mapping rows in WordPress if the object does not already have one (we are still inside $is_new === TRUE here)
 
-			if ( empty( $result['errorCode'] ) ) {
+			if (empty($result['errorCode'])) {
 				$salesforce_id = $salesforce_data['id'];
 				$status        = 'success';
 
-				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: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $salesforce_id ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($salesforce_id),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					'',
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// update that mapping object
 				$mapping_object['salesforce_id']     = $salesforce_id;
-				$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
-				$mapping_object                      = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+				$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
+				$mapping_object                      = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 				// hook for push success
-				do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 			} else {
 
 				// create log entry for failed create or upsert
 				// this is part of the drupal module but i am failing to understand when it would ever fire, since the catch should catch the errors
 				// if we see this in the log entries, we can understand what it does, but probably not until then
 				$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: placeholders are: 1) error code the Salesforce API returned, 2) what operation is happening, 3) the name of the WordPress object type, 4) the WordPress id field name, 5) the WordPress object id value
-				$title = sprintf( esc_html__( '%1$s error syncing: %2$s to Salesforce (WordPress %3$s with %4$s of %5$s)', 'object-sync-for-salesforce' ),
-					absint( $salesforce_data['errorCode'] ),
-					esc_attr( $op ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('%1$s error syncing: %2$s to Salesforce (WordPress %3$s with %4$s of %5$s)', 'object-sync-for-salesforce'),
+					absint($salesforce_data['errorCode']),
+					esc_attr($op),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				// translators: placeholders are 1) the name of the Salesforce object type, 2) the error message returned from the Salesforce APIs
-				$body = sprintf( '<p>' . esc_html__( 'Object: %1$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Message: %2$s', 'object-sync-for-salesforce' ) . '</p>',
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_html( $salesforce_data['message'] )
+				$body = sprintf('<p>' . esc_html__('Object: %1$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Message: %2$s', 'object-sync-for-salesforce') . '</p>',
+					esc_attr($mapping['salesforce_object']),
+					esc_html($salesforce_data['message'])
 				);
 
 				$logging->setup(
 					$title,
 					$body,
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 				return;
 			} // End if().
@@ -873,41 +873,41 @@ 
 			// $is_new is false here; we are updating an already mapped object
 
 			// right here we should set the pushing transient
-			set_transient( 'salesforce_pushing_' . $mapping_object['id'], 1, $seconds );
-			set_transient( 'salesforce_pushing_object_id', $mapping_object['id'] );
+			set_transient('salesforce_pushing_' . $mapping_object['id'], 1, $seconds);
+			set_transient('salesforce_pushing_object_id', $mapping_object['id']);
 
 			// there is an existing object link
 			// if the last sync is greater than the last time this object was updated, skip it
 			// this keeps us from doing redundant syncs
-			$mapping_object['object_updated'] = current_time( 'mysql' );
-			if ( $mapping_object['last_sync'] > $mapping_object['object_updated'] ) {
+			$mapping_object['object_updated'] = current_time('mysql');
+			if ($mapping_object['last_sync'] > $mapping_object['object_updated']) {
 				$status = 'notice';
-				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: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the Salesforce Id value
-				$title = sprintf( esc_html__( 'Notice: %1$s: Did not sync WordPress %2$s with %3$s of %4$s with Salesforce Id %5$s because the last sync timestamp was greater than the object updated timestamp.', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] ),
-					esc_attr( $mapping_object['salesforce_id'] )
+				$title = sprintf(esc_html__('Notice: %1$s: Did not sync WordPress %2$s with %3$s of %4$s with Salesforce Id %5$s because the last sync timestamp was greater than the object updated timestamp.', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"]),
+					esc_attr($mapping_object['salesforce_id'])
 				);
 
 				// translators: placeholders are 1) when a sync on this mapping last occured, 2) when the object was last updated
-				$body = sprintf( '<p>' . esc_html__( 'Last sync time: %1$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Object updated time: %2$s', 'object-sync-for-salesforce' ) . '</p>',
-					esc_attr( $mapping_object['last_sync'] ),
-					esc_html( $mapping_object['object_updated'] )
+				$body = sprintf('<p>' . esc_html__('Last sync time: %1$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Object updated time: %2$s', 'object-sync-for-salesforce') . '</p>',
+					esc_attr($mapping_object['last_sync']),
+					esc_html($mapping_object['object_updated'])
 				);
 
 				$logging->setup(
 					$title,
 					$body,
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 				return;
@@ -918,71 +918,71 @@ 
 
 				// hook to allow other plugins to do something right before Salesforce data is saved
 				// ex: run WordPress methods on an object if it exists, or do something in preparation for it if it doesn't
-				do_action( 'object_sync_for_salesforce_pre_push', $mapping_object['salesforce_id'], $mapping, $object, $object_id, $params );
+				do_action('object_sync_for_salesforce_pre_push', $mapping_object['salesforce_id'], $mapping, $object, $object_id, $params);
 
 				// hook to allow other plugins to change params on update actions only
 				// use hook to map fields between the WordPress and Salesforce objects
 				// returns $params.
-				$params = apply_filters( 'object_sync_for_salesforce_push_update_params_modify', $params, $mapping_object['salesforce_id'], $mapping, $object );
+				$params = apply_filters('object_sync_for_salesforce_push_update_params_modify', $params, $mapping_object['salesforce_id'], $mapping, $object);
 
 				$op     = 'Update';
-				$result = $sfapi->object_update( $mapping['salesforce_object'], $mapping_object['salesforce_id'], $params );
+				$result = $sfapi->object_update($mapping['salesforce_object'], $mapping_object['salesforce_id'], $params);
 
 				$mapping_object['last_sync_status']  = $this->mappings->status_success;
-				$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
+				$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
 
 				$status = 'success';
-				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: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $mapping_object['salesforce_id'] ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($mapping_object['salesforce_id']),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					'',
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push success
-				do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 
-			} catch ( Object_Sync_Sf_Exception $e ) {
+			} catch (Object_Sync_Sf_Exception $e) {
 				// create log entry for failed update
 				$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: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $mapping_object['salesforce_id'] ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($mapping_object['salesforce_id']),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					$e->getMessage(),
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
@@ -990,16 +990,16 @@ 
 				$mapping_object['last_sync_message'] = $e->getMessage();
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 			} // End try().
 
 			// tell the mapping object - whether it is new or already existed - how we just used it
 			$mapping_object['last_sync_action'] = 'push';
-			$mapping_object['last_sync']        = current_time( 'mysql' );
+			$mapping_object['last_sync']        = current_time('mysql');
 
 			// update that mapping object
-			$result = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+			$result = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 		} // End if(). this is the end of the if is_new stuff
 
@@ -1021,9 +1021,9 @@ 
 	*   This is the database row for the map object
 	*
 	*/
-	private function create_object_map( $wordpress_object, $id_field_name, $salesforce_id, $field_mapping, $pending = false ) {
+	private function create_object_map($wordpress_object, $id_field_name, $salesforce_id, $field_mapping, $pending = false) {
 
-		if ( true === $pending ) {
+		if (true === $pending) {
 			$action = 'pending';
 		} else {
 			$action = 'created';
@@ -1032,15 +1032,15 @@ 
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(
 			array(
-				'wordpress_id'      => $wordpress_object[ $id_field_name ], // wordpress unique id
+				'wordpress_id'      => $wordpress_object[$id_field_name], // wordpress unique id
 				'salesforce_id'     => $salesforce_id, // salesforce unique id. we don't care what kind of object it is at this point
 				'wordpress_object'  => $field_mapping['wordpress_object'], // keep track of what kind of wp object this is
-				'last_sync'         => current_time( 'mysql' ),
+				'last_sync'         => current_time('mysql'),
 				'last_sync_action'  => 'push',
 				'last_sync_status'  => $this->mappings->status_success,
 				// translators: placeholder is for the action that occurred on the mapping object (pending or created)
-				'last_sync_message' => sprintf( esc_html__( 'Mapping object %1$s via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__,
-					esc_attr( $action )
+				'last_sync_message' => sprintf(esc_html__('Mapping object %1$s via function: ', 'object-sync-for-salesforce') . __FUNCTION__,
+					esc_attr($action)
 				),
 				'action'            => $action,
 			)

classes/wordpress.php

Spacing +491 added lines, -491 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,42 +822,42 @@ 
 		}
 
 		// 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',
 			);
 
-			foreach ( $params as $key => $value ) {
-				if ( 'wp_insert_user' === $value['method_modify'] ) {
-					$content[ $key ] = $value['value'];
-					unset( $params[ $key ] );
+			foreach ($params as $key => $value) {
+				if ('wp_insert_user' === $value['method_modify']) {
+					$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,
@@ -866,18 +866,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 {
@@ -914,47 +914,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.
@@ -962,7 +962,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'],
@@ -970,21 +970,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 {
@@ -993,23 +993,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,
@@ -1030,28 +1030,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,
@@ -1061,7 +1061,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');
 
 		}
 
@@ -1083,10 +1083,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;
 	}
 
@@ -1103,18 +1103,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;
 		}
 
@@ -1122,31 +1122,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,
@@ -1157,11 +1157,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 {
@@ -1199,68 +1199,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.
@@ -1268,38 +1268,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 {
@@ -1311,22 +1311,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,
@@ -1348,38 +1348,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,
@@ -1390,7 +1390,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');
 
 		}
 
@@ -1412,8 +1412,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;
 	}
 
@@ -1429,56 +1429,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');
 
 		}
 
@@ -1510,64 +1510,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.
@@ -1575,38 +1575,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 {
@@ -1618,22 +1618,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,
@@ -1658,60 +1658,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,
@@ -1719,12 +1719,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().
 
@@ -1747,8 +1747,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;
 	}
 
@@ -1765,45 +1765,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,
@@ -1812,11 +1812,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 {
@@ -1854,48 +1854,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.
@@ -1903,17 +1903,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;
@@ -1921,17 +1921,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 {
@@ -1940,21 +1940,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,
@@ -1976,36 +1976,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,
@@ -2014,11 +2014,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 {
@@ -2046,11 +2046,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;
 	}
 
@@ -2066,52 +2066,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,
@@ -2120,11 +2120,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 {
@@ -2161,79 +2161,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.
@@ -2241,33 +2241,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 {
@@ -2276,22 +2276,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,
@@ -2312,34 +2312,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,
@@ -2348,11 +2348,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 {
@@ -2380,8 +2380,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;
 	}
 
@@ -2405,9 +2405,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_');
 	}
 
 	/**
@@ -2416,7 +2416,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);
 	}
 
 	/**
@@ -2427,16 +2427,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);
 	}
 
 	/**
@@ -2445,10 +2445,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);
 	}
 
 	/**
@@ -2457,10 +2457,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);
 	}
 
 	/**
@@ -2471,10 +2471,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;
 	}
 

classes/deactivate.php

Indentation +31 added lines, -31 removed lines

@@ -18,13 +18,13 @@ 
 	protected $version;
 
 	/**
-	* Constructor which sets up deactivate hooks
-	* @param object $wpdb
-	* @param string $version
-	* @param string $slug
-	* @param array $schedulable_classes
-	*
-	*/
+	 * Constructor which sets up deactivate hooks
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param string $slug
+	 * @param array $schedulable_classes
+	 *
+	 */
 	public function __construct( $wpdb, $version, $slug, $schedulable_classes ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -42,10 +42,10 @@ 
 	}
 
 	/**
-	* Drop database tables for Salesforce
-	* This removes the tables for fieldmaps (between types of objects) and object maps (between indidual instances of objects)
-	*
-	*/
+	 * Drop database tables for Salesforce
+	 * This removes the tables for fieldmaps (between types of objects) and object maps (between indidual instances of objects)
+	 *
+	 */
 	public function wordpress_salesforce_drop_tables() {
 		$field_map_table  = $this->wpdb->prefix . 'object_sync_sf_field_map';
 		$object_map_table = $this->wpdb->prefix . 'object_sync_sf_object_map';
@@ -55,10 +55,10 @@ 
 	}
 
 	/**
-	* Clear the scheduled tasks
-	* This removes all the scheduled tasks that are included in the plugin's $schedulable_classes array
-	*
-	*/
+	 * Clear the scheduled tasks
+	 * This removes all the scheduled tasks that are included in the plugin's $schedulable_classes array
+	 *
+	 */
 	public function clear_schedule() {
 		foreach ( $this->schedulable_classes as $key => $value ) {
 			wp_clear_scheduled_hook( $key );
@@ -66,21 +66,21 @@ 
 	}
 
 	/**
-	* Delete the log post type
-	* This removes the log post type
-	*
-	*/
+	 * Delete the log post type
+	 * This removes the log post type
+	 *
+	 */
 	public function delete_log_post_type() {
 		unregister_post_type( 'wp_log' );
 	}
 
 	/**
-	* Remove roles and capabilities
-	* This removes the configure_salesforce capability from the admin role
-	*
-	* It also allows other plugins to remove the capability from other roles
-	*
-	*/
+	 * Remove roles and capabilities
+	 * This removes the configure_salesforce capability from the admin role
+	 *
+	 * It also allows other plugins to remove the capability from other roles
+	 *
+	 */
 	public function remove_roles_capabilities() {
 
 		// by default, only administrators can configure the plugin
@@ -100,18 +100,18 @@ 
 	}
 
 	/**
-	* Flush the plugin cache
-	*
-	*/
+	 * Flush the plugin cache
+	 *
+	 */
 	public function flush_plugin_cache() {
 		$sfwp_transients = new Object_Sync_Sf_WordPress_Transient( 'sfwp_transients' );
 		$sfwp_transients->flush();
 	}
 
 	/**
-	* Clear the plugin options
-	*
-	*/
+	 * Clear the plugin options
+	 *
+	 */
 	public function delete_plugin_options() {
 		$table          = $this->wpdb->prefix . 'options';
 		$plugin_options = $this->wpdb->get_results( 'SELECT option_name FROM ' . $table . ' WHERE option_name LIKE "object_sync_for_salesforce_%"', ARRAY_A );

Spacing +26 added lines, -26 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -25,19 +25,19 @@ 
 	* @param array $schedulable_classes
 	*
 	*/
-	public function __construct( $wpdb, $version, $slug, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $slug, $schedulable_classes) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->schedulable_classes = $schedulable_classes;
-		$delete_data               = (int) get_option( 'object_sync_for_salesforce_delete_data_on_uninstall', 0 );
-		if ( 1 === $delete_data ) {
-			register_deactivation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'wordpress_salesforce_drop_tables' ) );
-			register_deactivation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'clear_schedule' ) );
-			register_deactivation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'delete_log_post_type' ) );
-			register_deactivation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'remove_roles_capabilities' ) );
-			register_deactivation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'flush_plugin_cache' )
+		$delete_data               = (int) get_option('object_sync_for_salesforce_delete_data_on_uninstall', 0);
+		if (1 === $delete_data) {
+			register_deactivation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'wordpress_salesforce_drop_tables'));
+			register_deactivation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'clear_schedule'));
+			register_deactivation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'delete_log_post_type'));
+			register_deactivation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'remove_roles_capabilities'));
+			register_deactivation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'flush_plugin_cache')
 			);
-			register_deactivation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'delete_plugin_options' ) );
+			register_deactivation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'delete_plugin_options'));
 		}
 	}
 
@@ -49,9 +49,9 @@ 
 	public function wordpress_salesforce_drop_tables() {
 		$field_map_table  = $this->wpdb->prefix . 'object_sync_sf_field_map';
 		$object_map_table = $this->wpdb->prefix . 'object_sync_sf_object_map';
-		$this->wpdb->query( 'DROP TABLE IF EXISTS ' . $field_map_table );
-		$this->wpdb->query( 'DROP TABLE IF EXISTS ' . $object_map_table );
-		delete_option( 'object_sync_for_salesforce_db_version' );
+		$this->wpdb->query('DROP TABLE IF EXISTS ' . $field_map_table);
+		$this->wpdb->query('DROP TABLE IF EXISTS ' . $object_map_table);
+		delete_option('object_sync_for_salesforce_db_version');
 	}
 
 	/**
@@ -60,8 +60,8 @@ 
 	*
 	*/
 	public function clear_schedule() {
-		foreach ( $this->schedulable_classes as $key => $value ) {
-			wp_clear_scheduled_hook( $key );
+		foreach ($this->schedulable_classes as $key => $value) {
+			wp_clear_scheduled_hook($key);
 		}
 	}
 
@@ -71,7 +71,7 @@ 
 	*
 	*/
 	public function delete_log_post_type() {
-		unregister_post_type( 'wp_log' );
+		unregister_post_type('wp_log');
 	}
 
 	/**
@@ -84,16 +84,16 @@ 
 	public function remove_roles_capabilities() {
 
 		// by default, only administrators can configure the plugin
-		$role = get_role( 'administrator' );
-		$role->remove_cap( 'configure_salesforce' );
+		$role = get_role('administrator');
+		$role->remove_cap('configure_salesforce');
 
 		// hook that allows other roles to configure the plugin as well
-		$roles = apply_filters( 'object_sync_for_salesforce_roles_configure_salesforce', null );
+		$roles = apply_filters('object_sync_for_salesforce_roles_configure_salesforce', null);
 
 		// for each role that we have, remove the configure salesforce capability
-		if ( null !== $roles ) {
-			foreach ( $roles as $role ) {
-				$role->remove_cap( 'configure_salesforce' );
+		if (null !== $roles) {
+			foreach ($roles as $role) {
+				$role->remove_cap('configure_salesforce');
 			}
 		}
 
@@ -104,7 +104,7 @@ 
 	*
 	*/
 	public function flush_plugin_cache() {
-		$sfwp_transients = new Object_Sync_Sf_WordPress_Transient( 'sfwp_transients' );
+		$sfwp_transients = new Object_Sync_Sf_WordPress_Transient('sfwp_transients');
 		$sfwp_transients->flush();
 	}
 
@@ -114,9 +114,9 @@ 
 	*/
 	public function delete_plugin_options() {
 		$table          = $this->wpdb->prefix . 'options';
-		$plugin_options = $this->wpdb->get_results( 'SELECT option_name FROM ' . $table . ' WHERE option_name LIKE "object_sync_for_salesforce_%"', ARRAY_A );
-		foreach ( $plugin_options as $option ) {
-			delete_option( $option['option_name'] );
+		$plugin_options = $this->wpdb->get_results('SELECT option_name FROM ' . $table . ' WHERE option_name LIKE "object_sync_for_salesforce_%"', ARRAY_A);
+		foreach ($plugin_options as $option) {
+			delete_option($option['option_name']);
 		}
 	}
 

classes/logging.php

Spacing +57 added lines, -57 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -28,12 +28,12 @@ 
 	 * @param string $version The version of this plugin.
 	 * @throws \Exception
 	 */
-	public function __construct( $wpdb, $version ) {
+	public function __construct($wpdb, $version) {
 		$this->wpdb    = $wpdb;
 		$this->version = $version;
 
-		$this->enabled         = get_option( 'object_sync_for_salesforce_enable_logging', false );
-		$this->statuses_to_log = get_option( 'object_sync_for_salesforce_statuses_to_log', array() );
+		$this->enabled         = get_option('object_sync_for_salesforce_enable_logging', false);
+		$this->statuses_to_log = get_option('object_sync_for_salesforce_statuses_to_log', array());
 
 		$this->schedule_name = 'wp_logging_prune_routine';
 
@@ -47,26 +47,26 @@ 
 	 * @throws \Exception
 	 */
 	private function init() {
-		if ( '1' === $this->enabled ) {
-			add_filter( 'cron_schedules', array( $this, 'add_prune_interval' ) );
-			add_filter( 'wp_log_types', array( $this, 'set_log_types' ), 10, 1 );
-			add_filter( 'wp_logging_should_we_prune', array( $this, 'set_prune_option' ), 10, 1 );
-			add_filter( 'wp_logging_prune_when', array( $this, 'set_prune_age' ), 10, 1 );
-			add_filter( 'wp_logging_prune_query_args', array( $this, 'set_prune_args' ), 10, 1 );
-			add_filter( 'wp_logging_post_type_args', array( $this, 'set_log_visibility' ), 10, 1 );
-
-			$schedule_unit = get_option( 'object_sync_for_salesforce_logs_how_often_unit', '' );
-			$schedule_number = get_option( 'object_sync_for_salesforce_logs_how_often_number', '' );
-			$frequency = $this->get_schedule_frequency( $schedule_unit, $schedule_number );
+		if ('1' === $this->enabled) {
+			add_filter('cron_schedules', array($this, 'add_prune_interval'));
+			add_filter('wp_log_types', array($this, 'set_log_types'), 10, 1);
+			add_filter('wp_logging_should_we_prune', array($this, 'set_prune_option'), 10, 1);
+			add_filter('wp_logging_prune_when', array($this, 'set_prune_age'), 10, 1);
+			add_filter('wp_logging_prune_query_args', array($this, 'set_prune_args'), 10, 1);
+			add_filter('wp_logging_post_type_args', array($this, 'set_log_visibility'), 10, 1);
+
+			$schedule_unit = get_option('object_sync_for_salesforce_logs_how_often_unit', '');
+			$schedule_number = get_option('object_sync_for_salesforce_logs_how_often_number', '');
+			$frequency = $this->get_schedule_frequency($schedule_unit, $schedule_number);
 			$key = $frequency['key'];
 
-			if ( ! wp_next_scheduled( $this->schedule_name ) ) {
-				wp_schedule_event( time(), $key, $this->schedule_name );
+			if ( ! wp_next_scheduled($this->schedule_name)) {
+				wp_schedule_event(time(), $key, $this->schedule_name);
 			}
 		}
 	}
 
-	public function set_log_visibility( $log_args ) {
+	public function set_log_visibility($log_args) {
 		// set public to true overrides the WP_DEBUG setting that is the default on the class
 		// capabilities makes it so (currently) only admin users can see the log posts in their admin view
 		// note: there is no actual "public" view for this post type
@@ -82,7 +82,7 @@ 
 			'read_private_posts' => 'configure_salesforce',
 		);
 
-		$log_args = apply_filters( 'object_sync_for_salesforce_logging_post_type_args', $log_args );
+		$log_args = apply_filters('object_sync_for_salesforce_logging_post_type_args', $log_args);
 
 		return $log_args;
 	}
@@ -93,15 +93,15 @@ 
 	 * @param array $schedules An array of scheduled cron items.
 	 * @return array $frequency
 	 */
-	public function add_prune_interval( $schedules ) {
+	public function add_prune_interval($schedules) {
 
-		$schedule_unit   = get_option( 'object_sync_for_salesforce_logs_how_often_unit', '' );
-		$schedule_number = get_option( 'object_sync_for_salesforce_logs_how_often_number', '' );
-		$frequency       = $this->get_schedule_frequency( $schedule_unit, $schedule_number );
+		$schedule_unit   = get_option('object_sync_for_salesforce_logs_how_often_unit', '');
+		$schedule_number = get_option('object_sync_for_salesforce_logs_how_often_number', '');
+		$frequency       = $this->get_schedule_frequency($schedule_unit, $schedule_number);
 		$key             = $frequency['key'];
 		$seconds         = $frequency['seconds'];
 
-		$schedules[ $key ] = array(
+		$schedules[$key] = array(
 			'interval' => $seconds * $schedule_number,
 			'display'  => 'Every ' . $schedule_number . ' ' . $schedule_unit,
 		);
@@ -118,9 +118,9 @@ 
 	 * @param number $number The number of those units.
 	 * @return array
 	 */
-	public function get_schedule_frequency( $unit, $number ) {
+	public function get_schedule_frequency($unit, $number) {
 
-		switch ( $unit ) {
+		switch ($unit) {
 			case 'minutes':
 				$seconds = 60;
 				break;
@@ -149,7 +149,7 @@ 
 	 * @param array $terms An array of string log types in the WP_Logging class.
 	 * @return array $terms
 	 */
-	public function set_log_types( $terms ) {
+	public function set_log_types($terms) {
 		$terms[] = 'salesforce';
 		return $terms;
 	}
@@ -160,9 +160,9 @@ 
 	 * @param string $should_we_prune Whether to prune old log items.
 	 * @return string $should_we_prune Whether to prune old log items.
 	 */
-	public function set_prune_option( $should_we_prune ) {
-		$should_we_prune = get_option( 'object_sync_for_salesforce_prune_logs', $should_we_prune );
-		if ( '1' === $should_we_prune ) {
+	public function set_prune_option($should_we_prune) {
+		$should_we_prune = get_option('object_sync_for_salesforce_prune_logs', $should_we_prune);
+		if ('1' === $should_we_prune) {
 			$should_we_prune = true;
 		}
 		return $should_we_prune;
@@ -174,9 +174,9 @@ 
 	 * @param string $how_old How old the oldest non-pruned log items should be allowed to be.
 	 * @return string $how_old
 	 */
-	public function set_prune_age( $how_old ) {
-		$value = get_option( 'object_sync_for_salesforce_logs_how_old', '' ) . ' ago';
-		if ( '' !== $value ) {
+	public function set_prune_age($how_old) {
+		$value = get_option('object_sync_for_salesforce_logs_how_old', '') . ' ago';
+		if ('' !== $value) {
 			return $value;
 		} else {
 			return $how_old;
@@ -189,7 +189,7 @@ 
 	 * @param array $args Argument array for get_posts determining what posts are eligible for pruning.
 	 * @return array $args
 	 */
-	public function set_prune_args( $args ) {
+	public function set_prune_args($args) {
 		$args['wp_log_type'] = 'salesforce';
 		return $args;
 	}
@@ -213,12 +213,12 @@ 
 	 *
 	 * @return      void
 	 */
-	public function setup( $title, $message, $trigger = 0, $parent = 0, $status ) {
-		if ( '1' === $this->enabled && in_array( $status, maybe_unserialize( $this->statuses_to_log ), true ) ) {
-			$triggers_to_log = get_option( 'object_sync_for_salesforce_triggers_to_log', array() );
+	public function setup($title, $message, $trigger = 0, $parent = 0, $status) {
+		if ('1' === $this->enabled && in_array($status, maybe_unserialize($this->statuses_to_log), true)) {
+			$triggers_to_log = get_option('object_sync_for_salesforce_triggers_to_log', array());
 			// if we force strict on this in_array, it fails because the mapping triggers are bit operators, as indicated in Object_Sync_Sf_Mapping class's method __construct()
-			if ( in_array( $trigger, maybe_unserialize( $triggers_to_log ) ) || 0 === $trigger ) {
-				$this->add( $title, $message, $parent );
+			if (in_array($trigger, maybe_unserialize($triggers_to_log)) || 0 === $trigger) {
+				$this->add($title, $message, $parent);
 			}
 		}
 	}
@@ -241,16 +241,16 @@ 
 	 *
 	 * @return      int The ID of the new log entry
 	 */
-	public static function add( $title = '', $message = '', $parent = 0, $type = 'salesforce' ) {
+	public static function add($title = '', $message = '', $parent = 0, $type = 'salesforce') {
 
 		$log_data = array(
-			'post_title'   => esc_html( $title ),
-			'post_content' => wp_kses_post( $message ),
-			'post_parent'  => absint( $parent ),
-			'log_type'     => esc_attr( $type ),
+			'post_title'   => esc_html($title),
+			'post_content' => wp_kses_post($message),
+			'post_parent'  => absint($parent),
+			'log_type'     => esc_attr($type),
 		);
 
-		return self::insert_log( $log_data );
+		return self::insert_log($log_data);
 
 	}
 
@@ -269,7 +269,7 @@ 
 	 *
 	 * @return      array
 	 */
-	public static function get_logs( $object_id = 0, $type = 'salesforce', $paged = null ) {
+	public static function get_logs($object_id = 0, $type = 'salesforce', $paged = null) {
 		return self::get_connected_logs(
 			array(
 				'post_parent' => (int) $object_id,
@@ -297,20 +297,20 @@ 
 	 *
 	 * @return  array / false
 	 */
-	public static function get_connected_logs( $args = array() ) {
+	public static function get_connected_logs($args = array()) {
 
 		$defaults = array(
 			'post_parent'    => 0,
 			'post_type'      => 'wp_log',
 			'posts_per_page' => 10,
 			'post_status'    => 'publish',
-			'paged'          => get_query_var( 'paged' ),
+			'paged'          => get_query_var('paged'),
 			'log_type'       => 'salesforce',
 		);
 
-		$query_args = wp_parse_args( $args, $defaults );
+		$query_args = wp_parse_args($args, $defaults);
 
-		if ( $query_args['log_type'] && self::valid_type( $query_args['log_type'] ) ) {
+		if ($query_args['log_type'] && self::valid_type($query_args['log_type'])) {
 
 			$query_args['tax_query'] = array(
 				array(
@@ -322,9 +322,9 @@ 
 
 		}
 
-		$logs = get_posts( $query_args );
+		$logs = get_posts($query_args);
 
-		if ( $logs ) {
+		if ($logs) {
 			return $logs;
 		}
 
@@ -349,7 +349,7 @@ 
 	 *
 	 * @return  int
 	 */
-	public static function get_log_count( $object_id = 0, $type = 'salesforce', $meta_query = null ) {
+	public static function get_log_count($object_id = 0, $type = 'salesforce', $meta_query = null) {
 
 		$query_args = array(
 			'post_parent'    => (int) $object_id,
@@ -358,23 +358,23 @@ 
 			'post_status'    => 'publish',
 		);
 
-		if ( ! empty( $type ) && self::valid_type( $type ) ) {
+		if ( ! empty($type) && self::valid_type($type)) {
 
 			$query_args['tax_query'] = array(
 				array(
 					'taxonomy' => 'wp_log_type',
 					'field'    => 'slug',
-					'terms'    => sanitize_key( $type ),
+					'terms'    => sanitize_key($type),
 				),
 			);
 
 		}
 
-		if ( ! empty( $meta_query ) ) {
+		if ( ! empty($meta_query)) {
 			$query_args['meta_query'] = $meta_query;
 		}
 
-		$logs = new WP_Query( $query_args );
+		$logs = new WP_Query($query_args);
 
 		return (int) $logs->post_count;
 

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);
 	}
 }