davispeixoto / Force.com-Toolkit-for-PHP

src/Davispeixoto/ForceDotComToolkitForPhp/SforceBaseClient.php

Doc Comments +19 added lines, -3 removed lines

@@ -64,6 +64,9 @@ 
     protected $localeOptions;
     protected $packageVersionHeader;
 
+    /**
+     * @param string $wsdl
+     */
     protected function getSoapClient($wsdl, $options)
     {
         return new SoapClient($wsdl, $options);
@@ -230,6 +233,9 @@ 
         $this->sforce->__setLocation($location);
     }
 
+    /**
+     * @param string $call
+     */
     private function setHeaders($call = null)
     {
         $this->sforce->__setSoapHeaders(null);
@@ -553,6 +559,9 @@ 
         return $this->sforce->create($arg)->result;
     }
 
+    /**
+     * @param stdClass $arg
+     */
     protected function _merge($arg)
     {
         $this->setHeaders("merge");
@@ -560,6 +569,9 @@ 
         return $this->sforce->merge($arg)->result;
     }
 
+    /**
+     * @param stdClass $arg
+     */
     protected function _process($arg)
     {
         $this->setHeaders();
@@ -567,6 +579,9 @@ 
         return $this->sforce->process($arg)->result;
     }
 
+    /**
+     * @param stdClass $arg
+     */
     protected function _update($arg)
     {
         $this->setHeaders("update");
@@ -574,6 +589,9 @@ 
         return $this->sforce->update($arg)->result;
     }
 
+    /**
+     * @param stdClass $arg
+     */
     protected function _upsert($arg)
     {
         $this->setHeaders("upsert");
@@ -890,7 +908,6 @@ 
      * the specified criteria.
      *
      * @param string $query Query String
-     * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
      * @return QueryResult
      */
     public function query($query)
@@ -908,7 +925,6 @@ 
      * Retrieves the next batch of objects from a query.
      *
      * @param string $queryLocator Represents the server-side cursor that tracks the current processing location in the query result set.
-     * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
      * @return QueryResult
      */
     public function queryMore($queryLocator)
@@ -964,7 +980,7 @@ 
      * Executes a text search in your organization's data.
      *
      * @param string $searchString Search string that specifies the text expression to search for.
-     * @return SearchResult
+     * @return SforceSearchResult
      */
     public function search($searchString)
     {

Spacing +9 added lines, -9 removed lines

@@ -83,8 +83,8 @@ 
 
     public function printDebugInfo()
     {
-        echo 'PHP Toolkit Version: ' . $this->version . PHP_EOL;
-        echo 'Current PHP version: ' . phpversion();
+        echo 'PHP Toolkit Version: '.$this->version.PHP_EOL;
+        echo 'Current PHP version: '.phpversion();
         echo PHP_EOL;
         echo 'SOAP enabled: ';
         if (extension_loaded('soap')) {
@@ -115,11 +115,11 @@ 
     {
         // use correct version comparison
         if (version_compare(phpversion(), '5.3', '<')) {
-            throw new Exception ('PHP versions older than 5.3 are no longer supported. Please upgrade!');
+            throw new Exception('PHP versions older than 5.3 are no longer supported. Please upgrade!');
         }
 
         $soapClientArray = array_merge(array(
-            'user_agent' => 'salesforce-toolkit-php/' . $this->version,
+            'user_agent' => 'salesforce-toolkit-php/'.$this->version,
             'encoding' => 'utf-8',
             'trace' => 1,
             'features' => SOAP_SINGLE_ELEMENT_ARRAYS,
@@ -540,7 +540,7 @@ 
     {
         $anyString = '';
         foreach ($fields as $key => $value) {
-            $anyString = $anyString . '<' . $key . '>' . $value . '</' . $key . '>';
+            $anyString = $anyString.'<'.$key.'>'.$value.'</'.$key.'>';
         }
 
         return $anyString;
@@ -595,7 +595,7 @@ 
             return $this->_sendEmail($arg);
         } else {
             $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+            error_log('Please pass in array to this function:  '.$backtrace[0]['function']);
             return false;
         }
     }
@@ -614,7 +614,7 @@ 
             return $this->_sendEmail($arg);
         } else {
             $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+            error_log('Please pass in array to this function:  '.$backtrace[0]['function']);
             return false;
         }
     }
@@ -705,7 +705,7 @@ 
             return $this->_process($arg);
         } else {
             $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+            error_log('Please pass in array to this function:  '.$backtrace[0]['function']);
             return false;
         }
     }
@@ -728,7 +728,7 @@ 
             return $this->_process($arg);
         } else {
             $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+            error_log('Please pass in array to this function:  '.$backtrace[0]['function']);
             return false;
         }
     }

Indentation +974 added lines, -974 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Davispeixoto\ForceDotComToolkitForPhp;
 
-    /*
+	/*
      * Copyright (c) 2007, salesforce.com, inc.
      * All rights reserved.
      *
@@ -26,10 +26,10 @@ 
      * POSSIBILITY OF SUCH DAMAGE.
      */
 
-    /**
-     * This file contains one class.
-     * @package SalesforceSoapClient
-     */
+	/**
+	 * This file contains one class.
+	 * @package SalesforceSoapClient
+	 */
 use SoapClient;
 use SoapHeader;
 use SoapVar;
@@ -42,1003 +42,1003 @@ 
  */
 class SforceBaseClient
 {
-    protected $sforce;
-    protected $sessionId;
-    protected $location;
-    protected $version = '27.0';
-
-    protected $namespace;
-
-    // Header Options
-    protected $callOptions;
-    protected $assignmentRuleHeader;
-    protected $emailHeader;
-    protected $loginScopeHeader;
-    protected $mruHeader;
-    protected $queryHeader;
-    protected $userTerritoryDeleteHeader;
-    protected $sessionHeader;
-
-    // new headers
-    protected $allowFieldTruncationHeader;
-    protected $localeOptions;
-    protected $packageVersionHeader;
-
-    protected function getSoapClient($wsdl, $options)
-    {
-        return new SoapClient($wsdl, $options);
-    }
-
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-
-    // clientId specifies which application or toolkit is accessing the
-    // salesforce.com API. For applications that are certified salesforce.com
-    // solutions, replace this with the value provided by salesforce.com.
-    // Otherwise, leave this value as 'phpClient/1.0'.
-    protected $client_id;
-
-    public function printDebugInfo()
-    {
-        echo 'PHP Toolkit Version: ' . $this->version . PHP_EOL;
-        echo 'Current PHP version: ' . phpversion();
-        echo PHP_EOL;
-        echo 'SOAP enabled: ';
-        if (extension_loaded('soap')) {
-            echo 'True';
-        } else {
-            echo 'False';
-        }
-        echo PHP_EOL;
-        echo 'OpenSSL enabled: ';
-        if (extension_loaded('openssl')) {
-            echo 'True';
-        } else {
-            echo 'False';
-        }
-    }
-
-    /**
-     * 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
-     */
-    public function createConnection($wsdl, $proxy = null, $soap_options = array())
-    {
-        // use correct version comparison
-        if (version_compare(phpversion(), '5.3', '<')) {
-            throw new Exception ('PHP versions older than 5.3 are no longer supported. Please upgrade!');
-        }
-
-        $soapClientArray = array_merge(array(
-            'user_agent' => 'salesforce-toolkit-php/' . $this->version,
-            'encoding' => 'utf-8',
-            'trace' => 1,
-            'features' => SOAP_SINGLE_ELEMENT_ARRAYS,
-            'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP
-        ), $soap_options);
-
-
-        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);
-        }
-
-        $this->sforce = $this->getSoapClient($wsdl, $soapClientArray);
-
-        return $this->sforce;
-    }
-
-    public function setCallOptions($header)
-    {
-        if ($header != null) {
-            $this->callOptions = new SoapHeader($this->namespace, 'CallOptions', array(
-                'client' => $header->client,
-                'defaultNamespace' => $header->defaultNamespace
-            ));
-        } else {
-            $this->callOptions = null;
-        }
-    }
-
-    /**
-     * Login to Salesforce.com and starts a client session.
-     *
-     * @param string $username Username
-     * @param string $password Password
-     *
-     * @return LoginResult
-     */
-    public function login($username, $password)
-    {
-        $this->sforce->__setSoapHeaders(null);
-        if ($this->callOptions != null) {
-            $this->sforce->__setSoapHeaders(array($this->callOptions));
-        }
-        if ($this->loginScopeHeader != null) {
-            $this->sforce->__setSoapHeaders(array($this->loginScopeHeader));
-        }
-        $result = $this->sforce->login(array(
-            'username' => $username,
-            'password' => $password
-        ));
-        $result = $result->result;
-        $this->_setLoginHeader($result);
-
-        return $result;
-    }
-
-    /**
-     * log outs from the salseforce system`
-     *
-     * @return LogoutResult
-     */
-    public function logout()
-    {
-        $this->setHeaders("logout");
-        $arg = new stdClass();
+	protected $sforce;
+	protected $sessionId;
+	protected $location;
+	protected $version = '27.0';
+
+	protected $namespace;
+
+	// Header Options
+	protected $callOptions;
+	protected $assignmentRuleHeader;
+	protected $emailHeader;
+	protected $loginScopeHeader;
+	protected $mruHeader;
+	protected $queryHeader;
+	protected $userTerritoryDeleteHeader;
+	protected $sessionHeader;
+
+	// new headers
+	protected $allowFieldTruncationHeader;
+	protected $localeOptions;
+	protected $packageVersionHeader;
+
+	protected function getSoapClient($wsdl, $options)
+	{
+		return new SoapClient($wsdl, $options);
+	}
 
-        return $this->sforce->logout();
-    }
+	public function getNamespace()
+	{
+		return $this->namespace;
+	}
 
-    /**
-     *invalidate Sessions from the salseforce system`
-     *
-     * @return invalidateSessionsResult
-     */
-    public function invalidateSessions()
-    {
-        $this->setHeaders("invalidateSessions");
-        $arg = new stdClass();
-        $this->logout();
-
-        return $this->sforce->invalidateSessions();
-    }
-
-    /**
-     * Specifies the session ID returned from the login server after a successful
-     * login.
-     */
-    protected function _setLoginHeader($loginResult)
-    {
-        $this->sessionId = $loginResult->sessionId;
-        $this->setSessionHeader($this->sessionId);
-        $serverURL = $loginResult->serverUrl;
-        $this->setEndPoint($serverURL);
-    }
-
-    /**
-     * Set the endpoint.
-     *
-     * @param string $location Location
-     */
-    public function setEndpoint($location)
-    {
-        $this->location = $location;
-        $this->sforce->__setLocation($location);
-    }
-
-    private function setHeaders($call = null)
-    {
-        $this->sforce->__setSoapHeaders(null);
-
-        $header_array = array(
-            $this->sessionHeader
-        );
-
-        $header = $this->callOptions;
-        if ($header != null) {
-            array_push($header_array, $header);
-        }
-
-        if ($call == "create" ||
-            $call == "merge" ||
-            $call == "update" ||
-            $call == "upsert"
-        ) {
-            $header = $this->assignmentRuleHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        if ($call == "login") {
-            $header = $this->loginScopeHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        if ($call == "create" ||
-            $call == "resetPassword" ||
-            $call == "update" ||
-            $call == "upsert"
-        ) {
-            $header = $this->emailHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        if ($call == "create" ||
-            $call == "merge" ||
-            $call == "query" ||
-            $call == "retrieve" ||
-            $call == "update" ||
-            $call == "upsert"
-        ) {
-            $header = $this->mruHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        if ($call == "delete") {
-            $header = $this->userTerritoryDeleteHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        if ($call == "query" ||
-            $call == "queryMore" ||
-            $call == "retrieve"
-        ) {
-            $header = $this->queryHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        // try to add allowFieldTruncationHeader
-        $allowFieldTruncationHeaderCalls = array(
-            'convertLead',
-            'create',
-            'merge',
-            'process',
-            'undelete',
-            'update',
-            'upsert',
-        );
-        if (in_array($call, $allowFieldTruncationHeaderCalls)) {
-            $header = $this->allowFieldTruncationHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        // try to add localeOptions
-        if ($call == 'describeSObject' || $call == 'describeSObjects') {
-            $header = $this->localeOptions;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        // try to add PackageVersionHeader
-        $packageVersionHeaderCalls = array(
-            'convertLead',
-            'create',
-            'delete',
-            'describeGlobal',
-            'describeLayout',
-            'describeSObject',
-            'describeSObjects',
-            'describeSoftphoneLayout',
-            'describeTabs',
-            'merge',
-            'process',
-            'query',
-            'retrieve',
-            'search',
-            'undelete',
-            'update',
-            'upsert',
-        );
-
-        if (in_array($call, $packageVersionHeaderCalls)) {
-            $header = $this->packageVersionHeader;
-            if ($header != null) {
-                array_push($header_array, $header);
-            }
-        }
-
-        $this->sforce->__setSoapHeaders($header_array);
-    }
-
-    public function setAssignmentRuleHeader($header)
-    {
-        if ($header != null) {
-            $this->assignmentRuleHeader = new SoapHeader($this->namespace, 'AssignmentRuleHeader', array(
-                'assignmentRuleId' => $header->assignmentRuleId,
-                'useDefaultRule' => $header->useDefaultRuleFlag
-            ));
-        } else {
-            $this->assignmentRuleHeader = null;
-        }
-    }
-
-    public function setEmailHeader($header)
-    {
-        if ($header != null) {
-            $this->emailHeader = new SoapHeader($this->namespace, 'EmailHeader', array(
-                'triggerAutoResponseEmail' => $header->triggerAutoResponseEmail,
-                'triggerOtherEmail' => $header->triggerOtherEmail,
-                'triggerUserEmail' => $header->triggerUserEmail
-            ));
-        } else {
-            $this->emailHeader = null;
-        }
-    }
-
-    public function setLoginScopeHeader($header)
-    {
-        if ($header != null) {
-            $this->loginScopeHeader = new SoapHeader($this->namespace, 'LoginScopeHeader', array(
-                'organizationId' => $header->organizationId,
-                'portalId' => $header->portalId
-            ));
-        } else {
-            $this->loginScopeHeader = null;
-        }
-    }
-
-    public function setMruHeader($header)
-    {
-        if ($header != null) {
-            $this->mruHeader = new SoapHeader($this->namespace, 'MruHeader', array(
-                'updateMru' => $header->updateMruFlag
-            ));
-        } else {
-            $this->mruHeader = null;
-        }
-    }
-
-    public function setSessionHeader($id)
-    {
-        if ($id != null) {
-            $this->sessionHeader = new SoapHeader($this->namespace, 'SessionHeader', array(
-                'sessionId' => $id
-            ));
-            $this->sessionId = $id;
-        } else {
-            $this->sessionHeader = null;
-            $this->sessionId = null;
-        }
-    }
-
-    public function setUserTerritoryDeleteHeader($header)
-    {
-        if ($header != null) {
-            $this->userTerritoryDeleteHeader = new SoapHeader($this->namespace, 'UserTerritoryDeleteHeader  ', array(
-                'transferToUserId' => $header->transferToUserId
-            ));
-        } else {
-            $this->userTerritoryDeleteHeader = null;
-        }
-    }
-
-    public function setQueryOptions($header)
-    {
-        if ($header != null) {
-            $this->queryHeader = new SoapHeader($this->namespace, 'QueryOptions', array(
-                'batchSize' => $header->batchSize
-            ));
-        } else {
-            $this->queryHeader = null;
-        }
-    }
-
-    public function setAllowFieldTruncationHeader($header)
-    {
-        if ($header != null) {
-            $this->allowFieldTruncationHeader = new SoapHeader($this->namespace, 'AllowFieldTruncationHeader', array(
-                    'allowFieldTruncation' => $header->allowFieldTruncation
-                )
-            );
-        } else {
-            $this->allowFieldTruncationHeader = null;
-        }
-    }
-
-    public function setLocaleOptions($header)
-    {
-        if ($header != null) {
-            $this->localeOptions = new SoapHeader($this->namespace, 'LocaleOptions',
-                array(
-                    'language' => $header->language
-                )
-            );
-        } else {
-            $this->localeOptions = null;
-        }
-    }
-
-    /**
-     * @param $header
-     */
-    public function setPackageVersionHeader($header)
-    {
-        if ($header != null) {
-            $headerData = array('packageVersions' => array());
-
-            foreach ($header->packageVersions as $key => $hdrElem) {
-                $headerData['packageVersions'][] = array(
-                    'majorNumber' => $hdrElem->majorNumber,
-                    'minorNumber' => $hdrElem->minorNumber,
-                    'namespace' => $hdrElem->namespace,
-                );
-            }
-
-            $this->packageVersionHeader = new SoapHeader($this->namespace,
-                'PackageVersionHeader',
-                $headerData
-            );
-        } else {
-            $this->packageVersionHeader = null;
-        }
-    }
-
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
-    public function getLocation()
-    {
-        return $this->location;
-    }
-
-    public function getConnection()
-    {
-        return $this->sforce;
-    }
-
-    public function getFunctions()
-    {
-        return $this->sforce->__getFunctions();
-    }
-
-    public function getTypes()
-    {
-        return $this->sforce->__getTypes();
-    }
-
-    public function getLastRequest()
-    {
-        return $this->sforce->__getLastRequest();
-    }
-
-    public function getLastRequestHeaders()
-    {
-        return $this->sforce->__getLastRequestHeaders();
-    }
-
-    public function getLastResponse()
-    {
-        return $this->sforce->__getLastResponse();
-    }
-
-    public function getLastResponseHeaders()
-    {
-        return $this->sforce->__getLastResponseHeaders();
-    }
-
-    protected function _convertToAny($fields)
-    {
-        $anyString = '';
-        foreach ($fields as $key => $value) {
-            $anyString = $anyString . '<' . $key . '>' . $value . '</' . $key . '>';
-        }
-
-        return $anyString;
-    }
-
-    protected function _create($arg)
-    {
-        $this->setHeaders("create");
-
-        return $this->sforce->create($arg)->result;
-    }
-
-    protected function _merge($arg)
-    {
-        $this->setHeaders("merge");
-
-        return $this->sforce->merge($arg)->result;
-    }
-
-    protected function _process($arg)
-    {
-        $this->setHeaders();
-
-        return $this->sforce->process($arg)->result;
-    }
-
-    protected function _update($arg)
-    {
-        $this->setHeaders("update");
-
-        return $this->sforce->update($arg)->result;
-    }
-
-    protected function _upsert($arg)
-    {
-        $this->setHeaders("upsert");
-
-        return $this->sforce->upsert($arg)->result;
-    }
-
-    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 = new stdClass();
-            $arg->messages = $messages;
-
-            return $this->_sendEmail($arg);
-        } else {
-            $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
-            return false;
-        }
-    }
-
-    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 = new stdClass();
-            $arg->messages = $messages;
-
-            return $this->_sendEmail($arg);
-        } else {
-            $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
-            return false;
-        }
-    }
-
-    protected function _sendEmail($arg)
-    {
-        $this->setHeaders();
-
-        return $this->sforce->sendEmail($arg)->result;
-    }
-
-    /**
-     * Converts a Lead into an Account, Contact, or (optionally) an Opportunity.
-     *
-     * @param array $leadConverts Array of LeadConvert
-     *
-     * @return LeadConvertResult
-     */
-    public function convertLead($leadConverts)
-    {
+
+	// clientId specifies which application or toolkit is accessing the
+	// salesforce.com API. For applications that are certified salesforce.com
+	// solutions, replace this with the value provided by salesforce.com.
+	// Otherwise, leave this value as 'phpClient/1.0'.
+	protected $client_id;
+
+	public function printDebugInfo()
+	{
+		echo 'PHP Toolkit Version: ' . $this->version . PHP_EOL;
+		echo 'Current PHP version: ' . phpversion();
+		echo PHP_EOL;
+		echo 'SOAP enabled: ';
+		if (extension_loaded('soap')) {
+			echo 'True';
+		} else {
+			echo 'False';
+		}
+		echo PHP_EOL;
+		echo 'OpenSSL enabled: ';
+		if (extension_loaded('openssl')) {
+			echo 'True';
+		} else {
+			echo 'False';
+		}
+	}
+
+	/**
+	 * 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
+	 */
+	public function createConnection($wsdl, $proxy = null, $soap_options = array())
+	{
+		// use correct version comparison
+		if (version_compare(phpversion(), '5.3', '<')) {
+			throw new Exception ('PHP versions older than 5.3 are no longer supported. Please upgrade!');
+		}
+
+		$soapClientArray = array_merge(array(
+			'user_agent' => 'salesforce-toolkit-php/' . $this->version,
+			'encoding' => 'utf-8',
+			'trace' => 1,
+			'features' => SOAP_SINGLE_ELEMENT_ARRAYS,
+			'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP
+		), $soap_options);
+
+
+		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);
+		}
+
+		$this->sforce = $this->getSoapClient($wsdl, $soapClientArray);
+
+		return $this->sforce;
+	}
+
+	public function setCallOptions($header)
+	{
+		if ($header != null) {
+			$this->callOptions = new SoapHeader($this->namespace, 'CallOptions', array(
+				'client' => $header->client,
+				'defaultNamespace' => $header->defaultNamespace
+			));
+		} else {
+			$this->callOptions = null;
+		}
+	}
+
+	/**
+	 * Login to Salesforce.com and starts a client session.
+	 *
+	 * @param string $username Username
+	 * @param string $password Password
+	 *
+	 * @return LoginResult
+	 */
+	public function login($username, $password)
+	{
+		$this->sforce->__setSoapHeaders(null);
+		if ($this->callOptions != null) {
+			$this->sforce->__setSoapHeaders(array($this->callOptions));
+		}
+		if ($this->loginScopeHeader != null) {
+			$this->sforce->__setSoapHeaders(array($this->loginScopeHeader));
+		}
+		$result = $this->sforce->login(array(
+			'username' => $username,
+			'password' => $password
+		));
+		$result = $result->result;
+		$this->_setLoginHeader($result);
+
+		return $result;
+	}
+
+	/**
+	 * log outs from the salseforce system`
+	 *
+	 * @return LogoutResult
+	 */
+	public function logout()
+	{
+		$this->setHeaders("logout");
+		$arg = new stdClass();
+
+		return $this->sforce->logout();
+	}
+
+	/**
+	 *invalidate Sessions from the salseforce system`
+	 *
+	 * @return invalidateSessionsResult
+	 */
+	public function invalidateSessions()
+	{
+		$this->setHeaders("invalidateSessions");
+		$arg = new stdClass();
+		$this->logout();
+
+		return $this->sforce->invalidateSessions();
+	}
+
+	/**
+	 * Specifies the session ID returned from the login server after a successful
+	 * login.
+	 */
+	protected function _setLoginHeader($loginResult)
+	{
+		$this->sessionId = $loginResult->sessionId;
+		$this->setSessionHeader($this->sessionId);
+		$serverURL = $loginResult->serverUrl;
+		$this->setEndPoint($serverURL);
+	}
+
+	/**
+	 * Set the endpoint.
+	 *
+	 * @param string $location Location
+	 */
+	public function setEndpoint($location)
+	{
+		$this->location = $location;
+		$this->sforce->__setLocation($location);
+	}
+
+	private function setHeaders($call = null)
+	{
+		$this->sforce->__setSoapHeaders(null);
+
+		$header_array = array(
+			$this->sessionHeader
+		);
+
+		$header = $this->callOptions;
+		if ($header != null) {
+			array_push($header_array, $header);
+		}
+
+		if ($call == "create" ||
+			$call == "merge" ||
+			$call == "update" ||
+			$call == "upsert"
+		) {
+			$header = $this->assignmentRuleHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		if ($call == "login") {
+			$header = $this->loginScopeHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		if ($call == "create" ||
+			$call == "resetPassword" ||
+			$call == "update" ||
+			$call == "upsert"
+		) {
+			$header = $this->emailHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		if ($call == "create" ||
+			$call == "merge" ||
+			$call == "query" ||
+			$call == "retrieve" ||
+			$call == "update" ||
+			$call == "upsert"
+		) {
+			$header = $this->mruHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		if ($call == "delete") {
+			$header = $this->userTerritoryDeleteHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		if ($call == "query" ||
+			$call == "queryMore" ||
+			$call == "retrieve"
+		) {
+			$header = $this->queryHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		// try to add allowFieldTruncationHeader
+		$allowFieldTruncationHeaderCalls = array(
+			'convertLead',
+			'create',
+			'merge',
+			'process',
+			'undelete',
+			'update',
+			'upsert',
+		);
+		if (in_array($call, $allowFieldTruncationHeaderCalls)) {
+			$header = $this->allowFieldTruncationHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		// try to add localeOptions
+		if ($call == 'describeSObject' || $call == 'describeSObjects') {
+			$header = $this->localeOptions;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		// try to add PackageVersionHeader
+		$packageVersionHeaderCalls = array(
+			'convertLead',
+			'create',
+			'delete',
+			'describeGlobal',
+			'describeLayout',
+			'describeSObject',
+			'describeSObjects',
+			'describeSoftphoneLayout',
+			'describeTabs',
+			'merge',
+			'process',
+			'query',
+			'retrieve',
+			'search',
+			'undelete',
+			'update',
+			'upsert',
+		);
+
+		if (in_array($call, $packageVersionHeaderCalls)) {
+			$header = $this->packageVersionHeader;
+			if ($header != null) {
+				array_push($header_array, $header);
+			}
+		}
+
+		$this->sforce->__setSoapHeaders($header_array);
+	}
+
+	public function setAssignmentRuleHeader($header)
+	{
+		if ($header != null) {
+			$this->assignmentRuleHeader = new SoapHeader($this->namespace, 'AssignmentRuleHeader', array(
+				'assignmentRuleId' => $header->assignmentRuleId,
+				'useDefaultRule' => $header->useDefaultRuleFlag
+			));
+		} else {
+			$this->assignmentRuleHeader = null;
+		}
+	}
+
+	public function setEmailHeader($header)
+	{
+		if ($header != null) {
+			$this->emailHeader = new SoapHeader($this->namespace, 'EmailHeader', array(
+				'triggerAutoResponseEmail' => $header->triggerAutoResponseEmail,
+				'triggerOtherEmail' => $header->triggerOtherEmail,
+				'triggerUserEmail' => $header->triggerUserEmail
+			));
+		} else {
+			$this->emailHeader = null;
+		}
+	}
+
+	public function setLoginScopeHeader($header)
+	{
+		if ($header != null) {
+			$this->loginScopeHeader = new SoapHeader($this->namespace, 'LoginScopeHeader', array(
+				'organizationId' => $header->organizationId,
+				'portalId' => $header->portalId
+			));
+		} else {
+			$this->loginScopeHeader = null;
+		}
+	}
+
+	public function setMruHeader($header)
+	{
+		if ($header != null) {
+			$this->mruHeader = new SoapHeader($this->namespace, 'MruHeader', array(
+				'updateMru' => $header->updateMruFlag
+			));
+		} else {
+			$this->mruHeader = null;
+		}
+	}
+
+	public function setSessionHeader($id)
+	{
+		if ($id != null) {
+			$this->sessionHeader = new SoapHeader($this->namespace, 'SessionHeader', array(
+				'sessionId' => $id
+			));
+			$this->sessionId = $id;
+		} else {
+			$this->sessionHeader = null;
+			$this->sessionId = null;
+		}
+	}
+
+	public function setUserTerritoryDeleteHeader($header)
+	{
+		if ($header != null) {
+			$this->userTerritoryDeleteHeader = new SoapHeader($this->namespace, 'UserTerritoryDeleteHeader  ', array(
+				'transferToUserId' => $header->transferToUserId
+			));
+		} else {
+			$this->userTerritoryDeleteHeader = null;
+		}
+	}
+
+	public function setQueryOptions($header)
+	{
+		if ($header != null) {
+			$this->queryHeader = new SoapHeader($this->namespace, 'QueryOptions', array(
+				'batchSize' => $header->batchSize
+			));
+		} else {
+			$this->queryHeader = null;
+		}
+	}
+
+	public function setAllowFieldTruncationHeader($header)
+	{
+		if ($header != null) {
+			$this->allowFieldTruncationHeader = new SoapHeader($this->namespace, 'AllowFieldTruncationHeader', array(
+					'allowFieldTruncation' => $header->allowFieldTruncation
+				)
+			);
+		} else {
+			$this->allowFieldTruncationHeader = null;
+		}
+	}
+
+	public function setLocaleOptions($header)
+	{
+		if ($header != null) {
+			$this->localeOptions = new SoapHeader($this->namespace, 'LocaleOptions',
+				array(
+					'language' => $header->language
+				)
+			);
+		} else {
+			$this->localeOptions = null;
+		}
+	}
+
+	/**
+	 * @param $header
+	 */
+	public function setPackageVersionHeader($header)
+	{
+		if ($header != null) {
+			$headerData = array('packageVersions' => array());
+
+			foreach ($header->packageVersions as $key => $hdrElem) {
+				$headerData['packageVersions'][] = array(
+					'majorNumber' => $hdrElem->majorNumber,
+					'minorNumber' => $hdrElem->minorNumber,
+					'namespace' => $hdrElem->namespace,
+				);
+			}
+
+			$this->packageVersionHeader = new SoapHeader($this->namespace,
+				'PackageVersionHeader',
+				$headerData
+			);
+		} else {
+			$this->packageVersionHeader = null;
+		}
+	}
+
+	public function getSessionId()
+	{
+		return $this->sessionId;
+	}
+
+	public function getLocation()
+	{
+		return $this->location;
+	}
+
+	public function getConnection()
+	{
+		return $this->sforce;
+	}
+
+	public function getFunctions()
+	{
+		return $this->sforce->__getFunctions();
+	}
+
+	public function getTypes()
+	{
+		return $this->sforce->__getTypes();
+	}
+
+	public function getLastRequest()
+	{
+		return $this->sforce->__getLastRequest();
+	}
+
+	public function getLastRequestHeaders()
+	{
+		return $this->sforce->__getLastRequestHeaders();
+	}
+
+	public function getLastResponse()
+	{
+		return $this->sforce->__getLastResponse();
+	}
+
+	public function getLastResponseHeaders()
+	{
+		return $this->sforce->__getLastResponseHeaders();
+	}
+
+	protected function _convertToAny($fields)
+	{
+		$anyString = '';
+		foreach ($fields as $key => $value) {
+			$anyString = $anyString . '<' . $key . '>' . $value . '</' . $key . '>';
+		}
+
+		return $anyString;
+	}
+
+	protected function _create($arg)
+	{
+		$this->setHeaders("create");
+
+		return $this->sforce->create($arg)->result;
+	}
+
+	protected function _merge($arg)
+	{
+		$this->setHeaders("merge");
+
+		return $this->sforce->merge($arg)->result;
+	}
+
+	protected function _process($arg)
+	{
+		$this->setHeaders();
+
+		return $this->sforce->process($arg)->result;
+	}
+
+	protected function _update($arg)
+	{
+		$this->setHeaders("update");
+
+		return $this->sforce->update($arg)->result;
+	}
+
+	protected function _upsert($arg)
+	{
+		$this->setHeaders("upsert");
+
+		return $this->sforce->upsert($arg)->result;
+	}
+
+	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 = new stdClass();
+			$arg->messages = $messages;
+
+			return $this->_sendEmail($arg);
+		} else {
+			$backtrace = debug_backtrace();
+			error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+			return false;
+		}
+	}
+
+	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 = new stdClass();
+			$arg->messages = $messages;
+
+			return $this->_sendEmail($arg);
+		} else {
+			$backtrace = debug_backtrace();
+			error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+			return false;
+		}
+	}
+
+	protected function _sendEmail($arg)
+	{
+		$this->setHeaders();
+
+		return $this->sforce->sendEmail($arg)->result;
+	}
+
+	/**
+	 * Converts a Lead into an Account, Contact, or (optionally) an Opportunity.
+	 *
+	 * @param array $leadConverts Array of LeadConvert
+	 *
+	 * @return LeadConvertResult
+	 */
+	public function convertLead($leadConverts)
+	{
 		$this->setHeaders("convertLead");
-        $arg = new stdClass();
+		$arg = new stdClass();
         
-        foreach ($leadConverts as $k => $lc) {
-            if (isset($lc->contactRecord) && !$lc->contactRecord instanceof SoapVar) {
-                $lc->contactRecord = new SoapVar($lc->contactRecord, SOAP_ENC_OBJECT, 'Contact', $this->namespace);
-            }
+		foreach ($leadConverts as $k => $lc) {
+			if (isset($lc->contactRecord) && !$lc->contactRecord instanceof SoapVar) {
+				$lc->contactRecord = new SoapVar($lc->contactRecord, SOAP_ENC_OBJECT, 'Contact', $this->namespace);
+			}
 
-            if (isset($lc->opportunityRecord) && !$lc->opportunityRecord instanceof SoapVar) {
-                $lc->opportunityRecord = new SoapVar($lc->opportunityRecord, SOAP_ENC_OBJECT, 'Opportunity', $this->namespace);
-            }
+			if (isset($lc->opportunityRecord) && !$lc->opportunityRecord instanceof SoapVar) {
+				$lc->opportunityRecord = new SoapVar($lc->opportunityRecord, SOAP_ENC_OBJECT, 'Opportunity', $this->namespace);
+			}
 
-            if (isset($lc->accountRecord) && !$lc->accountRecord instanceof SoapVar) {
-                $lc->accountRecord = new SoapVar($lc->accountRecord, SOAP_ENC_OBJECT, 'Account', $this->namespace);
-            }
+			if (isset($lc->accountRecord) && !$lc->accountRecord instanceof SoapVar) {
+				$lc->accountRecord = new SoapVar($lc->accountRecord, SOAP_ENC_OBJECT, 'Account', $this->namespace);
+			}
 
-            $leadConverts[$k] = $lc;
-        }
+			$leadConverts[$k] = $lc;
+		}
 		
-        $arg->leadConverts = $leadConverts;
+		$arg->leadConverts = $leadConverts;
         
 		return $this->sforce->convertLead($arg);
 	}
 
-    /**
-     * Deletes one or more new individual objects to your organization's data.
-     *
-     * @param array $ids Array of fields
-     * @return DeleteResult
-     */
-    public function delete($ids)
-    {
-        $this->setHeaders("delete");
-        $arg = new stdClass();
-        $arg->ids = $ids;
+	/**
+	 * Deletes one or more new individual objects to your organization's data.
+	 *
+	 * @param array $ids Array of fields
+	 * @return DeleteResult
+	 */
+	public function delete($ids)
+	{
+		$this->setHeaders("delete");
+		$arg = new stdClass();
+		$arg->ids = $ids;
+
+		return $this->sforce->delete($arg)->result;
+	}
 
-        return $this->sforce->delete($arg)->result;
-    }
+	/**
+	 * Deletes one or more new individual objects to your organization's data.
+	 *
+	 * @param array $ids Array of fields
+	 * @return DeleteResult
+	 */
+	public function undelete($ids)
+	{
+		$this->setHeaders("undelete");
+		$arg = new stdClass();
+		$arg->ids = $ids;
+
+		return $this->sforce->undelete($arg)->result;
+	}
 
-    /**
-     * Deletes one or more new individual objects to your organization's data.
-     *
-     * @param array $ids Array of fields
-     * @return DeleteResult
-     */
-    public function undelete($ids)
-    {
-        $this->setHeaders("undelete");
-        $arg = new stdClass();
-        $arg->ids = $ids;
+	/**
+	 * Deletes one or more new individual objects to your organization's data.
+	 *
+	 * @param array $ids Array of fields
+	 * @return DeleteResult
+	 */
+	public function emptyRecycleBin($ids)
+	{
+		$this->setHeaders();
+		$arg = new stdClass();
+		$arg->ids = $ids;
+
+		return $this->sforce->emptyRecycleBin($arg)->result;
+	}
 
-        return $this->sforce->undelete($arg)->result;
-    }
+	/**
+	 * Process Submit Request for Approval
+	 *
+	 * @param array $processRequestArray
+	 * @return ProcessResult
+	 */
+	public function processSubmitRequest($processRequestArray)
+	{
+		if (is_array($processRequestArray)) {
+			foreach ($processRequestArray as &$process) {
+				$process = new SoapVar($process, SOAP_ENC_OBJECT, 'ProcessSubmitRequest', $this->namespace);
+			}
+			$arg = new stdClass();
+			$arg->actions = $processRequestArray;
+
+			return $this->_process($arg);
+		} else {
+			$backtrace = debug_backtrace();
+			error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+			return false;
+		}
+	}
 
-    /**
-     * Deletes one or more new individual objects to your organization's data.
-     *
-     * @param array $ids Array of fields
-     * @return DeleteResult
-     */
-    public function emptyRecycleBin($ids)
-    {
-        $this->setHeaders();
-        $arg = new stdClass();
-        $arg->ids = $ids;
+	/**
+	 * Process Work Item Request for Approval
+	 *
+	 * @param array $processRequestArray
+	 * @return ProcessResult
+	 */
+	public function processWorkitemRequest($processRequestArray)
+	{
+		if (is_array($processRequestArray)) {
+			foreach ($processRequestArray as &$process) {
+				$process = new SoapVar($process, SOAP_ENC_OBJECT, 'ProcessWorkitemRequest', $this->namespace);
+			}
+			$arg = new stdClass();
+			$arg->actions = $processRequestArray;
+
+			return $this->_process($arg);
+		} else {
+			$backtrace = debug_backtrace();
+			error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+			return false;
+		}
+	}
 
-        return $this->sforce->emptyRecycleBin($arg)->result;
-    }
+	/**
+	 * Retrieves a list of available objects for your organization's data.
+	 *
+	 * @return DescribeGlobalResult
+	 */
+	public function describeGlobal()
+	{
+		$this->setHeaders("describeGlobal");
 
-    /**
-     * Process Submit Request for Approval
-     *
-     * @param array $processRequestArray
-     * @return ProcessResult
-     */
-    public function processSubmitRequest($processRequestArray)
-    {
-        if (is_array($processRequestArray)) {
-            foreach ($processRequestArray as &$process) {
-                $process = new SoapVar($process, SOAP_ENC_OBJECT, 'ProcessSubmitRequest', $this->namespace);
-            }
-            $arg = new stdClass();
-            $arg->actions = $processRequestArray;
-
-            return $this->_process($arg);
-        } else {
-            $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
-            return false;
-        }
-    }
-
-    /**
-     * Process Work Item Request for Approval
-     *
-     * @param array $processRequestArray
-     * @return ProcessResult
-     */
-    public function processWorkitemRequest($processRequestArray)
-    {
-        if (is_array($processRequestArray)) {
-            foreach ($processRequestArray as &$process) {
-                $process = new SoapVar($process, SOAP_ENC_OBJECT, 'ProcessWorkitemRequest', $this->namespace);
-            }
-            $arg = new stdClass();
-            $arg->actions = $processRequestArray;
-
-            return $this->_process($arg);
-        } else {
-            $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
-            return false;
-        }
-    }
-
-    /**
-     * Retrieves a list of available objects for your organization's data.
-     *
-     * @return DescribeGlobalResult
-     */
-    public function describeGlobal()
-    {
-        $this->setHeaders("describeGlobal");
-
-        return $this->sforce->describeGlobal()->result;
-    }
-
-    /**
-     * Use describeLayout to retrieve information about the layout (presentation
-     * of data to users) for a given object type. The describeLayout call returns
-     * metadata about a given page layout, including layouts for edit and
-     * display-only views and record type mappings. Note that field-level security
-     * and layout editability affects which fields appear in a layout.
-     *
-     * @param string Type   Object Type
-     * @return DescribeLayoutResult
-     */
-    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');
-        if (isset($recordTypeIds) && count($recordTypeIds)) {
-            $arg->recordTypeIds = $recordTypeIds;
-        }
-
-        return $this->sforce->describeLayout($arg)->result;
-    }
-
-    /**
-     * Describes metadata (field list and object properties) for the specified
-     * object.
-     *
-     * @param string $type Object type
-     * @return DescribsSObjectResult
-     */
-    public function describeSObject($type)
-    {
-        $this->setHeaders("describeSObject");
-        $arg = new stdClass();
-        $arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-
-        return $this->sforce->describeSObject($arg)->result;
-    }
-
-    /**
-     * An array-based version of describeSObject; describes metadata (field list
-     * and object properties) for the specified object or array of objects.
-     *
-     * @param array $arrayOfTypes Array of object types.
-     * @return DescribsSObjectResult
-     */
-    public function describeSObjects($arrayOfTypes)
-    {
-        $this->setHeaders("describeSObjects");
+		return $this->sforce->describeGlobal()->result;
+	}
 
-        return $this->sforce->describeSObjects($arrayOfTypes)->result;
-    }
+	/**
+	 * Use describeLayout to retrieve information about the layout (presentation
+	 * of data to users) for a given object type. The describeLayout call returns
+	 * metadata about a given page layout, including layouts for edit and
+	 * display-only views and record type mappings. Note that field-level security
+	 * and layout editability affects which fields appear in a layout.
+	 *
+	 * @param string Type   Object Type
+	 * @return DescribeLayoutResult
+	 */
+	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');
+		if (isset($recordTypeIds) && count($recordTypeIds)) {
+			$arg->recordTypeIds = $recordTypeIds;
+		}
+
+		return $this->sforce->describeLayout($arg)->result;
+	}
 
-    /**
-     * The describeTabs call returns information about the standard apps and
-     * custom apps, if any, available for the user who sends the call, including
-     * the list of tabs defined for each app.
-     *
-     * @return DescribeTabSetResult
-     */
-    public function describeTabs()
-    {
-        $this->setHeaders("describeTabs");
+	/**
+	 * Describes metadata (field list and object properties) for the specified
+	 * object.
+	 *
+	 * @param string $type Object type
+	 * @return DescribsSObjectResult
+	 */
+	public function describeSObject($type)
+	{
+		$this->setHeaders("describeSObject");
+		$arg = new stdClass();
+		$arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+
+		return $this->sforce->describeSObject($arg)->result;
+	}
 
-        return $this->sforce->describeTabs()->result;
-    }
+	/**
+	 * An array-based version of describeSObject; describes metadata (field list
+	 * and object properties) for the specified object or array of objects.
+	 *
+	 * @param array $arrayOfTypes Array of object types.
+	 * @return DescribsSObjectResult
+	 */
+	public function describeSObjects($arrayOfTypes)
+	{
+		$this->setHeaders("describeSObjects");
+
+		return $this->sforce->describeSObjects($arrayOfTypes)->result;
+	}
 
-    /**
-     * To enable data categories groups you must enable Answers or Knowledge Articles module in
-     * admin panel, after adding category group and assign it to Answers or Knowledge Articles
-     *
-     * @param string $sObjectType sObject Type
-     * @return DescribeDataCategoryGroupResult
-     */
-    public function describeDataCategoryGroups($sObjectType)
-    {
-        $this->setHeaders('describeDataCategoryGroups');
-        $arg = new stdClass();
-        $arg->sObjectType = new SoapVar($sObjectType, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+	/**
+	 * The describeTabs call returns information about the standard apps and
+	 * custom apps, if any, available for the user who sends the call, including
+	 * the list of tabs defined for each app.
+	 *
+	 * @return DescribeTabSetResult
+	 */
+	public function describeTabs()
+	{
+		$this->setHeaders("describeTabs");
+
+		return $this->sforce->describeTabs()->result;
+	}
 
-        return $this->sforce->describeDataCategoryGroups($arg)->result;
-    }
+	/**
+	 * To enable data categories groups you must enable Answers or Knowledge Articles module in
+	 * admin panel, after adding category group and assign it to Answers or Knowledge Articles
+	 *
+	 * @param string $sObjectType sObject Type
+	 * @return DescribeDataCategoryGroupResult
+	 */
+	public function describeDataCategoryGroups($sObjectType)
+	{
+		$this->setHeaders('describeDataCategoryGroups');
+		$arg = new stdClass();
+		$arg->sObjectType = new SoapVar($sObjectType, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+
+		return $this->sforce->describeDataCategoryGroups($arg)->result;
+	}
 
-    /**
-     * Retrieves available category groups along with their data category structure for objects specified in the request.
-     *
-     * @param DataCategoryGroupSobjectTypePair $pairs
-     * @param bool $topCategoriesOnly Object Type
-     * @return DescribeLayoutResult
-     */
-    public function describeDataCategoryGroupStructures(array $pairs, $topCategoriesOnly)
-    {
-        $this->setHeaders('describeDataCategoryGroupStructures');
-        $arg = new stdClass();
-        $arg->pairs = $pairs;
-        $arg->topCategoriesOnly = new SoapVar($topCategoriesOnly, XSD_BOOLEAN, 'boolean',
-            'http://www.w3.org/2001/XMLSchema');
-
-        return $this->sforce->describeDataCategoryGroupStructures($arg)->result;
-    }
-
-    /**
-     * Retrieves the list of individual objects that have been deleted within the
-     * given timespan for the specified object.
-     *
-     * @param string $type Ojbect type
-     * @param string $startDate Start date
-     * @param string $endDate End Date
-     * @return GetDeletedResult
-     */
-    public function getDeleted($type, $startDate, $endDate)
-    {
-        $this->setHeaders("getDeleted");
-        $arg = new stdClass();
-        $arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-        $arg->startDate = $startDate;
-        $arg->endDate = $endDate;
-
-        return $this->sforce->getDeleted($arg)->result;
-    }
-
-    /**
-     * Retrieves the list of individual objects that have been updated (added or
-     * changed) within the given timespan for the specified object.
-     *
-     * @param string $type Ojbect type
-     * @param string $startDate Start date
-     * @param string $endDate End Date
-     * @return GetUpdatedResult
-     */
-    public function getUpdated($type, $startDate, $endDate)
-    {
-        $this->setHeaders("getUpdated");
-        $arg = new stdClass();
-        $arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-        $arg->startDate = $startDate;
-        $arg->endDate = $endDate;
-
-        return $this->sforce->getUpdated($arg)->result;
-    }
-
-    /**
-     * Executes a query against the specified object and returns data that matches
-     * the specified criteria.
-     *
-     * @param string $query Query String
-     * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
-     * @return QueryResult
-     */
-    public function query($query)
-    {
-        $this->setHeaders("query");
-        $raw = $this->sforce->query(array(
-            'queryString' => $query
-        ))->result;
-        $QueryResult = new QueryResult($raw);
-        $QueryResult->setSf($this); // Dependency Injection
-        return $QueryResult;
-    }
-
-    /**
-     * Retrieves the next batch of objects from a query.
-     *
-     * @param string $queryLocator Represents the server-side cursor that tracks the current processing location in the query result set.
-     * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
-     * @return QueryResult
-     */
-    public function queryMore($queryLocator)
-    {
-        $this->setHeaders("queryMore");
-        $arg = new stdClass();
-        $arg->queryLocator = $queryLocator;
-        $raw = $this->sforce->queryMore($arg)->result;
-        $QueryResult = new QueryResult($raw);
-        $QueryResult->setSf($this); // Dependency Injection
-        return $QueryResult;
-    }
-
-    /**
-     * Retrieves data from specified objects, whether or not they have been deleted.
-     *
-     * @param String $query Query String
-     * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
-     * @return QueryResult
-     */
-    public function queryAll($query, $queryOptions = null)
-    {
-        $this->setHeaders("queryAll");
-        $raw = $this->sforce->queryAll(array(
-            'queryString' => $query
-        ))->result;
-        $QueryResult = new QueryResult($raw);
-        $QueryResult->setSf($this); // Dependency Injection
-        return $QueryResult;
-    }
-
-
-    /**
-     * Retrieves one or more objects based on the specified object IDs.
-     *
-     * @param string $fieldList One or more fields separated by commas.
-     * @param string $sObjectType Object from which to retrieve data.
-     * @param array $ids Array of one or more IDs of the objects to retrieve.
-     * @return sObject[]
-     */
-    public function retrieve($fieldList, $sObjectType, $ids)
-    {
-        $this->setHeaders("retrieve");
-        $arg = new stdClass();
-        $arg->fieldList = $fieldList;
-        $arg->sObjectType = new SoapVar($sObjectType, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-        $arg->ids = $ids;
-
-        return $this->sforce->retrieve($arg)->result;
-    }
-
-    /**
-     * Executes a text search in your organization's data.
-     *
-     * @param string $searchString Search string that specifies the text expression to search for.
-     * @return SearchResult
-     */
-    public function search($searchString)
-    {
-        $this->setHeaders("search");
-        $arg = new stdClass();
-        $arg->searchString = new SoapVar($searchString, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+	/**
+	 * Retrieves available category groups along with their data category structure for objects specified in the request.
+	 *
+	 * @param DataCategoryGroupSobjectTypePair $pairs
+	 * @param bool $topCategoriesOnly Object Type
+	 * @return DescribeLayoutResult
+	 */
+	public function describeDataCategoryGroupStructures(array $pairs, $topCategoriesOnly)
+	{
+		$this->setHeaders('describeDataCategoryGroupStructures');
+		$arg = new stdClass();
+		$arg->pairs = $pairs;
+		$arg->topCategoriesOnly = new SoapVar($topCategoriesOnly, XSD_BOOLEAN, 'boolean',
+			'http://www.w3.org/2001/XMLSchema');
+
+		return $this->sforce->describeDataCategoryGroupStructures($arg)->result;
+	}
 
-        return new SforceSearchResult($this->sforce->search($arg)->result);
-    }
+	/**
+	 * Retrieves the list of individual objects that have been deleted within the
+	 * given timespan for the specified object.
+	 *
+	 * @param string $type Ojbect type
+	 * @param string $startDate Start date
+	 * @param string $endDate End Date
+	 * @return GetDeletedResult
+	 */
+	public function getDeleted($type, $startDate, $endDate)
+	{
+		$this->setHeaders("getDeleted");
+		$arg = new stdClass();
+		$arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+		$arg->startDate = $startDate;
+		$arg->endDate = $endDate;
+
+		return $this->sforce->getDeleted($arg)->result;
+	}
 
-    /**
-     * Retrieves the current system timestamp (GMT) from the Web service.
-     *
-     * @return timestamp
-     */
-    public function getServerTimestamp()
-    {
-        $this->setHeaders("getServerTimestamp");
+	/**
+	 * Retrieves the list of individual objects that have been updated (added or
+	 * changed) within the given timespan for the specified object.
+	 *
+	 * @param string $type Ojbect type
+	 * @param string $startDate Start date
+	 * @param string $endDate End Date
+	 * @return GetUpdatedResult
+	 */
+	public function getUpdated($type, $startDate, $endDate)
+	{
+		$this->setHeaders("getUpdated");
+		$arg = new stdClass();
+		$arg->sObjectType = new SoapVar($type, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+		$arg->startDate = $startDate;
+		$arg->endDate = $endDate;
+
+		return $this->sforce->getUpdated($arg)->result;
+	}
 
-        return $this->sforce->getServerTimestamp()->result;
-    }
+	/**
+	 * Executes a query against the specified object and returns data that matches
+	 * the specified criteria.
+	 *
+	 * @param string $query Query String
+	 * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
+	 * @return QueryResult
+	 */
+	public function query($query)
+	{
+		$this->setHeaders("query");
+		$raw = $this->sforce->query(array(
+			'queryString' => $query
+		))->result;
+		$QueryResult = new QueryResult($raw);
+		$QueryResult->setSf($this); // Dependency Injection
+		return $QueryResult;
+	}
 
-    public function getUserInfo()
-    {
-        $this->setHeaders("getUserInfo");
+	/**
+	 * Retrieves the next batch of objects from a query.
+	 *
+	 * @param string $queryLocator Represents the server-side cursor that tracks the current processing location in the query result set.
+	 * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
+	 * @return QueryResult
+	 */
+	public function queryMore($queryLocator)
+	{
+		$this->setHeaders("queryMore");
+		$arg = new stdClass();
+		$arg->queryLocator = $queryLocator;
+		$raw = $this->sforce->queryMore($arg)->result;
+		$QueryResult = new QueryResult($raw);
+		$QueryResult->setSf($this); // Dependency Injection
+		return $QueryResult;
+	}
 
-        return $this->sforce->getUserInfo()->result;
-    }
+	/**
+	 * Retrieves data from specified objects, whether or not they have been deleted.
+	 *
+	 * @param String $query Query String
+	 * @param QueryOptions $queryOptions Batch size limit.  OPTIONAL
+	 * @return QueryResult
+	 */
+	public function queryAll($query, $queryOptions = null)
+	{
+		$this->setHeaders("queryAll");
+		$raw = $this->sforce->queryAll(array(
+			'queryString' => $query
+		))->result;
+		$QueryResult = new QueryResult($raw);
+		$QueryResult->setSf($this); // Dependency Injection
+		return $QueryResult;
+	}
 
-    /**
-     * Sets the specified user's password to the specified value.
-     *
-     * @param string $userId ID of the User.
-     * @param string $password New password
-     */
-    public function setPassword($userId, $password)
-    {
-        $this->setHeaders("setPassword");
-        $arg = new stdClass();
-        $arg->userId = new SoapVar($userId, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-        $arg->password = $password;
-
-        return $this->sforce->setPassword($arg);
-    }
-
-    /**
-     * Changes a user's password to a system-generated value.
-     *
-     * @param string $userId Id of the User
-     * @return password
-     */
-    public function resetPassword($userId)
-    {
-        $this->setHeaders("resetPassword");
-        $arg = new stdClass();
-        $arg->userId = new SoapVar($userId, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
-
-        return $this->sforce->resetPassword($arg)->result;
-    }
+
+	/**
+	 * Retrieves one or more objects based on the specified object IDs.
+	 *
+	 * @param string $fieldList One or more fields separated by commas.
+	 * @param string $sObjectType Object from which to retrieve data.
+	 * @param array $ids Array of one or more IDs of the objects to retrieve.
+	 * @return sObject[]
+	 */
+	public function retrieve($fieldList, $sObjectType, $ids)
+	{
+		$this->setHeaders("retrieve");
+		$arg = new stdClass();
+		$arg->fieldList = $fieldList;
+		$arg->sObjectType = new SoapVar($sObjectType, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+		$arg->ids = $ids;
+
+		return $this->sforce->retrieve($arg)->result;
+	}
+
+	/**
+	 * Executes a text search in your organization's data.
+	 *
+	 * @param string $searchString Search string that specifies the text expression to search for.
+	 * @return SearchResult
+	 */
+	public function search($searchString)
+	{
+		$this->setHeaders("search");
+		$arg = new stdClass();
+		$arg->searchString = new SoapVar($searchString, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+
+		return new SforceSearchResult($this->sforce->search($arg)->result);
+	}
+
+	/**
+	 * Retrieves the current system timestamp (GMT) from the Web service.
+	 *
+	 * @return timestamp
+	 */
+	public function getServerTimestamp()
+	{
+		$this->setHeaders("getServerTimestamp");
+
+		return $this->sforce->getServerTimestamp()->result;
+	}
+
+	public function getUserInfo()
+	{
+		$this->setHeaders("getUserInfo");
+
+		return $this->sforce->getUserInfo()->result;
+	}
+
+	/**
+	 * Sets the specified user's password to the specified value.
+	 *
+	 * @param string $userId ID of the User.
+	 * @param string $password New password
+	 */
+	public function setPassword($userId, $password)
+	{
+		$this->setHeaders("setPassword");
+		$arg = new stdClass();
+		$arg->userId = new SoapVar($userId, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+		$arg->password = $password;
+
+		return $this->sforce->setPassword($arg);
+	}
+
+	/**
+	 * Changes a user's password to a system-generated value.
+	 *
+	 * @param string $userId Id of the User
+	 * @return password
+	 */
+	public function resetPassword($userId)
+	{
+		$this->setHeaders("resetPassword");
+		$arg = new stdClass();
+		$arg->userId = new SoapVar($userId, XSD_STRING, 'string', 'http://www.w3.org/2001/XMLSchema');
+
+		return $this->sforce->resetPassword($arg)->result;
+	}
 }

src/Davispeixoto/ForceDotComToolkitForPhp/SforceEnterpriseClient.php

Doc Comments -2 removed lines

@@ -51,8 +51,6 @@
     /**
      * Adds one or more new individual objects to your organization's data.
      * @param array $sObjects Array of one or more sObjects (up to 200) to create.
-     * @param AssignmentRuleHeader $assignment_header is optional.  Defaults to NULL
-     * @param MruHeader $mru_header is optional.  Defaults to NULL
      * @return SaveResult
      */
     public function create($sObjects, $type)

Indentation +129 added lines, -129 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Davispeixoto\ForceDotComToolkitForPhp;
 
-    /*
+	/*
      * Copyright (c) 2007, salesforce.com, inc.
      * All rights reserved.
      *
@@ -26,10 +26,10 @@ 
      * POSSIBILITY OF SUCH DAMAGE.
      */
 
-    /**
-     * This file contains two classes.
-     * @package SalesforceSoapClient
-     */
+	/**
+	 * This file contains two classes.
+	 * @package SalesforceSoapClient
+	 */
 use SoapParam;
 use SoapVar;
 use stdClass;
@@ -41,130 +41,130 @@ 
  */
 class SforceEnterpriseClient extends SforceBaseClient
 {
-    const ENTERPRISE_NAMESPACE = 'urn:enterprise.soap.sforce.com';
-
-    public function __construct()
-    {
-        $this->namespace = self::ENTERPRISE_NAMESPACE;
-    }
-
-    /**
-     * Adds one or more new individual objects to your organization's data.
-     * @param array $sObjects Array of one or more sObjects (up to 200) to create.
-     * @param AssignmentRuleHeader $assignment_header is optional.  Defaults to NULL
-     * @param MruHeader $mru_header is optional.  Defaults to NULL
-     * @return SaveResult
-     */
-    public function create($sObjects, $type)
-    {
-        $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>';
-                }
-            }
-
-            $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.
-     * @param array sObjects    Array of sObjects
-     * @param AssignmentRuleHeader $assignment_header is optional.  Defaults to NULL
-     * @param MruHeader $mru_header is optional.  Defaults to NULL
-     * @return UpdateResult
-     */
-    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)
-            $xmlStr = '';
-            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->sObjects[] = $soapObject;
-        }
-
-        return parent::_update($arg);
-    }
-
-    /**
-     * Creates new objects and updates existing objects; uses a custom field to
-     * determine the presence of existing objects. In most cases, we recommend
-     * that you use upsert instead of create because upsert is idempotent.
-     * Available in the API version 7.0 and later.
-     *
-     * @param string $ext_Id External Id
-     * @param array $sObjects Array of sObjects
-     * @param string $type The type of objects being upserted.
-     * @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)
-            $xmlStr = '';
-            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->sObjects[] = $soapObject;
-        }
-
-        return parent::_upsert($arg);
-    }
-
-    /**
-     * Merge records
-     *
-     * @param stdclass $mergeRequest
-     * @param String $type
-     * @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);
-    }
+	const ENTERPRISE_NAMESPACE = 'urn:enterprise.soap.sforce.com';
+
+	public function __construct()
+	{
+		$this->namespace = self::ENTERPRISE_NAMESPACE;
+	}
+
+	/**
+	 * Adds one or more new individual objects to your organization's data.
+	 * @param array $sObjects Array of one or more sObjects (up to 200) to create.
+	 * @param AssignmentRuleHeader $assignment_header is optional.  Defaults to NULL
+	 * @param MruHeader $mru_header is optional.  Defaults to NULL
+	 * @return SaveResult
+	 */
+	public function create($sObjects, $type)
+	{
+		$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>';
+				}
+			}
+
+			$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.
+	 * @param array sObjects    Array of sObjects
+	 * @param AssignmentRuleHeader $assignment_header is optional.  Defaults to NULL
+	 * @param MruHeader $mru_header is optional.  Defaults to NULL
+	 * @return UpdateResult
+	 */
+	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)
+			$xmlStr = '';
+			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->sObjects[] = $soapObject;
+		}
+
+		return parent::_update($arg);
+	}
+
+	/**
+	 * Creates new objects and updates existing objects; uses a custom field to
+	 * determine the presence of existing objects. In most cases, we recommend
+	 * that you use upsert instead of create because upsert is idempotent.
+	 * Available in the API version 7.0 and later.
+	 *
+	 * @param string $ext_Id External Id
+	 * @param array $sObjects Array of sObjects
+	 * @param string $type The type of objects being upserted.
+	 * @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)
+			$xmlStr = '';
+			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->sObjects[] = $soapObject;
+		}
+
+		return parent::_upsert($arg);
+	}
+
+	/**
+	 * Merge records
+	 *
+	 * @param stdclass $mergeRequest
+	 * @param String $type
+	 * @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);
+	}
 }
 
 ?>

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
             $xmlStr = '';
             if (isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {
                 foreach ($sObject->fieldsToNull as $fieldToNull) {
-                    $xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';
+                    $xmlStr .= '<fieldsToNull>'.$fieldToNull.'</fieldsToNull>';
                 }
             }
 
@@ -95,7 +95,7 @@ 
             $xmlStr = '';
             if (isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {
                 foreach ($sObject->fieldsToNull as $fieldToNull) {
-                    $xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';
+                    $xmlStr .= '<fieldsToNull>'.$fieldToNull.'</fieldsToNull>';
                 }
             }
 
@@ -133,7 +133,7 @@ 
             $xmlStr = '';
             if (isset($sObject->fieldsToNull) && is_array($sObject->fieldsToNull)) {
                 foreach ($sObject->fieldsToNull as $fieldToNull) {
-                    $xmlStr .= '<fieldsToNull>' . $fieldToNull . '</fieldsToNull>';
+                    $xmlStr .= '<fieldsToNull>'.$fieldToNull.'</fieldsToNull>';
                 }
             }
 

src/Davispeixoto/ForceDotComToolkitForPhp/SforcePartnerClient.php

Doc Comments +1 added lines, -2 removed lines

@@ -68,7 +68,6 @@ 
      * Merge records
      *
      * @param stdclass $mergeRequest
-     * @param String $type
      * @return mixed
      */
     public function merge($mergeRequest)
@@ -184,7 +183,7 @@ 
 
     /**
      *
-     * @param mixed $response
+     * @param SObject[] $response
      * @return array
      */
     private function _retrieveResult($response)

Indentation +169 added lines, -169 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Davispeixoto\ForceDotComToolkitForPhp;
 
-    /*
+	/*
      * Copyright (c) 2007, salesforce.com, inc.
      * All rights reserved.
      *
@@ -34,173 +34,173 @@ 
  */
 class SforcePartnerClient extends SforceBaseClient
 {
-    const PARTNER_NAMESPACE = 'urn:partner.soap.sforce.com';
-
-    function SforcePartnerClient()
-    {
-        $this->namespace = self::PARTNER_NAMESPACE;
-    }
-
-    protected function getSoapClient($wsdl, $options)
-    {
-        return new SforceSoapClient($wsdl, $options);
-    }
-
-    /**
-     * Adds one or more new individual objects to your organization's data.
-     * @param array $sObjects Array of one or more sObjects (up to 200) to create.
-     * @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);
-    }
-
-    /**
-     * Merge records
-     *
-     * @param stdclass $mergeRequest
-     * @param String $type
-     * @return mixed
-     */
-    public function merge($mergeRequest)
-    {
-        if (isset($mergeRequest->masterRecord)) {
-            if (isset($mergeRequest->masterRecord->fields)) {
-                $mergeRequest->masterRecord->any = $this->_convertToAny($mergeRequest->masterRecord->fields);
-            }
-            $arg = new stdClass();
-            $arg->request = $mergeRequest;
-
-            return $this->_merge($arg);
-        }
-    }
-
-    /**
-     *
-     * @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();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
-            return false;
-        }
-    }
-
-    /**
-     *
-     * @param array $request
-     */
-    public function sendMassEmail($request)
-    {
-        $arg = new stdClass();
-        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();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
-            return false;
-        }
-    }
-
-    /**
-     * Updates one or more new individual objects to your organization's data.
-     * @param array sObjects    Array of sObjects
-     * @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);
-    }
-
-    /**
-     * Creates new objects and updates existing objects; uses a custom field to
-     * determine the presence of existing objects. In most cases, we recommend
-     * that you use upsert instead of create because upsert is idempotent.
-     * Available in the API version 7.0 and later.
-     *
-     * @param string $ext_Id External Id
-     * @param array $sObjects Array of sObjects
-     * @return UpsertResult
-     */
-    public function upsert($ext_Id, $sObjects)
-    {
-        $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);
-    }
-
-    /**
-     * @param string $fieldList
-     * @param string $sObjectType
-     * @param array $ids
-     * @return string
-     */
-    public function retrieve($fieldList, $sObjectType, $ids)
-    {
-        return $this->_retrieveResult(parent::retrieve($fieldList, $sObjectType, $ids));
-    }
-
-    /**
-     *
-     * @param mixed $response
-     * @return array
-     */
-    private function _retrieveResult($response)
-    {
-        $arr = array();
-        if (is_array($response)) {
-            foreach ($response as $r) {
-                $sobject = new SObject($r);
-                array_push($arr, $sobject);
-            }
-        } else {
-            $sobject = new SObject($response);
-            array_push($arr, $sobject);
-        }
-
-        return $arr;
-    }
+	const PARTNER_NAMESPACE = 'urn:partner.soap.sforce.com';
+
+	function SforcePartnerClient()
+	{
+		$this->namespace = self::PARTNER_NAMESPACE;
+	}
+
+	protected function getSoapClient($wsdl, $options)
+	{
+		return new SforceSoapClient($wsdl, $options);
+	}
+
+	/**
+	 * Adds one or more new individual objects to your organization's data.
+	 * @param array $sObjects Array of one or more sObjects (up to 200) to create.
+	 * @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);
+	}
+
+	/**
+	 * Merge records
+	 *
+	 * @param stdclass $mergeRequest
+	 * @param String $type
+	 * @return mixed
+	 */
+	public function merge($mergeRequest)
+	{
+		if (isset($mergeRequest->masterRecord)) {
+			if (isset($mergeRequest->masterRecord->fields)) {
+				$mergeRequest->masterRecord->any = $this->_convertToAny($mergeRequest->masterRecord->fields);
+			}
+			$arg = new stdClass();
+			$arg->request = $mergeRequest;
+
+			return $this->_merge($arg);
+		}
+	}
+
+	/**
+	 *
+	 * @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();
+			error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+			return false;
+		}
+	}
+
+	/**
+	 *
+	 * @param array $request
+	 */
+	public function sendMassEmail($request)
+	{
+		$arg = new stdClass();
+		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();
+			error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+			return false;
+		}
+	}
+
+	/**
+	 * Updates one or more new individual objects to your organization's data.
+	 * @param array sObjects    Array of sObjects
+	 * @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);
+	}
+
+	/**
+	 * Creates new objects and updates existing objects; uses a custom field to
+	 * determine the presence of existing objects. In most cases, we recommend
+	 * that you use upsert instead of create because upsert is idempotent.
+	 * Available in the API version 7.0 and later.
+	 *
+	 * @param string $ext_Id External Id
+	 * @param array $sObjects Array of sObjects
+	 * @return UpsertResult
+	 */
+	public function upsert($ext_Id, $sObjects)
+	{
+		$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);
+	}
+
+	/**
+	 * @param string $fieldList
+	 * @param string $sObjectType
+	 * @param array $ids
+	 * @return string
+	 */
+	public function retrieve($fieldList, $sObjectType, $ids)
+	{
+		return $this->_retrieveResult(parent::retrieve($fieldList, $sObjectType, $ids));
+	}
+
+	/**
+	 *
+	 * @param mixed $response
+	 * @return array
+	 */
+	private function _retrieveResult($response)
+	{
+		$arr = array();
+		if (is_array($response)) {
+			foreach ($response as $r) {
+				$sobject = new SObject($r);
+				array_push($arr, $sobject);
+			}
+		} else {
+			$sobject = new SObject($response);
+			array_push($arr, $sobject);
+		}
+
+		return $arr;
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
             return parent::_sendEmail($arg);
         } else {
             $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+            error_log('Please pass in array to this function:  '.$backtrace[0]['function']);
             return false;
         }
     }
@@ -124,7 +124,7 @@ 
             return parent::_sendEmail($arg);
         } else {
             $backtrace = debug_backtrace();
-            error_log('Please pass in array to this function:  ' . $backtrace[0]['function']);
+            error_log('Please pass in array to this function:  '.$backtrace[0]['function']);
             return false;
         }
     }

src/Davispeixoto/ForceDotComToolkitForPhp/SObject.php

Doc Comments +4 added lines

@@ -284,6 +284,10 @@
     /*
      * If the stdClass has a type, we know it is an SObject
     */
+
+    /**
+     * @param stdClass $param
+     */
     public function isSObject($param)
     {
         return isset($param->type);

Indentation +252 added lines, -252 removed lines

@@ -31,263 +31,263 @@
 
 class SObject
 {
-    public $type;
-    public $fields;
-
-    //	public $sobject;
-
-    public function __construct($response = null)
-    {
-        if (!isset($response) && !$response) {
-            return;
-        }
-
-        foreach ($response as $responseKey => $responseValue) {
-            if (in_array($responseKey, array('Id', 'type', 'any'))) {
-                continue;
-            }
-            $this->$responseKey = $responseValue;
-        }
-
-        if (isset($response->Id)) {
-            $this->Id = is_array($response->Id) ? $response->Id[0] : $response->Id;
-        }
-
-        if (isset($response->type)) {
-            $this->type = $response->type;
-        }
-
-        if (isset($response->any)) {
-            try {
-                if ($response->any instanceof stdClass) {
-                    if ($this->isSObject($response->any)) {
-                        $anArray = array();
-                        $sobject = new SObject($response->any);
-                        $anArray[] = $sobject;
-                        $this->sobjects = $anArray;
-                    } else {
-                        $this->queryResult = new QueryResult($response->any);
-                    }
-                } else {
-                    if (is_array($response->any)) {
-                        $anArray = array();
-                        foreach ($response->any as $key => $item) {
-                            if ($item instanceof stdClass) {
-                                if ($this->isSObject($item)) {
-                                    $sobject = new SObject($item);
-                                    $anArray[$key] = $sobject;
-                                } else {
-                                    if (!isset($this->queryResult)) {
-                                        $this->queryResult = array();
-                                    }
-                                    array_push($this->queryResult, new QueryResult($item));
-                                }
-                            } else {
-                                if (strpos($item, 'sf:') === false) {
-                                    $currentXmlValue = sprintf('<sf:%s>%s</sf:%s>', $key, $item, $key);
-                                } else {
-                                    $currentXmlValue = $item;
-                                }
-
-                                if (!isset($fieldsToConvert)) {
-                                    $fieldsToConvert = $currentXmlValue;
-                                } else {
-                                    $fieldsToConvert .= $currentXmlValue;
-                                }
-                            }
-                        }
-
-                        if (isset($fieldsToConvert)) {
-                            $this->fields = $this->convertFields($fieldsToConvert);
-                        }
-
-                        if (sizeof($anArray) > 0) {
-                            foreach ($anArray as $key => $children_sobject) {
-                                $this->fields->$key = $children_sobject;
-                            }
-                        }
-                    } else {
-                        $this->fields = $this->convertFields($response->any);
-                    }
-                }
-            } catch (Exception $e) {
-                error_log('salesforce exception: ', $e->getMessage());
-                error_log('salesforce exception: ', $e->getTraceAsString());
-            }
-        }
-    }
-
-    public function __get($name)
-    {
-        return (isset($this->fields->$name)) ? $this->fields->$name : false;
-    }
-
-    public function __isset($name)
-    {
-        return isset($this->fields->$name);
-    }
-
-    /**
-     * Parse the "any" string from an sObject.  First strip out the sf: and then
-     * enclose string with <Object></Object>.  Load the string using
-     * simplexml_load_string and return an array that can be traversed.
-     */
-    public 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);
-
-        $xml = new stdClass();
-        if (!count($array['Object'])) {
-            return $xml;
-        }
-
-        foreach ($array['Object'] as $k => $v) {
-            $xml->$k = $v;
-        }
-
-        return $xml;
-    }
-
-    /**
-     *
-     * @param string $contents
-     * @return array
-     */
-    public function xml2array($contents, $get_attributes = 1)
-    {
-        if (!$contents) {
-            return array();
-        }
-
-        if (!function_exists('xml_parser_create')) {
-            return array('not found');
-        }
-
-        $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);
-
-        if (!$xml_values) {
-            return;
-        }
-
-        //Initializations
-        $xml_array = array();
-        $parents = array();
-        $opened_tags = array();
-        $arr = array();
-
-        $current = &$xml_array;
-
-        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.
-
-            $result = '';
-            if ($get_attributes) {
-                switch ($get_attributes) {
-                    case 1:
-                        $result = array();
-                        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'
-                                /**  :TODO: should we change the key name to '_attr'? Someone may use the tagname 'attr'. Same goes for 'value' too */
-                            }
-                        }
-                        break;
-
-                    case 2:
-                        $result = array();
-                        if (isset($value)) {
-                            $result = $value;
-                        }
-
-                        //Check for nil and ignore other attributes.
-                        if (isset($attributes) && isset($attributes['xsi:nil']) && !strcasecmp($attributes['xsi:nil'],
-                                'true')
-                        ) {
-                            $result = null;
-                        }
-                        break;
-                }
-            } elseif (isset($value)) {
-                $result = $value;
-            }
-
-            //See tag status and do the needed.
-            if ($type == "open") {//The starting of the tag '<tag>'
-                $parent[$level - 1] = &$current;
-
-                if (!is_array($current) || (!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])) {
-                        array_push($current[$tag], $result);
-                    } else {
-                        $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 />'
-                //See if the key is already taken.
-                if (!isset($current[$tag])) { //New Key
-                    $current[$tag] = $result;
-
-                } else { //If taken, put all things inside a list(array)
-                    if ((is_array($current[$tag]) && $get_attributes == 0)//If it is already an array...
-                        || (isset($current[$tag][0]) && is_array($current[$tag][0]) && ($get_attributes == 1 || $get_attributes == 2))
-                    ) {
-                        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
-                    }
-                }
-
-            } elseif ($type == 'close') { //End of tag '</tag>'
-                $current = &$parent[$level - 1];
-            }
-        }
-
-        return ($xml_array);
-    }
-
-    /*
+	public $type;
+	public $fields;
+
+	//	public $sobject;
+
+	public function __construct($response = null)
+	{
+		if (!isset($response) && !$response) {
+			return;
+		}
+
+		foreach ($response as $responseKey => $responseValue) {
+			if (in_array($responseKey, array('Id', 'type', 'any'))) {
+				continue;
+			}
+			$this->$responseKey = $responseValue;
+		}
+
+		if (isset($response->Id)) {
+			$this->Id = is_array($response->Id) ? $response->Id[0] : $response->Id;
+		}
+
+		if (isset($response->type)) {
+			$this->type = $response->type;
+		}
+
+		if (isset($response->any)) {
+			try {
+				if ($response->any instanceof stdClass) {
+					if ($this->isSObject($response->any)) {
+						$anArray = array();
+						$sobject = new SObject($response->any);
+						$anArray[] = $sobject;
+						$this->sobjects = $anArray;
+					} else {
+						$this->queryResult = new QueryResult($response->any);
+					}
+				} else {
+					if (is_array($response->any)) {
+						$anArray = array();
+						foreach ($response->any as $key => $item) {
+							if ($item instanceof stdClass) {
+								if ($this->isSObject($item)) {
+									$sobject = new SObject($item);
+									$anArray[$key] = $sobject;
+								} else {
+									if (!isset($this->queryResult)) {
+										$this->queryResult = array();
+									}
+									array_push($this->queryResult, new QueryResult($item));
+								}
+							} else {
+								if (strpos($item, 'sf:') === false) {
+									$currentXmlValue = sprintf('<sf:%s>%s</sf:%s>', $key, $item, $key);
+								} else {
+									$currentXmlValue = $item;
+								}
+
+								if (!isset($fieldsToConvert)) {
+									$fieldsToConvert = $currentXmlValue;
+								} else {
+									$fieldsToConvert .= $currentXmlValue;
+								}
+							}
+						}
+
+						if (isset($fieldsToConvert)) {
+							$this->fields = $this->convertFields($fieldsToConvert);
+						}
+
+						if (sizeof($anArray) > 0) {
+							foreach ($anArray as $key => $children_sobject) {
+								$this->fields->$key = $children_sobject;
+							}
+						}
+					} else {
+						$this->fields = $this->convertFields($response->any);
+					}
+				}
+			} catch (Exception $e) {
+				error_log('salesforce exception: ', $e->getMessage());
+				error_log('salesforce exception: ', $e->getTraceAsString());
+			}
+		}
+	}
+
+	public function __get($name)
+	{
+		return (isset($this->fields->$name)) ? $this->fields->$name : false;
+	}
+
+	public function __isset($name)
+	{
+		return isset($this->fields->$name);
+	}
+
+	/**
+	 * Parse the "any" string from an sObject.  First strip out the sf: and then
+	 * enclose string with <Object></Object>.  Load the string using
+	 * simplexml_load_string and return an array that can be traversed.
+	 */
+	public 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);
+
+		$xml = new stdClass();
+		if (!count($array['Object'])) {
+			return $xml;
+		}
+
+		foreach ($array['Object'] as $k => $v) {
+			$xml->$k = $v;
+		}
+
+		return $xml;
+	}
+
+	/**
+	 *
+	 * @param string $contents
+	 * @return array
+	 */
+	public function xml2array($contents, $get_attributes = 1)
+	{
+		if (!$contents) {
+			return array();
+		}
+
+		if (!function_exists('xml_parser_create')) {
+			return array('not found');
+		}
+
+		$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);
+
+		if (!$xml_values) {
+			return;
+		}
+
+		//Initializations
+		$xml_array = array();
+		$parents = array();
+		$opened_tags = array();
+		$arr = array();
+
+		$current = &$xml_array;
+
+		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.
+
+			$result = '';
+			if ($get_attributes) {
+				switch ($get_attributes) {
+					case 1:
+						$result = array();
+						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'
+								/**  :TODO: should we change the key name to '_attr'? Someone may use the tagname 'attr'. Same goes for 'value' too */
+							}
+						}
+						break;
+
+					case 2:
+						$result = array();
+						if (isset($value)) {
+							$result = $value;
+						}
+
+						//Check for nil and ignore other attributes.
+						if (isset($attributes) && isset($attributes['xsi:nil']) && !strcasecmp($attributes['xsi:nil'],
+								'true')
+						) {
+							$result = null;
+						}
+						break;
+				}
+			} elseif (isset($value)) {
+				$result = $value;
+			}
+
+			//See tag status and do the needed.
+			if ($type == "open") {//The starting of the tag '<tag>'
+				$parent[$level - 1] = &$current;
+
+				if (!is_array($current) || (!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])) {
+						array_push($current[$tag], $result);
+					} else {
+						$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 />'
+				//See if the key is already taken.
+				if (!isset($current[$tag])) { //New Key
+					$current[$tag] = $result;
+
+				} else { //If taken, put all things inside a list(array)
+					if ((is_array($current[$tag]) && $get_attributes == 0)//If it is already an array...
+						|| (isset($current[$tag][0]) && is_array($current[$tag][0]) && ($get_attributes == 1 || $get_attributes == 2))
+					) {
+						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
+					}
+				}
+
+			} elseif ($type == 'close') { //End of tag '</tag>'
+				$current = &$parent[$level - 1];
+			}
+		}
+
+		return ($xml_array);
+	}
+
+	/*
      * If the stdClass has a done, we know it is a QueryResult
     */
-    public function isQueryResult($param)
-    {
-        return isset($param->done);
-    }
+	public function isQueryResult($param)
+	{
+		return isset($param->done);
+	}
 
-    /*
+	/*
      * If the stdClass has a type, we know it is an SObject
     */
-    public function isSObject($param)
-    {
-        return isset($param->type);
-    }
+	public function isSObject($param)
+	{
+		return isset($param->type);
+	}
 }
 
 ?>

Spacing +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@ 
     {
         $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>',
+        $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();
@@ -185,11 +185,11 @@ 
         $current = &$xml_array;
 
         foreach ($xml_values as $data) {
-            unset($attributes, $value);//Remove existing values, or there will be trouble
+            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) {

src/Davispeixoto/ForceDotComToolkitForPhp/PackageVersionHeader.php

Indentation +14 added lines, -14 removed lines

@@ -28,21 +28,21 @@
 
 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;
+	}
 }
 
 

src/Davispeixoto/ForceDotComToolkitForPhp/AllowFieldTruncationHeader.php

Indentation +5 added lines, -5 removed lines

@@ -28,12 +28,12 @@
 
 class AllowFieldTruncationHeader
 {
-    public $allowFieldTruncation;
+	public $allowFieldTruncation;
 
-    public function __construct($allowFieldTruncation)
-    {
-        $this->allowFieldTruncation = $allowFieldTruncation;
-    }
+	public function __construct($allowFieldTruncation)
+	{
+		$this->allowFieldTruncation = $allowFieldTruncation;
+	}
 }
 
 ?>

src/Davispeixoto/ForceDotComToolkitForPhp/SforceFieldTypes.php

Indentation +13 added lines, -13 removed lines

@@ -28,23 +28,23 @@
 
 class SforceFieldTypes
 {
-    const DEPLOYMENT_STATUS_INDEVELOPMENT = 'InDevelopment';
-    const DEPLOYMENT_STATUS_DEPLOYED = 'Deployed';
+	const DEPLOYMENT_STATUS_INDEVELOPMENT = 'InDevelopment';
+	const DEPLOYMENT_STATUS_DEPLOYED = 'Deployed';
 
-    const GENDER_NEUTER = 'Neuter';
-    const GENDER_MASCULINE = 'Masculine';
-    const GENDER_FEMININE = 'Feminine';
+	const GENDER_NEUTER = 'Neuter';
+	const GENDER_MASCULINE = 'Masculine';
+	const GENDER_FEMININE = 'Feminine';
 
-    const SHARING_MODEL_PRIVATE = 'Private';
-    const SHARING_MODEL_READ = 'Read';
-    const SHARING_MODEL_READWRITE = 'ReadWrite';
+	const SHARING_MODEL_PRIVATE = 'Private';
+	const SHARING_MODEL_READ = 'Read';
+	const SHARING_MODEL_READWRITE = 'ReadWrite';
 
-    const STARTS_WITH_CONSONANT = 'Consonant';
-    const STARTS_WITH_VOWEL = 'Vowel';
-    const STARTS_WITH_SPECIAL = 'Special';
+	const STARTS_WITH_CONSONANT = 'Consonant';
+	const STARTS_WITH_VOWEL = 'Vowel';
+	const STARTS_WITH_SPECIAL = 'Special';
 
-    const TREAT_BLANKS_AS_BLANK = 'BlankAsBlank';
-    const TREAT_BLANKS_AS_ZERO = 'BlankAsZero';
+	const TREAT_BLANKS_AS_BLANK = 'BlankAsBlank';
+	const TREAT_BLANKS_AS_ZERO = 'BlankAsZero';
 }
 
 ?>

src/Davispeixoto/ForceDotComToolkitForPhp/UserTerritoryDeleteHeader.php

Indentation +5 added lines, -5 removed lines

@@ -28,12 +28,12 @@
 
 class UserTerritoryDeleteHeader
 {
-    public $transferToUserId;
+	public $transferToUserId;
 
-    public function __construct($transferToUserId)
-    {
-        $this->transferToUserId = $transferToUserId;
-    }
+	public function __construct($transferToUserId)
+	{
+		$this->transferToUserId = $transferToUserId;
+	}
 }
 
 ?>

src/Davispeixoto/ForceDotComToolkitForPhp/LocaleOptions.php

Indentation +11 added lines, -11 removed lines

@@ -29,18 +29,18 @@
 
 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;
+	}
 }
 
 ?>