Fixed issue with "my" instances

j-d · j-d · commit dd83efb46ff2 · 2014-11-24T18:39:48.000Z
Fixes issue with instances in the form https://instance.my.salesforce.com
diff --git a/src/Phpforce/SoapClient/Result/LoginResult.php b/src/Phpforce/SoapClient/Result/LoginResult.php
@@ -83,7 +83,7 @@ public function getServerInstance()
         }
 
         $match = preg_match(
-            '/https:\/\/(?<instance>[^-\.]+)/',
+            '/https:\/\/(?<instance>[^-]+)\.salesforce\.com/',
             $this->serverUrl,
             $matches
         );
@@ -94,4 +94,4 @@ public function getServerInstance()
 
         return $matches['instance'];
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function getServerInstance()`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`$match = preg_match(`
`86`		`- '/https:\/\/(?<instance>[^-\.]+)/',`
	`86`	`+ '/https:\/\/(?<instance>[^-]+)\.salesforce\.com/',`
`87`	`87`	`$this->serverUrl,`
`88`	`88`	`$matches`
`89`	`89`	`);`
`@@ -94,4 +94,4 @@ public function getServerInstance()`
`94`	`94`
`95`	`95`	`return $matches['instance'];`
`96`	`96`	`}`
`97`		`-}`
	`97`	`+}`