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

Remove catch block and change quotes

Browse Source 
Remove catch block to log unexpected exceptions and change quotes for consistency on error message.

[MAILPOET-4259]
This commit is contained in:
Brezo Cordero
2022-05-24 10:25:14 -05:00
committed by Veljko V
parent 53b9f79e65
commit 3d1365595b
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mailpoet/lib/API/JSON/v1/Subscribers.php
View File

@@ -152,6 +152,7 @@ class Subscribers extends APIEndpoint {
/** /**
* @param array $data * @param array $data
* @return ErrorResponse|SuccessResponse * @return ErrorResponse|SuccessResponse
* @throws \Exception
*/ */
public function save(array $data = []) { public function save(array $data = []) {
try { try {
@@ -162,11 +163,8 @@ class Subscribers extends APIEndpoint {
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => $conflictException->getMessage(), APIError::BAD_REQUEST => $conflictException->getMessage(),
]); ]);
} catch (\Exception $unknownException) { };
return $this->badRequest([
APIError::UNKNOWN => __('Saving subscriber failed.', 'mailpoet'),
]);
}
return $this->successResponse( return $this->successResponse(
$this->subscribersResponseBuilder->build($subscriber) $this->subscribersResponseBuilder->build($subscriber)
); );

2
mailpoet/lib/Subscribers/SubscriberSaveController.php
View File

@@ -229,7 +229,7 @@ class SubscriberSaveController {
private function verifyEmailIsUnique(string $email): void { private function verifyEmailIsUnique(string $email): void {
$existingSubscriber = $this->subscribersRepository->findOneBy(['email' => $email]); $existingSubscriber = $this->subscribersRepository->findOneBy(['email' => $email]);
if ($existingSubscriber) { if ($existingSubscriber) {
$exceptionMessage = __(sprintf("A subscriber with E-mail '%s' already exists.", $email), 'mailpoet'); $exceptionMessage = __(sprintf('A subscriber with E-mail "%s" already exists.', $email), 'mailpoet');
throw new ConflictException($exceptionMessage); throw new ConflictException($exceptionMessage);
} }
} }

2
mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php
View File

@@ -295,7 +295,7 @@ class SubscribersTest extends \MailPoetTest {
$response = $this->endpoint->save($subscriberData); $response = $this->endpoint->save($subscriberData);
$this->assertInstanceOf(ErrorResponse::class, $response); $this->assertInstanceOf(ErrorResponse::class, $response);
expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST); expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
expect($response->errors[0]['message'])->equals("A subscriber with E-mail '{$this->subscriber1->getEmail()}' already exists."); expect($response->errors[0]['message'])->equals('A subscriber with E-mail "' . $this->subscriber1->getEmail() . '" already exists.');
} }
public function testItCanRemoveListsFromAnExistingSubscriber() { public function testItCanRemoveListsFromAnExistingSubscriber() {

2
mailpoet/tests/integration/Subscribers/SubscriberSaveControllerTest.php
View File

@@ -99,7 +99,7 @@ class SubscriberSaveControllerTest extends \MailPoetTest {
$this->entityManager->clear(); $this->entityManager->clear();
$this->expectException(ConflictException::class); $this->expectException(ConflictException::class);
$this->expectExceptionMessage("A subscriber with E-mail '{$subscriber2->getEmail()}' already exists."); $this->expectExceptionMessage('A subscriber with E-mail "' . $subscriber2->getEmail() . '" already exists.');
$this->saveController->save($data); $this->saveController->save($data);
} }