OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-12-23 07:33:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Split try catch to prevent undefined variables

Browse Source
This commit is contained in:
Alejandro Celaya 2018-05-01 19:38:44 +02:00
parent e5e1aa2ff4
commit a2294704e6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/Rest/config/routes.config.php
View File

@ -1,7 +1,6 @@
<?php
declare(strict_types=1);
use Fig\Http\Message\RequestMethodInterface as RequestMethod;
use Shlinkio\Shlink\Rest\Action;
return [

14
module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php
View File

@ -57,7 +57,15 @@ abstract class AbstractCreateShortCodeAction extends AbstractRestAction
$shortCodeMeta = $shortCodeData->getMeta();
$longUrl = $shortCodeData->getLongUrl();
$customSlug = $shortCodeMeta->getCustomSlug();
} catch (ValidationException | InvalidArgumentException $e) {
$this->logger->warning('Provided data is invalid.' . PHP_EOL . $e);
return new JsonResponse([
'error' => RestUtils::INVALID_ARGUMENT_ERROR,
'message' => $this->translator->translate('Provided data is invalid'),
], self::STATUS_BAD_REQUEST);
}
try {
$shortCode = $this->urlShortener->urlToShortCode(
$longUrl,
$shortCodeData->getTags(),
@ -94,12 +102,6 @@ abstract class AbstractCreateShortCodeAction extends AbstractRestAction
$customSlug
),
], self::STATUS_BAD_REQUEST);
} catch (ValidationException | InvalidArgumentException $e) {
$this->logger->warning('Provided data is invalid.' . PHP_EOL . $e);
return new JsonResponse([
'error' => RestUtils::INVALID_ARGUMENT_ERROR,
'message' => $this->translator->translate('Provided data is invalid'),
], self::STATUS_BAD_REQUEST);
} catch (\Throwable $e) {
$this->logger->error('Unexpected error creating shortcode.' . PHP_EOL . $e);
return new JsonResponse([