X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FContact%2FMergeContactsTest.php;h=c5b03066ef056d9eb4a8d217638aa71d8715dc9f;hb=c24be2289c776d9ee74980d0db74996804bd0eff;hp=94bdd06cff0cf8660eecd7710c2999d1a616b38d;hpb=22e263ad985b62de5cf7bdaf09555bfb3f0cd322;p=civicrm-core.git

diff --git a/tests/phpunit/WebTest/Contact/MergeContactsTest.php b/tests/phpunit/WebTest/Contact/MergeContactsTest.php
index 94bdd06cff..c5b03066ef 100644
--- a/tests/phpunit/WebTest/Contact/MergeContactsTest.php
+++ b/tests/phpunit/WebTest/Contact/MergeContactsTest.php
@@ -204,7 +204,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
     $this->openCiviPage("contact/add", "reset=1&ct=Individual");
     $this->waitForElementPresent('_qf_Contact_cancel-bottom');
     //fill in first name
-    $firstName = "Anderson".substr(sha1(rand()), 0, 4);
+    $firstName = "Anderson" . substr(sha1(rand()), 0, 4);
     $this->type('first_name', $firstName);
 
     //fill in last name
@@ -226,7 +226,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
     $this->openCiviPage("contact/add", "reset=1&ct=Individual");
     $this->waitForElementPresent('_qf_Contact_cancel-bottom');
 
-    $fName = "John".substr(sha1(rand()), 0, 4);
+    $fName = "John" . substr(sha1(rand()), 0, 4);
     $this->type('first_name', $fName);
     $lName = substr(sha1(rand()), 0, 4);
     $this->type('last_name', $lName);
@@ -499,14 +499,14 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
     $this->assertTrue($this->isElementPresent("xpath=//div[@id='phone-block']/div/div/div[3]/div[2][contains(text(), '9876543210')]"));
   }
 
-  public function testBatchMerge(){
+  public function testBatchMerge() {
     $this->webtestLogin();
 
     // add contact1 and its duplicate
     //first name
-    $firstName = "Kerry".substr(sha1(rand()), 0, 7);
+    $firstName = "Kerry" . substr(sha1(rand()), 0, 7);
     //last name
-    $lastName = "King".substr(sha1(rand()), 0, 7);
+    $lastName = "King" . substr(sha1(rand()), 0, 7);
     $this->_createContacts($firstName, $lastName);
 
     //add contact2 and its duplicate
@@ -514,11 +514,11 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
     $this->openCiviPage("contact/add", "reset=1&ct=Individual");
 
     //fill in first name
-    $firstName1 = "Kurt".substr(sha1(rand()), 0, 7);
+    $firstName1 = "Kurt" . substr(sha1(rand()), 0, 7);
     $this->type('first_name', $firstName1);
 
     //fill in last name
-    $lastName1 = "Cobain".substr(sha1(rand()), 0, 7);
+    $lastName1 = "Cobain" . substr(sha1(rand()), 0, 7);
     $this->type('last_name', $lastName1);
 
     //fill in email id
@@ -576,16 +576,16 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
 
     // add contact3 and its duplicate
     //fill in first name
-    $firstName2 = "David".substr(sha1(rand()), 0, 7);
+    $firstName2 = "David" . substr(sha1(rand()), 0, 7);
     //fill in last name
-    $lastName2 = "Gilmour".substr(sha1(rand()), 0, 7);
+    $lastName2 = "Gilmour" . substr(sha1(rand()), 0, 7);
     $this->_createContacts($firstName2, $lastName2);
 
     // add contact4 and its duplicate
     //fill in first name
-    $firstName3 = "Dave".substr(sha1(rand()), 0, 7);
+    $firstName3 = "Dave" . substr(sha1(rand()), 0, 7);
     //fill in last name
-    $lastName3 = "Mustaine".substr(sha1(rand()), 0, 7);
+    $lastName3 = "Mustaine" . substr(sha1(rand()), 0, 7);
     $this->_createContacts($firstName3, $lastName3);
 
     // Find and Merge Contacts with Supervised Rule
@@ -739,7 +739,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
     $this->select2('member_of_contact_id', $membershipOrganization);
 
     $this->type('minimum_fee', '1');
-    $this->select( 'financial_type_id', 'value=2' );
+    $this->select('financial_type_id', 'value=2');
     $this->type('duration_interval', 1);
     $this->select('duration_unit', "label=year");
 
@@ -765,7 +765,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
     $this->webtestLogin();
 
     // build organisation name
-    $orgnaizationName = 'org_'.substr(sha1(rand()), 0, 7);
+    $orgnaizationName = 'org_' . substr(sha1(rand()), 0, 7);
 
     $contactIds = array();
     // create organization and its duplicate