Skip to content

Commit

Permalink
Remove unused parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
eileenmcnaughton committed Sep 7, 2023
1 parent 7171a82 commit 2dc70de
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions CRM/Utils/Mail/Incoming.php
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,7 @@ private static function parseAddress($address, &$subParam, &$mail, $createContac

$contactID = self::getContactID($subParam['email'],
$subParam['name'],
$createContact,
$mail
$createContact
);
$subParam['id'] = $contactID ?: NULL;
}
Expand Down Expand Up @@ -397,11 +396,12 @@ private static function parseAddresses(&$addresses, $token, &$params, &$mail, $c
* @param string $email
* @param string $name
* @param bool $create
* @param string $mail
*
* @internal core use only (only use outside this class is in core unit tests).
*
* @return int|null
*/
public static function getContactID($email, $name, $create, &$mail) {
public static function getContactID($email, $name, $create) {
$dao = CRM_Contact_BAO_Contact::matchContactOnEmail($email, 'Individual');

$contactID = NULL;
Expand Down
8 changes: 4 additions & 4 deletions tests/phpunit/CRM/Utils/Mail/IncomingTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function setUp(): void {
public function testEmailUseExistentIndividualContact(): void {
$expectedContactId = $this->individualCreate(['email' => $this->email]);

$receivedContactId = CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE, $mail);
$receivedContactId = CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE);

$this->assertEquals($expectedContactId, $receivedContactId);
}
Expand All @@ -58,7 +58,7 @@ public function testEmailCreateIndividualContact(): void {
$contact = CRM_Contact_BAO_Contact::matchContactOnEmail($this->email, 'Individual');
$this->assertNull($contact);

CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE, $mail);
CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE);

$contact = CRM_Contact_BAO_Contact::matchContactOnEmail($this->email, 'Individual');
$this->assertNotNull($contact);
Expand All @@ -70,7 +70,7 @@ public function testEmailCreateIndividualContact(): void {
public function testEmailUseExistentOrganizationContact(): void {
$expectedContactId = $this->organizationCreate(['email' => $this->email]);

$receivedContactId = CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE, $mail);
$receivedContactId = CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE);

$this->assertEquals($expectedContactId, $receivedContactId);
}
Expand All @@ -82,7 +82,7 @@ public function testEmailPrefersExistentIndividualContact(): void {
$individualContactId = $this->individualCreate(['email' => $this->email]);
$this->organizationCreate(['email' => $this->email]);

$receivedContactId = CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE, $mail);
$receivedContactId = CRM_Utils_Mail_Incoming::getContactID($this->email, $this->name, TRUE);

$this->assertEquals($individualContactId, $receivedContactId);
}
Expand Down

0 comments on commit 2dc70de

Please sign in to comment.