MinnPost / object-sync-for-salesforce

classes/wordpress.php

Spacing +492 added lines, -492 removed lines

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

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforceFieldTypes.php

Spacing +13 added lines, -13 removed lines

@@ -24,22 +24,22 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-define ("DEPLOYMENT_STATUS_INDEVELOPMENT", 'InDevelopment');
-define ("DEPLOYMENT_STATUS_DEPLOYED", 'Deployed');
+define("DEPLOYMENT_STATUS_INDEVELOPMENT", 'InDevelopment');
+define("DEPLOYMENT_STATUS_DEPLOYED", 'Deployed');
 
-define ("GENDER_NEUTER", 'Neuter');
-define ("GENDER_MASCULINE", 'Masculine');
-define ("GENDER_FEMININE", 'Feminine');
+define("GENDER_NEUTER", 'Neuter');
+define("GENDER_MASCULINE", 'Masculine');
+define("GENDER_FEMININE", 'Feminine');
 
-define ("SHARING_MODEL_PRIVATE", 'Private');
-define ("SHARING_MODEL_READ", 'Read');
-define ("SHARING_MODEL_READWRITE", 'ReadWrite');
+define("SHARING_MODEL_PRIVATE", 'Private');
+define("SHARING_MODEL_READ", 'Read');
+define("SHARING_MODEL_READWRITE", 'ReadWrite');
 
-define ("STARTS_WITH_CONSONANT", 'Consonant');
-define ("STARTS_WITH_VOWEL", 'Vowel');
-define ("STARTS_WITH_SPECIAL", 'Special');
+define("STARTS_WITH_CONSONANT", 'Consonant');
+define("STARTS_WITH_VOWEL", 'Vowel');
+define("STARTS_WITH_SPECIAL", 'Special');
 
-define ("TREAT_BLANKS_AS_BLANK", 'BlankAsBlank');
-define ("TREAT_BLANKS_AS_ZERO", 'BlankAsZero');
+define("TREAT_BLANKS_AS_BLANK", 'BlankAsBlank');
+define("TREAT_BLANKS_AS_ZERO", 'BlankAsZero');
 
 ?>
\ No newline at end of file

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php

Indentation +14 added lines, -14 removed lines

@@ -98,11 +98,11 @@ 
 	 * Connect method to www.salesforce.com
 	 *
 	 * @param string $wsdl   Salesforce.com Partner WSDL
-   * @param object $proxy  (optional) proxy settings with properties host, port,
-   *                       login and password
-   * @param array $soap_options (optional) Additional options to send to the
-   *                       SoapClient constructor. @see
-   *                       http://php.net/manual/en/soapclient.soapclient.php
+	 * @param object $proxy  (optional) proxy settings with properties host, port,
+	 *                       login and password
+	 * @param array $soap_options (optional) Additional options to send to the
+	 *                       SoapClient constructor. @see
+	 *                       http://php.net/manual/en/soapclient.soapclient.php
 	 */
 	public function createConnection($wsdl, $proxy=null, $soap_options=array()) {
 		$phpversion = substr(phpversion(), 0, strpos(phpversion(), '-'));
@@ -122,12 +122,12 @@ 
 		}
 
 		if ($proxy != null) {
-            $proxySettings = array();
-            $proxySettings['proxy_host'] = $proxy->host;
-            $proxySettings['proxy_port'] = $proxy->port; // Use an integer, not a string
-            $proxySettings['proxy_login'] = $proxy->login; 
-            $proxySettings['proxy_password'] = $proxy->password;
-            $soapClientArray = array_merge($soapClientArray, $proxySettings);
+			$proxySettings = array();
+			$proxySettings['proxy_host'] = $proxy->host;
+			$proxySettings['proxy_port'] = $proxy->port; // Use an integer, not a string
+			$proxySettings['proxy_login'] = $proxy->login; 
+			$proxySettings['proxy_password'] = $proxy->password;
+			$soapClientArray = array_merge($soapClientArray, $proxySettings);
 		}
 
   	$this->sforce = $this->getSoapClient($wsdl, $soapClientArray);
@@ -178,7 +178,7 @@ 
 	 * @return LogoutResult
 	 */
 	public function logout() {
-        $this->setHeaders("logout");
+		$this->setHeaders("logout");
 		$arg = new stdClass();
 		return $this->sforce->logout();
 	}
@@ -189,9 +189,9 @@ 
 	 * @return invalidateSessionsResult
 	 */
 	public function invalidateSessions() {
-        $this->setHeaders("invalidateSessions");
+		$this->setHeaders("invalidateSessions");
 		$arg = new stdClass();
-        $this->logout();
+		$this->logout();
 		return $this->sforce->invalidateSessions();
 	} 
  

Spacing +64 added lines, -64 removed lines

@@ -104,11 +104,11 @@ 
    *                       SoapClient constructor. @see
    *                       http://php.net/manual/en/soapclient.soapclient.php
 	 */
-	public function createConnection($wsdl, $proxy=null, $soap_options=array()) {
+	public function createConnection($wsdl, $proxy = null, $soap_options = array()) {
 		$phpversion = substr(phpversion(), 0, strpos(phpversion(), '-'));
 		
-		$soapClientArray = array_merge(array (
-			'user_agent' => 'salesforce-toolkit-php/'.$this->version,
+		$soapClientArray = array_merge(array(
+			'user_agent' => 'salesforce-toolkit-php/' . $this->version,
 			'encoding' => 'utf-8',
 			'trace' => 1,
 			'features' => SOAP_SINGLE_ELEMENT_ARRAYS,
@@ -137,7 +137,7 @@ 
 
 	public function setCallOptions($header) {
 		if ($header != NULL) {
-			$this->callOptions = new SoapHeader($this->namespace, 'CallOptions', array (
+			$this->callOptions = new SoapHeader($this->namespace, 'CallOptions', array(
 		  'client' => $header->client,
 		  'defaultNamespace' => $header->defaultNamespace
 			));
@@ -162,7 +162,7 @@ 
 		if ($this->loginScopeHeader != NULL) {
 			$this->sforce->__setSoapHeaders(array($this->loginScopeHeader));
 		}
-		$result = $this->sforce->login(array (
+		$result = $this->sforce->login(array(
 		 'username' => $username,
 		 'password' => $password
 		));
@@ -216,10 +216,10 @@ 
 		$this->sforce->__setLocation($location);
 	}
 
-	private function setHeaders($call=NULL) {
+	private function setHeaders($call = NULL) {
 		$this->sforce->__setSoapHeaders(NULL);
 		
-		$header_array = array (
+		$header_array = array(
 			$this->sessionHeader
 		);
 
@@ -315,7 +315,7 @@ 
 			'process', 'query', 'retrieve', 'search', 'undelete',
 			'update', 'upsert',
 		);
-		if(in_array($call, $packageVersionHeaderCalls)) {
+		if (in_array($call, $packageVersionHeaderCalls)) {
 			$header = $this->packageVersionHeader;
 			if ($header != NULL) {
 				array_push($header_array, $header);
@@ -328,7 +328,7 @@ 
 
 	public function setAssignmentRuleHeader($header) {
 		if ($header != NULL) {
-			$this->assignmentRuleHeader = new SoapHeader($this->namespace, 'AssignmentRuleHeader', array (
+			$this->assignmentRuleHeader = new SoapHeader($this->namespace, 'AssignmentRuleHeader', array(
 			 'assignmentRuleId' => $header->assignmentRuleId,
 			 'useDefaultRule' => $header->useDefaultRuleFlag
 			));
@@ -339,7 +339,7 @@ 
 
 	public function setEmailHeader($header) {
 		if ($header != NULL) {
-			$this->emailHeader = new SoapHeader($this->namespace, 'EmailHeader', array (
+			$this->emailHeader = new SoapHeader($this->namespace, 'EmailHeader', array(
 			 'triggerAutoResponseEmail' => $header->triggerAutoResponseEmail,
 			 'triggerOtherEmail' => $header->triggerOtherEmail,
 			 'triggerUserEmail' => $header->triggerUserEmail
@@ -351,7 +351,7 @@ 
 
 	public function setLoginScopeHeader($header) {
 		if ($header != NULL) {
-			$this->loginScopeHeader = new SoapHeader($this->namespace, 'LoginScopeHeader', array (
+			$this->loginScopeHeader = new SoapHeader($this->namespace, 'LoginScopeHeader', array(
 		'organizationId' => $header->organizationId,
 		'portalId' => $header->portalId
 			));
@@ -363,7 +363,7 @@ 
 
 	public function setMruHeader($header) {
 		if ($header != NULL) {
-			$this->mruHeader = new SoapHeader($this->namespace, 'MruHeader', array (
+			$this->mruHeader = new SoapHeader($this->namespace, 'MruHeader', array(
 			 'updateMru' => $header->updateMruFlag
 			));
 		} else {
@@ -373,7 +373,7 @@ 
 
 	public function setSessionHeader($id) {
 		if ($id != NULL) {
-			$this->sessionHeader = new SoapHeader($this->namespace, 'SessionHeader', array (
+			$this->sessionHeader = new SoapHeader($this->namespace, 'SessionHeader', array(
 			 'sessionId' => $id
 			));
 			$this->sessionId = $id;
@@ -385,7 +385,7 @@ 
 
 	public function setUserTerritoryDeleteHeader($header) {
 		if ($header != NULL) {
-			$this->userTerritoryDeleteHeader = new SoapHeader($this->namespace, 'UserTerritoryDeleteHeader  ', array (
+			$this->userTerritoryDeleteHeader = new SoapHeader($this->namespace, 'UserTerritoryDeleteHeader  ', array(
 			 'transferToUserId' => $header->transferToUserId
 			));
 		} else {
@@ -395,7 +395,7 @@ 
 
 	public function setQueryOptions($header) {
 		if ($header != NULL) {
-			$this->queryHeader = new SoapHeader($this->namespace, 'QueryOptions', array (
+			$this->queryHeader = new SoapHeader($this->namespace, 'QueryOptions', array(
 			 'batchSize' => $header->batchSize
 			));
 		} else {
@@ -405,7 +405,7 @@ 
 	
 	public function setAllowFieldTruncationHeader($header) {
 		if ($header != NULL) {
-			$this->allowFieldTruncationHeader = new SoapHeader($this->namespace, 'AllowFieldTruncationHeader', array (
+			$this->allowFieldTruncationHeader = new SoapHeader($this->namespace, 'AllowFieldTruncationHeader', array(
 					'allowFieldTruncation' => $header->allowFieldTruncation
 				)
 			);
@@ -417,7 +417,7 @@ 
 	public function setLocaleOptions($header) {
 		if ($header != NULL) {
 			$this->localeOptions = new SoapHeader($this->namespace, 'LocaleOptions',
-				array (
+				array(
 					'language' => $header->language
 				)
 			);
@@ -531,7 +531,7 @@ 
 	  return $this->_sendEmail($arg);
 	} else {
 	  $backtrace = debug_backtrace();
-	  die('Please pass in array to this function:  '.$backtrace[0]['function']);
+	  die('Please pass in array to this function:  ' . $backtrace[0]['function']);
 	}
   }
 
@@ -547,7 +547,7 @@ 
 	  return $this->_sendEmail($arg);
 	} else {
 	  $backtrace = debug_backtrace();
-	  die('Please pass in array to this function:  '.$backtrace[0]['function']);
+	  die('Please pass in array to this function:  ' . $backtrace[0]['function']);
 	}
   } 
 	
@@ -578,10 +578,10 @@ 
 	 */
 	public function delete($ids) {
 		$this->setHeaders("delete");
-		if(count($ids) > 200) {
+		if (count($ids) > 200) {
 			$result = array();
 			$chunked_ids = array_chunk($ids, 200);
-			foreach($chunked_ids as $cids) {
+			foreach ($chunked_ids as $cids) {
 				$arg = new stdClass;
 				$arg->ids = $cids;
 				$result = array_merge($result, $this->sforce->delete($arg)->result);
@@ -636,7 +636,7 @@ 
 			return $this->_process($arg);
 		} else {
 			$backtrace = debug_backtrace();
-			die('Please pass in array to this function:  '.$backtrace[0]['function']);
+			die('Please pass in array to this function:  ' . $backtrace[0]['function']);
 		}
 	}
 
@@ -656,7 +656,7 @@ 
 			return $this->_process($arg);
 		} else {
 			$backtrace = debug_backtrace();
-			die('Please pass in array to this function:  '.$backtrace[0]['function']);
+			die('Please pass in array to this function:  ' . $backtrace[0]['function']);
 		}
 	}
 
@@ -680,7 +680,7 @@ 
 	 * @param string Type   Object Type
 	 * @return DescribeLayoutResult
 	 */
-	public function describeLayout($type, array $recordTypeIds=null) {
+	public function describeLayout($type, array $recordTypeIds = null) {
 		$this->setHeaders("describeLayout");
 		$arg = new stdClass();
 		$arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
@@ -803,7 +803,7 @@ 
 	 */
 	public function query($query) {
 		$this->setHeaders("query");
-		$raw = $this->sforce->query(array (
+		$raw = $this->sforce->query(array(
 					  'queryString' => $query
 		))->result;
 		$QueryResult = new QueryResult($raw);
@@ -837,7 +837,7 @@ 
 	 */
 	public function queryAll($query, $queryOptions = NULL) {
 		$this->setHeaders("queryAll");
-		$raw = $this->sforce->queryAll(array (
+		$raw = $this->sforce->queryAll(array(
 						'queryString' => $query
 		))->result;
 		$QueryResult = new QueryResult($raw);
@@ -924,7 +924,7 @@ 
 
 	public function __construct($response) {
 
-		if($response instanceof SforceSearchResult) {
+		if ($response instanceof SforceSearchResult) {
 			$this->searchRecords = $response->searchRecords;
 		} else {
 			$this->searchRecords = array();
@@ -943,7 +943,7 @@ 
 	}
 }
 
-class QueryResult implements Iterator{
+class QueryResult implements Iterator {
 	public $queryLocator;
 	public $done;
 	public $records;
@@ -960,7 +960,7 @@ 
 		$this->pointer = 0;
 		$this->sf = false;
 
-		if($response instanceof QueryResult) {
+		if ($response instanceof QueryResult) {
 			$this->records = $response->records;
 		} else {
 			$this->records = array();
@@ -1008,8 +1008,8 @@ 
 	public $fields;
 //	public $sobject;
 
-	public function __construct($response=NULL) {
-		if (!isset($response) && !$response) {
+	public function __construct($response = NULL) {
+		if ( ! isset($response) && ! $response) {
 			return;
 		}
 
@@ -1060,7 +1060,7 @@ 
 								} else {
 									// this is for parent to child relationships
 									//$this->queryResult = new QueryResult($item);
-									if (!isset($this->queryResult)) {
+									if ( ! isset($this->queryResult)) {
 										$this->queryResult = array();
 									}
 									array_push($this->queryResult, new QueryResult($item));
@@ -1074,7 +1074,7 @@ 
 									$currentXmlValue = $item;
 								}
 
-								if (!isset($fieldsToConvert)) {
+								if ( ! isset($fieldsToConvert)) {
 									$fieldsToConvert = $currentXmlValue;
 								} else {
 									$fieldsToConvert .= $currentXmlValue;
@@ -1131,7 +1131,7 @@ 
 		}
 	}
 	
-	function __get($name) {	return (isset($this->fields->$name))? $this->fields->$name : false; }
+	function __get($name) {	return (isset($this->fields->$name)) ? $this->fields->$name : false; }
 	function __isset($name) { return isset($this->fields->$name); }
 
 	/**
@@ -1142,10 +1142,10 @@ 
 	function convertFields($any) {
 		$str = preg_replace('{sf:}', '', $any);
 
-		$array = $this->xml2array('<Object xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'.$str.'</Object>', 2);
+		$array = $this->xml2array('<Object xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . $str . '</Object>', 2);
 
 		$xml = new stdClass();
-		if (!count($array['Object']))
+		if ( ! count($array['Object']))
 			return $xml;
 
 		foreach ($array['Object'] as $k=>$v) {
@@ -1163,21 +1163,21 @@ 
 	 * @param string $contents
 	 * @return array
 	 */
-	function xml2array($contents, $get_attributes=1) {
-		if(!$contents) return array();
+	function xml2array($contents, $get_attributes = 1) {
+		if ( ! $contents) return array();
 
-		if(!function_exists('xml_parser_create')) {
+		if ( ! function_exists('xml_parser_create')) {
 			//print "'xml_parser_create()' function not found!";
 			return array('not found');
 		}
 		//Get the XML parser of PHP - PHP must have this module for the parser to work
 		$parser = xml_parser_create();
-		xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, 0 );
-		xml_parser_set_option( $parser, XML_OPTION_SKIP_WHITE, 1 );
-		xml_parse_into_struct( $parser, $contents, $xml_values );
-		xml_parser_free( $parser );
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+		xml_parse_into_struct($parser, $contents, $xml_values);
+		xml_parser_free($parser);
 
-		if(!$xml_values) return;//Hmm...
+		if ( ! $xml_values) return; //Hmm...
 
 		//Initializations
 		$xml_array = array();
@@ -1188,24 +1188,24 @@ 
 		$current = &$xml_array;
 
 		//Go through the tags.
-		foreach($xml_values as $data) {
-			unset($attributes,$value);//Remove existing values, or there will be trouble
+		foreach ($xml_values as $data) {
+			unset($attributes, $value); //Remove existing values, or there will be trouble
 
 			//This command will extract these variables into the foreach scope
 			// tag(string), type(string), level(int), attributes(array).
-			extract($data);//We could use the array by itself, but this cooler.
+			extract($data); //We could use the array by itself, but this cooler.
 
 			$result = '';
 			if ($get_attributes) {
 				switch ($get_attributes) {
 					case 1:
 						$result = array();
-						if(isset($value)) $result['value'] = $value;
+						if (isset($value)) $result['value'] = $value;
 
 						//Set the attributes too.
-						if(isset($attributes)) {
-							foreach($attributes as $attr => $val) {
-								if($get_attributes == 1) $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
+						if (isset($attributes)) {
+							foreach ($attributes as $attr => $val) {
+								if ($get_attributes == 1) $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
 								/**  :TODO: should we change the key name to '_attr'? Someone may use the tagname 'attr'. Same goes for 'value' too */
 							}
 						}
@@ -1218,7 +1218,7 @@ 
 						}
 
 						//Check for nil and ignore other attributes.
-						if (isset($attributes) && isset($attributes['xsi:nil']) && !strcasecmp($attributes['xsi:nil'], 'true')) {
+						if (isset($attributes) && isset($attributes['xsi:nil']) && ! strcasecmp($attributes['xsi:nil'], 'true')) {
 							$result = null;
 						}
 						break;
@@ -1228,39 +1228,39 @@ 
 			}
 
 			//See tag status and do the needed.
-			if($type == "open") {//The starting of the tag '<tag>'
-				$parent[$level-1] = &$current;
+			if ($type == "open") {//The starting of the tag '<tag>'
+				$parent[$level - 1] = &$current;
 
-				if(!is_array($current) or (!in_array($tag, array_keys($current)))) { //Insert New tag
+				if ( ! is_array($current) or ( ! in_array($tag, array_keys($current)))) { //Insert New tag
 					$current[$tag] = $result;
 					$current = &$current[$tag];
 
 				} else { //There was another element with the same tag name
-					if(isset($current[$tag][0])) {
+					if (isset($current[$tag][0])) {
 						array_push($current[$tag], $result);
 					} else {
-						$current[$tag] = array($current[$tag],$result);
+						$current[$tag] = array($current[$tag], $result);
 					}
 					$last = count($current[$tag]) - 1;
 					$current = &$current[$tag][$last];
 				}
 
-			} elseif($type == "complete") { //Tags that ends in 1 line '<tag />'
+			} elseif ($type == "complete") { //Tags that ends in 1 line '<tag />'
 				//See if the key is already taken.
-				if(!isset($current[$tag])) { //New Key
+				if ( ! isset($current[$tag])) { //New Key
 					$current[$tag] = $result;
 
 				} else { //If taken, put all things inside a list(array)
-					if((is_array($current[$tag]) and $get_attributes == 0)//If it is already an array...
+					if ((is_array($current[$tag]) and $get_attributes == 0)//If it is already an array...
 							or (isset($current[$tag][0]) and is_array($current[$tag][0]) and ($get_attributes == 1 || $get_attributes == 2))) {
-						array_push($current[$tag],$result); // ...push the new element into that array.
+						array_push($current[$tag], $result); // ...push the new element into that array.
 					} else { //If it is not an array...
-						$current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value
+						$current[$tag] = array($current[$tag], $result); //...Make it an array using using the existing value and the new value
 					}
 				}
 
-			} elseif($type == 'close') { //End of tag '</tag>'
-				$current = &$parent[$level-1];
+			} elseif ($type == 'close') { //End of tag '</tag>'
+				$current = &$parent[$level - 1];
 			}
 		}
 

Braces +26 added lines, -10 removed lines

@@ -684,8 +684,9 @@ 
 		$this->setHeaders("describeLayout");
 		$arg = new stdClass();
 		$arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-		if (isset($recordTypeIds) && count($recordTypeIds)) 
-			$arg->recordTypeIds = $recordTypeIds;
+		if (isset($recordTypeIds) && count($recordTypeIds)) {
+					$arg->recordTypeIds = $recordTypeIds;
+		}
 		return $this->sforce->describeLayout($arg)->result;
 	}
 
@@ -988,7 +989,9 @@ 
 		while ($this->pointer >= count($this->records)) {
 			// Pointer is larger than (current) result set; see if we can fetch more
 			if ($this->done === false) {
-				if ($this->sf === false) throw new Exception("Dependency not met!");
+				if ($this->sf === false) {
+					throw new Exception("Dependency not met!");
+				}
 				$response = $this->sf->queryMore($this->queryLocator);
 				$this->records = array_merge($this->records, $response->records); // Append more results
 				$this->done = $response->done;
@@ -997,7 +1000,9 @@ 
 				return false; // No more records to fetch
 			}
 		}
-		if (isset($this->records[$this->pointer])) return true;
+		if (isset($this->records[$this->pointer])) {
+			return true;
+		}
 		
 		throw new Exception("QueryResult has gaps in the record data?");
 	}
@@ -1145,8 +1150,9 @@ 
 		$array = $this->xml2array('<Object xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'.$str.'</Object>', 2);
 
 		$xml = new stdClass();
-		if (!count($array['Object']))
-			return $xml;
+		if (!count($array['Object'])) {
+					return $xml;
+		}
 
 		foreach ($array['Object'] as $k=>$v) {
 			$xml->$k = $v;
@@ -1164,7 +1170,9 @@ 
 	 * @return array
 	 */
 	function xml2array($contents, $get_attributes=1) {
-		if(!$contents) return array();
+		if(!$contents) {
+			return array();
+		}
 
 		if(!function_exists('xml_parser_create')) {
 			//print "'xml_parser_create()' function not found!";
@@ -1177,7 +1185,10 @@ 
 		xml_parse_into_struct( $parser, $contents, $xml_values );
 		xml_parser_free( $parser );
 
-		if(!$xml_values) return;//Hmm...
+		if(!$xml_values) {
+			return;
+		}
+		//Hmm...
 
 		//Initializations
 		$xml_array = array();
@@ -1200,12 +1211,17 @@ 
 				switch ($get_attributes) {
 					case 1:
 						$result = array();
-						if(isset($value)) $result['value'] = $value;
+						if(isset($value)) {
+							$result['value'] = $value;
+						}
 
 						//Set the attributes too.
 						if(isset($attributes)) {
 							foreach($attributes as $attr => $val) {
-								if($get_attributes == 1) $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
+								if($get_attributes == 1) {
+									$result['attr'][$attr] = $val;
+								}
+								//Set all the attributes in a array called 'attr'
 								/**  :TODO: should we change the key name to '_attr'? Someone may use the tagname 'attr'. Same goes for 'value' too */
 							}
 						}

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php

Indentation +43 added lines, -43 removed lines

@@ -28,177 +28,177 @@
 
 class SforceCustomObject {
   public function setDeploymentStatus($deploymentStatus) {
-    $this->deploymentStatus = $deploymentStatus;
+	$this->deploymentStatus = $deploymentStatus;
   }
 
   public function setDescription($description) {
-    $this->description = $description;
+	$this->description = $description;
   }
 
   public function setEnableActivities($enableActivities) {
-    $this->enableActivities = $enableActivities;
+	$this->enableActivities = $enableActivities;
   }
 
   public function setEnableDivisions($enableDivisions) {
-    $this->enableDivisions = $enableDivisions;
+	$this->enableDivisions = $enableDivisions;
   }
 
   public function setEnableHistory($enableHistory) {
-    $this->enableHistory = $enableHistory;
+	$this->enableHistory = $enableHistory;
   }
 
   public function setEnableReports($enableReports) {
-    $this->enableReports = $enableReports;
+	$this->enableReports = $enableReports;
   }
 
   public function setFields($fields) {
-    $this->fields = $fields;
+	$this->fields = $fields;
   }
 
   public function setFullName($fullName) {
-    $this->fullName = $fullName;
+	$this->fullName = $fullName;
   }
 
   public function setGender($gender) {
-    $this->gender = $gender;
+	$this->gender = $gender;
   }
 
   public function setHousehold($household) {
-    $this->household = $household;
+	$this->household = $household;
   }
 
   public function setLabel($label) {
-    $this->label = $label;
+	$this->label = $label;
   }
 
   public function setNameField($nameField) {
-    $this->nameField = $nameField;
+	$this->nameField = $nameField;
   }
 
   public function setPluralLabel($pluralLabel) {
-    $this->pluralLabel = $pluralLabel;
+	$this->pluralLabel = $pluralLabel;
   }
 
   public function setSharingModel($sharingModel) {
-    $this->sharingModel = $sharingModel;
+	$this->sharingModel = $sharingModel;
   }
 
   public function setStartsWith($startsWith) {
-    $this->startsWith = $startsWith;
+	$this->startsWith = $startsWith;
   }
 }
 
 class SforceCustomField {
   public function setCaseSensitive($caseSensitive) {
-    $this->caseSensitive = $caseSensitive;
+	$this->caseSensitive = $caseSensitive;
   }
 
   public function setDefaultValue($defaultValue) {
-    $this->defaultValue = $defaultValue;
+	$this->defaultValue = $defaultValue;
   }
 
   public function setDescription($description) {
-    $this->description = $description;
+	$this->description = $description;
   }
 
   public function setDisplayFormat($displayFormat) {
-    $this->displayFormat = $displayFormat;
+	$this->displayFormat = $displayFormat;
   }
 
   public function setExternalId($externalId) {
-    $this->externalId = $externalId;
+	$this->externalId = $externalId;
   }
 
   public function setFormula($formula) {
-    $this->formula = $formula;
+	$this->formula = $formula;
   }
 
   public function setFormulaTreatBlankAs($formulaTreatBlankAs) {
-    $this->formulaTreatBlankAs = $formulaTreatBlankAs;
+	$this->formulaTreatBlankAs = $formulaTreatBlankAs;
   }
 
   public function setFullName($fullName) {
-    $this->fullName = $fullName;
+	$this->fullName = $fullName;
   }
 
   public function setInlineHelpText($inlineHelpText) {
-    $this->inlineHelpText = $inlineHelpText;
+	$this->inlineHelpText = $inlineHelpText;
   }
 
   public function setLabel($label) {
-    $this->label = $label;
+	$this->label = $label;
   }
 
   public function setLength($length) {
-    $this->length = $length;
+	$this->length = $length;
   }
 
   public function setMaskChar($maskChar) {
-    $this->maskChar = $maskChar;
+	$this->maskChar = $maskChar;
   }
 
   public function setMaskType($maskType) {
-    $this->maskType = $maskType;
+	$this->maskType = $maskType;
   }
 
   public function setPicklist($picklist) {
-    $this->picklist = $picklist;
+	$this->picklist = $picklist;
   }
 
   public function setPopulateExistingRows($populateExistingRows) {
-    $this->populateExistingRows = $populateExistingRows;
+	$this->populateExistingRows = $populateExistingRows;
   }
 
   public function setPrecision($precision) {
-    $this->precision = $precision;
+	$this->precision = $precision;
   }
 
   public function setReferenceTo($referenceTo) {
-    $this->referenceTo = $referenceTo;
+	$this->referenceTo = $referenceTo;
   }
 
   public function setRelationshipName($relationshipName) {
-    $this->relationshipName = $relationshipName;
+	$this->relationshipName = $relationshipName;
   }
 
   public function setRequired($required) {
-    $this->required = $required;
+	$this->required = $required;
   }
 
   public function setScale($scale) {
-    $this->scale = $scale;
+	$this->scale = $scale;
   }
 
   public function setStartingNumber($startingNumber) {
-    $this->startingNumber = $startingNumber;
+	$this->startingNumber = $startingNumber;
   }
 
   public function setSummarizeField($summarizeField) {
-    $this->summarizeField = $summarizeField;
+	$this->summarizeField = $summarizeField;
   }
 
   public function setSummaryFilterItems($summaryFilterItems) {
-    $this->summaryFilterItems = $summaryFilterItems;
+	$this->summaryFilterItems = $summaryFilterItems;
   }
 
   public function setSummaryForeignKey($summaryForeignKey) {
-    $this->summaryForeignKey = $summaryForeignKey;
+	$this->summaryForeignKey = $summaryForeignKey;
   }
 
   public function setSummaryOperation($summaryOperation) {
-    $this->summaryOperation = $summaryOperation;
+	$this->summaryOperation = $summaryOperation;
   }
 
   public function setType($type) {
-    $this->type = $type;
+	$this->type = $type;
   }
 
   public function setUnique($unique) {
-    $this->unique = $unique;
+	$this->unique = $unique;
   }
 
   public function setVisibleLines($visibleLines) {
-    $this->visibleLines = $visibleLines;
+	$this->visibleLines = $visibleLines;
   }
 }
 ?>

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php

Indentation +45 added lines, -45 removed lines

@@ -96,8 +96,8 @@ 
   public $portalId;

 

   public function __construct($orgId = NULL, $portalId = NULL) {

-    $this->organizationId = $orgId;

-    $this->portalId = $portalId;

+	$this->organizationId = $orgId;

+	$this->portalId = $portalId;

   }

 }

 

@@ -141,42 +141,42 @@ 
 }

 

 class AllowFieldTruncationHeader {

-    public $allowFieldTruncation;

+	public $allowFieldTruncation;

     

-    public function __construct($allowFieldTruncation) {

-        $this->allowFieldTruncation = $allowFieldTruncation;

-    }

+	public function __construct($allowFieldTruncation) {

+		$this->allowFieldTruncation = $allowFieldTruncation;

+	}

 }

 

 class LocaleOptions {

-    public $language;

+	public $language;

     

-    /**

-     * Class constructor.

-     * 

-     * @param string $language

-     * @return void

-     */

-    public function __construct($language) {

-        $this->language = $language;

-    }

+	/**

+	 * Class constructor.

+	 * 

+	 * @param string $language

+	 * @return void

+	 */

+	public function __construct($language) {

+		$this->language = $language;

+	}

 }

 

 class PackageVersionHeader {

-    /**

-     * @var array $packageVersions

-     */

-    public $packageVersions;

+	/**

+	 * @var array $packageVersions

+	 */

+	public $packageVersions;

     

-    /**

-     * Class constructor.

-     * 

-     * @param array $packageVersions

-     * @return void

-     */

-    public function __construct($packageVersions) {

-        $this->packageVersions = $packageVersions;

-    }

+	/**

+	 * Class constructor.

+	 * 

+	 * @param array $packageVersions

+	 * @return void

+	 */

+	public function __construct($packageVersions) {

+		$this->packageVersions = $packageVersions;

+	}

 }

 

 /**

@@ -184,23 +184,23 @@ 
  * @see PackageVersionHeader

  */

 class PackageVersion {

-    public $majorNumber;

-    public $minorNumber;

-    public $namespace;

+	public $majorNumber;

+	public $minorNumber;

+	public $namespace;

     

-    /**

-     * Class constructor.

-     * 

-     * @param int $majorNumber

-     * @param int $minorNumber

-     * @param string $namespace

-     * @return void

-     */

-    public function __construct($majorNumber, $minorNumber, $namespace) {

-        $this->majorNumber = $majorNumber;

-        $this->minorNumber = $minorNumber;

-        $this->namespace = $namespace;

-    }

+	/**

+	 * Class constructor.

+	 * 

+	 * @param int $majorNumber

+	 * @param int $minorNumber

+	 * @param string $namespace

+	 * @return void

+	 */

+	public function __construct($majorNumber, $minorNumber, $namespace) {

+		$this->majorNumber = $majorNumber;

+		$this->minorNumber = $minorNumber;

+		$this->namespace = $namespace;

+	}

 }

 

 ?>

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	public $client;

 	public $defaultNamespace;

 

-	public function __construct($client, $defaultNamespace=NULL) {

+	public function __construct($client, $defaultNamespace = NULL) {

 		$this->client = $client;

 		$this->defaultNamespace = $defaultNamespace;

 	}

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforceEnterpriseClient.php

Indentation +55 added lines, -55 removed lines

@@ -37,7 +37,7 @@ 
 class SforceEnterpriseClient extends SforceBaseClient {

   const ENTERPRISE_NAMESPACE = 'urn:enterprise.soap.sforce.com';

   public function __construct() {

-    $this->namespace = self::ENTERPRISE_NAMESPACE;

+	$this->namespace = self::ENTERPRISE_NAMESPACE;

   }

   /**

    * Adds one or more new individual objects to your organization's data.

@@ -47,26 +47,26 @@ 
    * @return SaveResult

    */

   public function create($sObjects, $type) {

-    $arg = [];

-    foreach ($sObjects as $sObject) {

-    	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

+	$arg = [];

+	foreach ($sObjects as $sObject) {

+		// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

    		$xmlStr = '';

-    	if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

-    		foreach($sObject->fieldsToNull as $fieldToNull) {

-    			$xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

-    		}

-    	}

-    	// ------

+		if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

+			foreach($sObject->fieldsToNull as $fieldToNull) {

+				$xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

+			}

+		}

+		// ------

     	

-      $soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

-    	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

-    	if($xmlStr != '') {

-    		$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

-    	}

-    	// ------

-    	$arg[] = $soapObject;

-    }

-    return parent::_create(new SoapParam($arg, "sObjects"));

+	  $soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

+		// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

+		if($xmlStr != '') {

+			$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

+		}

+		// ------

+		$arg[] = $soapObject;

+	}

+	return parent::_create(new SoapParam($arg, "sObjects"));

   }

   /**

    * Updates one or more new individual objects to your organization's data.

@@ -77,28 +77,28 @@ 
    */

   public function update($sObjects, $type, $assignment_header = NULL, $mru_header = NULL) {

 	$arg = new stdClass;

-    	$arg->sObjects = [];

-    foreach ($sObjects as $sObject) {

-    	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

+		$arg->sObjects = [];

+	foreach ($sObjects as $sObject) {

+		// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

    		$xmlStr = '';

-    	if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

-    		foreach($sObject->fieldsToNull as $fieldToNull) {

-    			$xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

-    		}

-    	}

-    	// ------

+		if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

+			foreach($sObject->fieldsToNull as $fieldToNull) {

+				$xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

+			}

+		}

+		// ------

     	

-    	$soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

+		$soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

     	

-    	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

-    	if($xmlStr != '') {

-    		$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

-    	}

-    	// ------

-    	$arg->sObjects[] = $soapObject;

-    }

+		// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

+		if($xmlStr != '') {

+			$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

+		}

+		// ------

+		$arg->sObjects[] = $soapObject;

+	}

     

-    return parent::_update($arg);

+	return parent::_update($arg);

   }

   /**

    * Creates new objects and updates existing objects; uses a custom field to

@@ -112,29 +112,29 @@ 
    * @return UpsertResult

    */

   public function upsert($ext_Id, $sObjects, $type = 'Contact') {

-    $arg = new stdClass;

-    $arg->sObjects = [];

-    $arg->externalIDFieldName = new SoapVar($ext_Id, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');

-    foreach ($sObjects as $sObject) {

-      // FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

+	$arg = new stdClass;

+	$arg->sObjects = [];

+	$arg->externalIDFieldName = new SoapVar($ext_Id, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');

+	foreach ($sObjects as $sObject) {

+	  // FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

    	  $xmlStr = '';

-      if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

-    	foreach($sObject->fieldsToNull as $fieldToNull) {

-    	  $xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

-    	}

-      }

-      // ------

+	  if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

+		foreach($sObject->fieldsToNull as $fieldToNull) {

+		  $xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

+		}

+	  }

+	  // ------

     	

-      $soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

+	  $soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

 	  // FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

 	  if($xmlStr != '') {

 	  	$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

 	  }

 	  // ------

 	  $arg->sObjects[] = $soapObject;

-    }

+	}

    

-    return parent::_upsert($arg);

+	return parent::_upsert($arg);

   }

   /**

    * Merge records

@@ -144,10 +144,10 @@ 
    * @return unknown

    */

   public function merge($mergeRequest, $type) {

-    $mergeRequest->masterRecord = new SoapVar($mergeRequest->masterRecord, SOAP_ENC_OBJECT, $type, $this->namespace);

-    $arg = new stdClass;

-    $arg->request = new SoapVar($mergeRequest, SOAP_ENC_OBJECT, 'MergeRequest', $this->namespace);

-    return parent::_merge($arg);

+	$mergeRequest->masterRecord = new SoapVar($mergeRequest->masterRecord, SOAP_ENC_OBJECT, $type, $this->namespace);

+	$arg = new stdClass;

+	$arg->request = new SoapVar($mergeRequest, SOAP_ENC_OBJECT, 'MergeRequest', $this->namespace);

+	return parent::_merge($arg);

   }

 }

 ?>

Spacing +9 added lines, -9 removed lines

@@ -51,8 +51,8 @@ 
     foreach ($sObjects as $sObject) {

     	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

    		$xmlStr = '';

-    	if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

-    		foreach($sObject->fieldsToNull as $fieldToNull) {

+    	if (isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

+    		foreach ($sObject->fieldsToNull as $fieldToNull) {

     			$xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

     		}

     	}

@@ -60,7 +60,7 @@ 
     	

       $soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

     	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

-    	if($xmlStr != '') {

+    	if ($xmlStr != '') {

     		$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

     	}

     	// ------

@@ -81,8 +81,8 @@ 
     foreach ($sObjects as $sObject) {

     	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

    		$xmlStr = '';

-    	if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

-    		foreach($sObject->fieldsToNull as $fieldToNull) {

+    	if (isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

+    		foreach ($sObject->fieldsToNull as $fieldToNull) {

     			$xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

     		}

     	}

@@ -91,7 +91,7 @@ 
     	$soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

     	

     	// FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

-    	if($xmlStr != '') {

+    	if ($xmlStr != '') {

     		$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

     	}

     	// ------

@@ -118,8 +118,8 @@ 
     foreach ($sObjects as $sObject) {

       // FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #1)

    	  $xmlStr = '';

-      if(isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

-    	foreach($sObject->fieldsToNull as $fieldToNull) {

+      if (isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {

+    	foreach ($sObject->fieldsToNull as $fieldToNull) {

     	  $xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';

     	}

       }

@@ -127,7 +127,7 @@ 
     	

       $soapObject = new SoapVar($sObject, SOAP_ENC_OBJECT, $type, $this->namespace);

 	  // FIX for fieldsToNull issue - allow array in fieldsToNull (STEP #2)

-	  if($xmlStr != '') {

+	  if ($xmlStr != '') {

 	  	$soapObject->enc_value->fieldsToNull = new SoapVar(new SoapVar($xmlStr, XSD_ANYXML), SOAP_ENC_ARRAY);

 	  }

 	  // ------

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php

Indentation +77 added lines, -77 removed lines

@@ -43,26 +43,26 @@ 
  // xsi:type forces PHP SOAP to just leave the tags intact
  class SforceSoapClient extends SoapClient {
    function __doRequest($request, $location, $action, $version, $one_way=0) {
-     $response = parent::__doRequest($request, $location, $action, $version, $one_way);
+	 $response = parent::__doRequest($request, $location, $action, $version, $one_way);
 
-     // Quick check to only parse the XML here if we think we need to
-     if (strpos($response, '<sf:OldValue') === false && strpos($response, '<sf:NewValue') === false) {
-       return $response;
-     }
+	 // Quick check to only parse the XML here if we think we need to
+	 if (strpos($response, '<sf:OldValue') === false && strpos($response, '<sf:NewValue') === false) {
+	   return $response;
+	 }
 
-     $dom = new DOMDocument();
-     $dom->loadXML($response);
+	 $dom = new DOMDocument();
+	 $dom->loadXML($response);
 
-     $nodeList = $dom->getElementsByTagName('NewValue');
-     foreach ($nodeList as $node) {
-       $node->removeAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'type');
-     }
-     $nodeList = $dom->getElementsByTagName('OldValue');
-     foreach ($nodeList as $node) {
-       $node->removeAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'type');
-     }
+	 $nodeList = $dom->getElementsByTagName('NewValue');
+	 foreach ($nodeList as $node) {
+	   $node->removeAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'type');
+	 }
+	 $nodeList = $dom->getElementsByTagName('OldValue');
+	 foreach ($nodeList as $node) {
+	   $node->removeAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'type');
+	 }
 
-     return $dom->saveXML();      
+	 return $dom->saveXML();      
    }
  }
 
@@ -75,11 +75,11 @@ 
   const PARTNER_NAMESPACE = 'urn:partner.soap.sforce.com';
 	
   public function __construct() {
-    $this->namespace = self::PARTNER_NAMESPACE;
+	$this->namespace = self::PARTNER_NAMESPACE;
   }
   
   protected function getSoapClient($wsdl, $options) {
-    // Workaround an issue in parsing OldValue and NewValue in histories
+	// Workaround an issue in parsing OldValue and NewValue in histories
 		return new SforceSoapClient($wsdl, $options);      
   }
 
@@ -89,14 +89,14 @@ 
    * @return SaveResult
    */
   public function create($sObjects) {
-    $arg = new stdClass;
-    foreach ($sObjects as $sObject) {
-      if (isset ($sObject->fields)) {
-        $sObject->any = $this->_convertToAny($sObject->fields);
-      }
-    }
-    $arg->sObjects = $sObjects;
-    return parent::_create($arg);
+	$arg = new stdClass;
+	foreach ($sObjects as $sObject) {
+	  if (isset ($sObject->fields)) {
+		$sObject->any = $this->_convertToAny($sObject->fields);
+	  }
+	}
+	$arg->sObjects = $sObjects;
+	return parent::_create($arg);
   }
 
   /**
@@ -107,14 +107,14 @@ 
    * @return mixed
    */
   public function merge($mergeRequest) {
-    if (isset($mergeRequest->masterRecord)) {
-      if (isset($mergeRequest->masterRecord->fields)) {
-        $mergeRequest->masterRecord->any = $this->_convertToAny($mergeRequest->masterRecord->fields);
-      }
-      //return parent::merge($mergeRequest, $type);
-      $arg->request = $mergeRequest;
-      return $this->_merge($arg);
-    }
+	if (isset($mergeRequest->masterRecord)) {
+	  if (isset($mergeRequest->masterRecord->fields)) {
+		$mergeRequest->masterRecord->any = $this->_convertToAny($mergeRequest->masterRecord->fields);
+	  }
+	  //return parent::merge($mergeRequest, $type);
+	  $arg->request = $mergeRequest;
+	  return $this->_merge($arg);
+	}
   }
 
   /**
@@ -122,18 +122,18 @@ 
    * @param array $request
    */
   public function sendSingleEmail($request) {
-    if (is_array($request)) {
-      $messages = array();
-      foreach ($request as $r) {
-        $email = new SoapVar($r, SOAP_ENC_OBJECT, 'SingleEmailMessage', $this->namespace);
-        array_push($messages, $email);
-      }
-      $arg->messages = $messages;
-      return parent::_sendEmail($arg);
-    } else {
-      $backtrace = debug_backtrace();
-      die('Please pass in array to this function:  '.$backtrace[0]['function']);
-    }
+	if (is_array($request)) {
+	  $messages = array();
+	  foreach ($request as $r) {
+		$email = new SoapVar($r, SOAP_ENC_OBJECT, 'SingleEmailMessage', $this->namespace);
+		array_push($messages, $email);
+	  }
+	  $arg->messages = $messages;
+	  return parent::_sendEmail($arg);
+	} else {
+	  $backtrace = debug_backtrace();
+	  die('Please pass in array to this function:  '.$backtrace[0]['function']);
+	}
   }
 
   /**
@@ -141,18 +141,18 @@ 
    * @param array $request
    */
   public function sendMassEmail($request) {
-    if (is_array($request)) {
-      $messages = array();
-      foreach ($request as $r) {
-        $email = new SoapVar($r, SOAP_ENC_OBJECT, 'MassEmailMessage', $this->namespace);
-        array_push($messages, $email);
-      }
-      $arg->messages = $messages;
-      return parent::_sendEmail($arg);
-    } else {
-      $backtrace = debug_backtrace();
-      die('Please pass in array to this function:  '.$backtrace[0]['function']);
-    }
+	if (is_array($request)) {
+	  $messages = array();
+	  foreach ($request as $r) {
+		$email = new SoapVar($r, SOAP_ENC_OBJECT, 'MassEmailMessage', $this->namespace);
+		array_push($messages, $email);
+	  }
+	  $arg->messages = $messages;
+	  return parent::_sendEmail($arg);
+	} else {
+	  $backtrace = debug_backtrace();
+	  die('Please pass in array to this function:  '.$backtrace[0]['function']);
+	}
   }
 
   /**
@@ -161,14 +161,14 @@ 
    * @return UpdateResult
    */
   public function update($sObjects) {
-    $arg = new stdClass;
-    foreach ($sObjects as $sObject) {
-      if (isset($sObject->fields)) {
-        $sObject->any = $this->_convertToAny($sObject->fields);
-      }
-    }
-    $arg->sObjects = $sObjects;
-    return parent::_update($arg);
+	$arg = new stdClass;
+	foreach ($sObjects as $sObject) {
+	  if (isset($sObject->fields)) {
+		$sObject->any = $this->_convertToAny($sObject->fields);
+	  }
+	}
+	$arg->sObjects = $sObjects;
+	return parent::_update($arg);
   }
 
   /**
@@ -182,16 +182,16 @@ 
    * @return UpsertResult
    */
   public function upsert($ext_Id, $sObjects) {
-    //		$this->_setSessionHeader();
-    $arg = new stdClass;
-    $arg->externalIDFieldName = new SoapVar($ext_Id, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-    foreach ($sObjects as $sObject) {
-      if (isset ($sObject->fields)) {
-        $sObject->any = $this->_convertToAny($sObject->fields);
-      }
-    }
-    $arg->sObjects = $sObjects;
-    return parent::_upsert($arg);
+	//		$this->_setSessionHeader();
+	$arg = new stdClass;
+	$arg->externalIDFieldName = new SoapVar($ext_Id, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+	foreach ($sObjects as $sObject) {
+	  if (isset ($sObject->fields)) {
+		$sObject->any = $this->_convertToAny($sObject->fields);
+	  }
+	}
+	$arg->sObjects = $sObjects;
+	return parent::_upsert($arg);
   }
   
   /**
@@ -218,7 +218,7 @@ 
   		};
   	}else {
   		$sobject = new SObject($response);
-        array_push($arr, $sobject);
+		array_push($arr, $sobject);
   	}
   	return $arr;
   }

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
  // string content into the parsed output and loses the tag name. Removing the
  // xsi:type forces PHP SOAP to just leave the tags intact
  class SforceSoapClient extends SoapClient {
-   function __doRequest($request, $location, $action, $version, $one_way=0) {
+   function __doRequest($request, $location, $action, $version, $one_way = 0) {
      $response = parent::__doRequest($request, $location, $action, $version, $one_way);
 
      // Quick check to only parse the XML here if we think we need to
@@ -132,7 +132,7 @@ 
       return parent::_sendEmail($arg);
     } else {
       $backtrace = debug_backtrace();
-      die('Please pass in array to this function:  '.$backtrace[0]['function']);
+      die('Please pass in array to this function:  ' . $backtrace[0]['function']);
     }
   }
 
@@ -151,7 +151,7 @@ 
       return parent::_sendEmail($arg);
     } else {
       $backtrace = debug_backtrace();
-      die('Please pass in array to this function:  '.$backtrace[0]['function']);
+      die('Please pass in array to this function:  ' . $backtrace[0]['function']);
     }
   }
 
@@ -211,12 +211,12 @@ 
    */
   private function _retrieveResult($response) {
   	$arr = array();
-  	if(is_array($response)) {
-  		foreach($response as $r) {
+  	if (is_array($response)) {
+  		foreach ($response as $r) {
   			$sobject = new SObject($r);
-  			array_push($arr,$sobject);
+  			array_push($arr, $sobject);
   		};
-  	}else {
+  	} else {
   		$sobject = new SObject($response);
         array_push($arr, $sobject);
   	}

Braces +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
   			$sobject = new SObject($r);
   			array_push($arr,$sobject);
   		};
-  	}else {
+  	} else {
   		$sobject = new SObject($response);
         array_push($arr, $sobject);
   	}

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php

Indentation +22 added lines, -22 removed lines

@@ -32,31 +32,31 @@ 
 
 class Email {
   public function setBccSender($bccSender) {
-    $this->bccSender = $bccSender;
+	$this->bccSender = $bccSender;
   }
 
   public function setEmailPriority($priority) {
-    $this->emailPriority = $priority;
+	$this->emailPriority = $priority;
   }
    
   public function setSubject($subject) {
-    $this->subject = $subject;
+	$this->subject = $subject;
   }
 
   public function setSaveAsActivity($saveAsActivity) {
-    $this->saveAsActivity = $saveAsActivity;
+	$this->saveAsActivity = $saveAsActivity;
   }
 
   public function setReplyTo($replyTo) {
-    $this->replyTo = $replyTo;
+	$this->replyTo = $replyTo;
   }
 
   public function setUseSignature($useSignature) {
-    $this->useSignature = $useSignature;
+	$this->useSignature = $useSignature;
   }
   
   public function setSenderDisplayName($name) {
-    $this->senderDisplayName = $name;
+	$this->senderDisplayName = $name;
   }
 }
 
@@ -65,66 +65,66 @@ 
 
 
   public function setBccAddresses($addresses) {
-    $this->bccAddresses = $addresses;
+	$this->bccAddresses = $addresses;
   }
   public $ccAddresses;
 
   public function setCcAddresses($addresses) {
-    $this->ccAddresses = $addresses;
+	$this->ccAddresses = $addresses;
   }
 
   public function setCharset($charset) {
-    $this->charset = $charset;
+	$this->charset = $charset;
   }
 
   public function setHtmlBody($htmlBody) {
-    $this->htmlBody = $htmlBody;
+	$this->htmlBody = $htmlBody;
   }
 
   public function setOrgWideEmailAddressId($orgWideEmailAddressId) {
-    $this->orgWideEmailAddressId = $orgWideEmailAddressId;
+	$this->orgWideEmailAddressId = $orgWideEmailAddressId;
   }
 
   public function setPlainTextBody($plainTextBody) {
-    $this->plainTextBody = $plainTextBody;
+	$this->plainTextBody = $plainTextBody;
   }
 
   public function setTargetObjectId($targetObjectId) {
-    $this->targetObjectId = $targetObjectId;
+	$this->targetObjectId = $targetObjectId;
   }
 
   public function setTemplateId($templateId) {
-    $this->templateId = $templateId;
+	$this->templateId = $templateId;
   }
 
   public function setToAddresses($array) {
-    $this->toAddresses = $array;
+	$this->toAddresses = $array;
   }
 
   public function setWhatId($whatId) {
-    $this->whatId = $whatId;
+	$this->whatId = $whatId;
   }
 
   public function setFileAttachments($array) {
-    $this->fileAttachments = $array;
+	$this->fileAttachments = $array;
   }
 
   public function setDocumentAttachments($array) {
-    $this->documentAttachments = $array;
+	$this->documentAttachments = $array;
   }
 }
 
 class MassEmailMessage extends Email {
   public function setTemplateId($templateId) {
-    $this->templateId = $templateId;
+	$this->templateId = $templateId;
   }
 
   public function setWhatIds($array) {
-    $this->whatIds = $array;
+	$this->whatIds = $array;
   }
 
   public function setTargetObjectIds($array) {
-    $this->targetObjectIds = $array;
+	$this->targetObjectIds = $array;
   }
 }
 ?>
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-define ("EMAIL_PRIORITY_HIGHEST", 'Highest');
-define ("EMAIL_PRIORITY_HIGH", 'High');
-define ("EMAIL_PRIORITY_NORMAL", 'Normal');
-define ("EMAIL_PRIORITY_LOW", 'Low');
-define ("EMAIL_PRIORITY_LOWEST", 'Lowest');
+define("EMAIL_PRIORITY_HIGHEST", 'Highest');
+define("EMAIL_PRIORITY_HIGH", 'High');
+define("EMAIL_PRIORITY_NORMAL", 'Normal');
+define("EMAIL_PRIORITY_LOW", 'Low');
+define("EMAIL_PRIORITY_LOWEST", 'Lowest');
 
 class Email {
   public function setBccSender($bccSender) {

vendor/developerforce/force.com-toolkit-for-php/soapclient/SforceMetadataClient.php

Indentation +65 added lines, -65 removed lines

@@ -36,46 +36,46 @@ 
 
   public function __construct($wsdl, $loginResult, $sforceConn) {
 
-    $soapClientArray = null;
+	$soapClientArray = null;
     
 	  $phpversion = substr(phpversion(), 0, strpos(phpversion(), '-'));
 //		if (phpversion() > '5.1.2') {
 	  if ($phpversion > '5.1.2') {
-      $soapClientArray = array (
-      'user_agent' => 'salesforce-toolkit-php/'.$this->version,
-      'encoding' => 'utf-8',
-      'trace' => 1,
-      'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP,
-      'sessionId' => $loginResult->sessionId
-      );
-    } else {
-      $soapClientArray = array (
+	  $soapClientArray = array (
 	  'user_agent' => 'salesforce-toolkit-php/'.$this->version,
-      'encoding' => 'utf-8',
-      'trace' => 1,
-      'sessionId' => $loginResult->sessionId
-      );
-    }
-    $this->sforce = new SoapClient($wsdl,$soapClientArray);
-    //$this->sforce->__setSoapHeaders($header_array);
+	  'encoding' => 'utf-8',
+	  'trace' => 1,
+	  'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP,
+	  'sessionId' => $loginResult->sessionId
+	  );
+	} else {
+	  $soapClientArray = array (
+	  'user_agent' => 'salesforce-toolkit-php/'.$this->version,
+	  'encoding' => 'utf-8',
+	  'trace' => 1,
+	  'sessionId' => $loginResult->sessionId
+	  );
+	}
+	$this->sforce = new SoapClient($wsdl,$soapClientArray);
+	//$this->sforce->__setSoapHeaders($header_array);
 
 
-    $sessionVar = array(
-      'sessionId' => new SoapVar($loginResult->sessionId, XSD_STRING)
-    );
+	$sessionVar = array(
+	  'sessionId' => new SoapVar($loginResult->sessionId, XSD_STRING)
+	);
 
-    $headerBody = new SoapVar($sessionVar, SOAP_ENC_OBJECT);
+	$headerBody = new SoapVar($sessionVar, SOAP_ENC_OBJECT);
 
-    $session_header = new SoapHeader($this->namespace, 'SessionHeader', $headerBody, false);
+	$session_header = new SoapHeader($this->namespace, 'SessionHeader', $headerBody, false);
 
-    $header_array = array (
-    $session_header
-    );
+	$header_array = array (
+	$session_header
+	);
 
-    $this->sforce->__setSoapHeaders($header_array);
+	$this->sforce->__setSoapHeaders($header_array);
 
-    $this->sforce->__setLocation($loginResult->metadataServerUrl);
-    return $this->sforce;
+	$this->sforce->__setLocation($loginResult->metadataServerUrl);
+	return $this->sforce;
   }
 
   /**
@@ -83,10 +83,10 @@ 
    * login.
    */
   protected function _setLoginHeader($loginResult) {
-    $this->sessionId = $loginResult->sessionId;
-    $this->setSessionHeader($this->sessionId);
-    $serverURL = $loginResult->serverUrl;
-    $this->setEndPoint($serverURL);
+	$this->sessionId = $loginResult->sessionId;
+	$this->setSessionHeader($this->sessionId);
+	$serverURL = $loginResult->serverUrl;
+	$this->setEndPoint($serverURL);
   }
 
   /**
@@ -95,8 +95,8 @@ 
    * @param string $location   Location
    */
   public function setEndpoint($location) {
-    $this->location = $location;
-    $this->sforce->__setLocation($location);
+	$this->location = $location;
+	$this->sforce->__setLocation($location);
   }
 
   /**
@@ -105,67 +105,67 @@ 
    * @param string $sessionId   Session ID
    */
   public function setSessionHeader($sessionId) {
-    $this->sforce->__setSoapHeaders(NULL);
-    $session_header = new SoapHeader($this->namespace, 'SessionHeader', array (
-    'sessionId' => $sessionId
-    ));
-    $this->sessionId = $sessionId;
-    $header_array = array (
-    $session_header
-    );
-    $this->_setClientId($header_array);
-    $this->sforce->__setSoapHeaders($header_array);
+	$this->sforce->__setSoapHeaders(NULL);
+	$session_header = new SoapHeader($this->namespace, 'SessionHeader', array (
+	'sessionId' => $sessionId
+	));
+	$this->sessionId = $sessionId;
+	$header_array = array (
+	$session_header
+	);
+	$this->_setClientId($header_array);
+	$this->sforce->__setSoapHeaders($header_array);
   }
   
   private function getObjtype($obj) {
-    $classArray = explode('\\', get_class($obj));
-    $objtype = array_pop($classArray);
-    if (strpos($objtype, 'Sforce', 0) === 0) {
-      $objtype = substr($objtype, 6);
-    }
-    return $objtype;
+	$classArray = explode('\\', get_class($obj));
+	$objtype = array_pop($classArray);
+	if (strpos($objtype, 'Sforce', 0) === 0) {
+	  $objtype = substr($objtype, 6);
+	}
+	return $objtype;
   }
 
   public function create($obj) {
-    $encodedObj = new stdClass();
-    $encodedObj->metadata = new SoapVar($obj, SOAP_ENC_OBJECT, $this->getObjtype($obj), $this->namespace);
+	$encodedObj = new stdClass();
+	$encodedObj->metadata = new SoapVar($obj, SOAP_ENC_OBJECT, $this->getObjtype($obj), $this->namespace);
      
-    return $this->sforce->create($encodedObj);
+	return $this->sforce->create($encodedObj);
   }
   
   public function update($obj) {    
-    $encodedObj = new stdClass();
-    $encodedObj->UpdateMetadata = $obj;
-    $encodedObj->UpdateMetadata->metadata = new SoapVar($obj->metadata, SOAP_ENC_OBJECT, $this->getObjtype($obj->metadata), $this->namespace);
+	$encodedObj = new stdClass();
+	$encodedObj->UpdateMetadata = $obj;
+	$encodedObj->UpdateMetadata->metadata = new SoapVar($obj->metadata, SOAP_ENC_OBJECT, $this->getObjtype($obj->metadata), $this->namespace);
     
-    return $this->sforce->update($encodedObj);
+	return $this->sforce->update($encodedObj);
   }
   
   public function delete($obj) {
-    $encodedObj = new stdClass();
-    $encodedObj->metadata = new SoapVar($obj, SOAP_ENC_OBJECT, $this->getObjtype($obj), $this->namespace);
+	$encodedObj = new stdClass();
+	$encodedObj->metadata = new SoapVar($obj, SOAP_ENC_OBJECT, $this->getObjtype($obj), $this->namespace);
      
-    return $this->sforce->delete($encodedObj);
+	return $this->sforce->delete($encodedObj);
   }  
   
   public function checkStatus($ids) {
-    return $this->sforce->checkStatus($ids);
+	return $this->sforce->checkStatus($ids);
   }  
 
   public function getLastRequest() {
-    return $this->sforce->__getLastRequest();
+	return $this->sforce->__getLastRequest();
   }
 
   public function getLastRequestHeaders() {
-    return $this->sforce->__getLastRequestHeaders();
+	return $this->sforce->__getLastRequestHeaders();
   }
 
   public function getLastResponse() {
-    return $this->sforce->__getLastResponse();
+	return $this->sforce->__getLastResponse();
   }
 
   public function getLastResponseHeaders() {
-    return $this->sforce->__getLastResponseHeaders();
+	return $this->sforce->__getLastResponseHeaders();
   }
 
 

Spacing +8 added lines, -8 removed lines

@@ -41,22 +41,22 @@ 
 	  $phpversion = substr(phpversion(), 0, strpos(phpversion(), '-'));
 //		if (phpversion() > '5.1.2') {
 	  if ($phpversion > '5.1.2') {
-      $soapClientArray = array (
-      'user_agent' => 'salesforce-toolkit-php/'.$this->version,
+      $soapClientArray = array(
+      'user_agent' => 'salesforce-toolkit-php/' . $this->version,
       'encoding' => 'utf-8',
       'trace' => 1,
       'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP,
       'sessionId' => $loginResult->sessionId
       );
     } else {
-      $soapClientArray = array (
-	  'user_agent' => 'salesforce-toolkit-php/'.$this->version,
+      $soapClientArray = array(
+	  'user_agent' => 'salesforce-toolkit-php/' . $this->version,
       'encoding' => 'utf-8',
       'trace' => 1,
       'sessionId' => $loginResult->sessionId
       );
     }
-    $this->sforce = new SoapClient($wsdl,$soapClientArray);
+    $this->sforce = new SoapClient($wsdl, $soapClientArray);
     //$this->sforce->__setSoapHeaders($header_array);
 
 
@@ -68,7 +68,7 @@ 
 
     $session_header = new SoapHeader($this->namespace, 'SessionHeader', $headerBody, false);
 
-    $header_array = array (
+    $header_array = array(
     $session_header
     );
 
@@ -106,11 +106,11 @@ 
    */
   public function setSessionHeader($sessionId) {
     $this->sforce->__setSoapHeaders(NULL);
-    $session_header = new SoapHeader($this->namespace, 'SessionHeader', array (
+    $session_header = new SoapHeader($this->namespace, 'SessionHeader', array(
     'sessionId' => $sessionId
     ));
     $this->sessionId = $sessionId;
-    $header_array = array (
+    $header_array = array(
     $session_header
     );
     $this->_setClientId($header_array);