MinnPost / object-sync-for-salesforce

classes/salesforce_query.php

Indentation +23 added lines, -23 removed lines

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

classes/admin-notice.php

Indentation +12 added lines, -12 removed lines

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

classes/salesforce_soap_partner.php

Indentation +3 added lines, -3 removed lines

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

classes/salesforce.php

Indentation +406 added lines, -406 removed lines

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

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

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;

+	}

 }

 

 ?>

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

   }

 }

 ?>

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