MinnPost / object-sync-for-salesforce

templates/admin/user-profile-salesforce-change.php

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@
 <input type="hidden" name="salesforce_update_mapped_user" value="1" />
-<h2><?php echo esc_html__( 'Salesforce', 'object-sync-for-salesforce' ); ?></h2>
-<p><?php echo esc_html__( 'You can change the Salesforce object that this WordPress user maps to by changing the ID and updating this user.', 'object-sync-for-salesforce' ); ?></p>
+<h2><?php echo esc_html__('Salesforce', 'object-sync-for-salesforce'); ?></h2>
+<p><?php echo esc_html__('You can change the Salesforce object that this WordPress user maps to by changing the ID and updating this user.', 'object-sync-for-salesforce'); ?></p>
 <table class="form-table">
 	<tr>
-		<th><label for="salesforce_id"><?php echo esc_html__( 'Salesforce ID', 'object-sync-for-salesforce' ); ?></label></th>
+		<th><label for="salesforce_id"><?php echo esc_html__('Salesforce ID', 'object-sync-for-salesforce'); ?></label></th>
 		<td>
-			<input type="text" name="salesforce_id" id="salesforce_id" value="<?php if ( isset( $mapping['id'] ) ) { echo esc_html( $mapping['salesforce_id'] ); } ?>" class="regular-text" /><br />
-			<span class="description"><?php echo esc_html__( 'Enter a Salesforce object ID.', 'object-sync-for-salesforce' ); ?></span>
+			<input type="text" name="salesforce_id" id="salesforce_id" value="<?php if (isset($mapping['id'])) { echo esc_html($mapping['salesforce_id']); } ?>" class="regular-text" /><br />
+			<span class="description"><?php echo esc_html__('Enter a Salesforce object ID.', 'object-sync-for-salesforce'); ?></span>
 		</td>
 	</tr>
 </table>

templates/admin/authorized.php

Spacing +2 added lines, -2 removed lines

@@ -1,2 +1,2 @@
-<div class="success"><h2><?php echo esc_html__( 'Salesforce is successfully authenticated.' ); ?></h2></div>
-<p><a class="button button-primary" href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=logout' ) ); ?>"><?php echo esc_html__( 'Disconnect from Salesforce', 'object-sync-for-salesforce' ); ?></a></p>
+<div class="success"><h2><?php echo esc_html__('Salesforce is successfully authenticated.'); ?></h2></div>
+<p><a class="button button-primary" href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=logout')); ?>"><?php echo esc_html__('Disconnect from Salesforce', 'object-sync-for-salesforce'); ?></a></p>

templates/admin/user-profile-salesforce-map.php

Spacing +5 added lines, -5 removed lines

@@ -1,14 +1,14 @@
 <input type="hidden" name="salesforce_create_mapped_user" value="1" />
-<h2><?php echo esc_html__( 'Salesforce', 'object-sync-for-salesforce' ); ?></h2>
-<p><?php echo esc_html__( "This user is not mapped to an object in Salesforce. You can run a push to send this object to Salesforce, which will cause it to follow the plugin's normal mapping conventions, or you can create a manual link to a Salesforce object.", 'object-sync-for-salesforce' ); ?></p>
+<h2><?php echo esc_html__('Salesforce', 'object-sync-for-salesforce'); ?></h2>
+<p><?php echo esc_html__("This user is not mapped to an object in Salesforce. You can run a push to send this object to Salesforce, which will cause it to follow the plugin's normal mapping conventions, or you can create a manual link to a Salesforce object.", 'object-sync-for-salesforce'); ?></p>
 <table class="form-table">
 	<tr>
-		<th><label for="salesforce_id"><?php echo esc_html__( 'Salesforce ID', 'object-sync-for-salesforce' ); ?></label></th>
+		<th><label for="salesforce_id"><?php echo esc_html__('Salesforce ID', 'object-sync-for-salesforce'); ?></label></th>
 		<td>
 			<input type="text" name="salesforce_id" id="salesforce_id" value="" class="regular-text" /><br />
-			<span class="description"><?php echo esc_html__( 'Enter a Salesforce object ID.', 'object-sync-for-salesforce' ); ?></span>
+			<span class="description"><?php echo esc_html__('Enter a Salesforce object ID.', 'object-sync-for-salesforce'); ?></span>
 			<p><strong>or</strong></p>
-			<p><button type="submit" class="button button-secondary push_to_salesforce_button" name="push_new_user_to_salesforce"><?php echo esc_html__( 'Push to Salesforce as new record', 'object-sync-for-salesforce' ); ?></button></p>
+			<p><button type="submit" class="button button-secondary push_to_salesforce_button" name="push_new_user_to_salesforce"><?php echo esc_html__('Push to Salesforce as new record', 'object-sync-for-salesforce'); ?></button></p>
 		</td>
 	</tr>
 </table>

classes/salesforce_query.php

Indentation +23 added lines, -23 removed lines

@@ -22,27 +22,27 @@ 
 	public $conditions = array();
 
 	/**
-	* Constructor which sets the query object type.
-	*
-	* @param string $object_type
-	*   Salesforce object type to query.
-	*/
+	 * Constructor which sets the query object type.
+	 *
+	 * @param string $object_type
+	 *   Salesforce object type to query.
+	 */
 	public function __construct( $object_type = '' ) {
 		$this->object_type = $object_type;
 	}
 
 	/**
-	* Add a condition to the query.
-	*
-	* @param string $field
-	*   Field name.
-	* @param mixed $value
-	*   Condition value. If an array, it will be split into quote enclosed
-	*   strings separated by commas inside of parenthesis. Note that the caller
-	*   must enclose the value in quotes as needed by the SF API.
-	* @param string $operator
-	*   Conditional operator. One of '=', '!=', '<', '>', 'LIKE, 'IN', 'NOT IN'.
-	*/
+	 * Add a condition to the query.
+	 *
+	 * @param string $field
+	 *   Field name.
+	 * @param mixed $value
+	 *   Condition value. If an array, it will be split into quote enclosed
+	 *   strings separated by commas inside of parenthesis. Note that the caller
+	 *   must enclose the value in quotes as needed by the SF API.
+	 * @param string $operator
+	 *   Conditional operator. One of '=', '!=', '<', '>', 'LIKE, 'IN', 'NOT IN'.
+	 */
 	public function add_condition( $field, $value, $operator = '=' ) {
 		if ( is_array( $value ) ) {
 			$value = "('" . implode( "','", $value ) . "')";
@@ -60,13 +60,13 @@ 
 	}
 
 	/**
-	* Implements PHP's magic __toString().
-	*
-	* Function to convert the query to a string to pass to the SF API.
-	*
-	* @return string
-	*   SOQL query ready to be executed the SF API.
-	*/
+	 * Implements PHP's magic __toString().
+	 *
+	 * Function to convert the query to a string to pass to the SF API.
+	 *
+	 * @return string
+	 *   SOQL query ready to be executed the SF API.
+	 */
 	public function __toString() {
 
 		$query  = 'SELECT ';

Spacing +16 added lines, -16 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -27,7 +27,7 @@ 
 	* @param string $object_type
 	*   Salesforce object type to query.
 	*/
-	public function __construct( $object_type = '' ) {
+	public function __construct($object_type = '') {
 		$this->object_type = $object_type;
 	}
 
@@ -43,12 +43,12 @@ 
 	* @param string $operator
 	*   Conditional operator. One of '=', '!=', '<', '>', 'LIKE, 'IN', 'NOT IN'.
 	*/
-	public function add_condition( $field, $value, $operator = '=' ) {
-		if ( is_array( $value ) ) {
-			$value = "('" . implode( "','", $value ) . "')";
+	public function add_condition($field, $value, $operator = '=') {
+		if (is_array($value)) {
+			$value = "('" . implode("','", $value) . "')";
 
 			// Set operator to IN if wasn't already changed from the default.
-			if ( '=' === $operator ) {
+			if ('=' === $operator) {
 				$operator = 'IN';
 			}
 		}
@@ -70,31 +70,31 @@ 
 	public function __toString() {
 
 		$query  = 'SELECT ';
-		$query .= implode( ', ', $this->fields );
+		$query .= implode(', ', $this->fields);
 		$query .= ' FROM ' . $this->object_type;
 
-		if ( count( $this->conditions ) > 0 ) {
+		if (count($this->conditions) > 0) {
 			$where = array();
-			foreach ( $this->conditions as $condition ) {
-				$where[] = implode( ' ', $condition );
+			foreach ($this->conditions as $condition) {
+				$where[] = implode(' ', $condition);
 			}
-			$query .= ' WHERE ' . implode( ' AND ', $where );
+			$query .= ' WHERE ' . implode(' AND ', $where);
 		}
 
-		if ( $this->order ) {
+		if ($this->order) {
 			$query .= ' ORDER BY ';
 			$fields = array();
-			foreach ( $this->order as $field => $direction ) {
+			foreach ($this->order as $field => $direction) {
 				$fields[] = $field . ' ' . $direction;
 			}
-			$query .= implode( ', ', $fields );
+			$query .= implode(', ', $fields);
 		}
 
-		if ( $this->limit ) {
+		if ($this->limit) {
 			$query .= ' LIMIT ' . (int) $this->limit;
 		}
 
-		if ( $this->offset ) {
+		if ($this->offset) {
 			$query .= ' OFFSET ' . (int) $this->offset;
 		}
 

classes/admin-notice.php

Indentation +12 added lines, -12 removed lines

@@ -21,15 +21,15 @@ 
 	protected $template;
 
 	/**
-	* Constructor which sets up the admin_notices hook for rendering
-	*
-	* @param mixed $condition
-	* @param string $message
-	* @param bool $dismissible
-	* @param string $type
-	* @param string $template
-	*
-	*/
+	 * Constructor which sets up the admin_notices hook for rendering
+	 *
+	 * @param mixed $condition
+	 * @param string $message
+	 * @param bool $dismissible
+	 * @param string $type
+	 * @param string $template
+	 *
+	 */
 	public function __construct( $condition, $message, $dismissible = false, $type = '', $template = '' ) {
 		$this->condition   = $condition;
 		$this->message     = $message;
@@ -42,9 +42,9 @@ 
 	}
 
 	/**
-	* Render an admin notice
-	*
-	*/
+	 * Render an admin notice
+	 *
+	 */
 	public function render() {
 
 		// class for the notice to use

Spacing +8 added lines, -8 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -30,14 +30,14 @@ 
 	* @param string $template
 	*
 	*/
-	public function __construct( $condition, $message, $dismissible = false, $type = '', $template = '' ) {
+	public function __construct($condition, $message, $dismissible = false, $type = '', $template = '') {
 		$this->condition   = $condition;
 		$this->message     = $message;
 		$this->dismissible = $dismissible;
 		$this->type        = $type;
 		$this->template    = $template;
 
-		add_action( 'admin_notices', array( $this, 'render' ) );
+		add_action('admin_notices', array($this, 'render'));
 
 	}
 
@@ -49,18 +49,18 @@ 
 
 		// class for the notice to use
 		$class = '';
-		if ( '' !== $this->type ) {
+		if ('' !== $this->type) {
 			$class = ' notice-' . $this->type;
 		}
 
 		$dismissible = '';
-		if ( true === $this->dismissible ) {
+		if (true === $this->dismissible) {
 			$dismissible = ' is-dismissible';
 		}
 
 		// template for notice has a default
-		if ( '' === $this->template ) {
-			$template = plugin_dir_path( __FILE__ ) . '/../templates/admin/notice.php';
+		if ('' === $this->template) {
+			$template = plugin_dir_path(__FILE__) . '/../templates/admin/notice.php';
 		} else {
 			$template = $this->template;
 		}
@@ -68,7 +68,7 @@ 
 		$condition = $this->condition;
 		$message   = $this->message;
 
-		require_once( $template );
+		require_once($template);
 
 	}
 

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/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';