Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

PR feedback: add type hints, create new methods and save on extra api request

Browse Source 
MAILPOET-4601
This commit is contained in:
Oluwaseun Olorunsola
2022-09-16 06:42:38 +01:00
committed by Aschepikov
parent 32a58301b0
commit a006701d78
5 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mailpoet/lib/Services/AuthorizedEmailsController.php
View File

@ -51,7 +51,7 @@ class AuthorizedEmailsController {
public function setFromEmailAddress(string $address) {
$authorizedEmails = $this->bridge->getAuthorizedEmailAddresses() ?: [];
$verifiedDomains = $this->senderDomainController->getVerifiedSenderDomains(true);
$verifiedDomains = $this->senderDomainController->getVerifiedSenderDomainsIgnoringCache();
$isAuthorized = $this->validateAuthorizedEmail($authorizedEmails, $address);
$emailDomainIsVerified = $this->validateEmailDomainIsVerified($verifiedDomains, $address);
@ -122,7 +122,7 @@ class AuthorizedEmailsController {
}
$authorizedEmails = array_map('strtolower', $authorizedEmails);
$verifiedDomains = $this->senderDomainController->getVerifiedSenderDomains(true);
$verifiedDomains = $this->senderDomainController->getVerifiedSenderDomainsIgnoringCache();
$result = [];
$result = $this->validateAddressesInSettings($authorizedEmails, $verifiedDomains, $result);
@ -213,7 +213,7 @@ class AuthorizedEmailsController {
return in_array(strtolower($email), $lowercaseAuthorizedEmails, true);
}
private function validateEmailDomainIsVerified($verifiedDomains = [], $email = ''): bool {
private function validateEmailDomainIsVerified(array $verifiedDomains = [], string $email = ''): bool {
$lowercaseVerifiedDomains = array_map('strtolower', $verifiedDomains);
$arrayOfItems = explode('@', $email);
$emailDomain = array_pop($arrayOfItems);