Use createNotFoundException method instead of directly creating NotFo…

…undHttpException
netgen · Sep 3, 2020 · a728ae1 · a728ae1
1 parent 24028d8
commit a728ae1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/bundle/Controller/DownloadController.php b/bundle/Controller/DownloadController.php
@@ -13,7 +13,6 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Translation\TranslatorInterface;
 use function str_replace;
 
@@ -77,7 +76,7 @@ public function downloadFile(Request $request, $contentId, $fieldId, $isInline =
         );
 
         if (!$content->hasFieldById($fieldId) || $content->getFieldById($fieldId)->isEmpty()) {
-            throw new NotFoundHttpException(
+            throw $this->createNotFoundException(
                 $this->translator->trans('download.file_not_found', [], 'ngsite')
             );
         }
@@ -104,7 +103,7 @@ public function downloadFile(Request $request, $contentId, $fieldId, $isInline =
             $ioService = $this->ioImageService;
             $binaryFile = $this->ioImageService->loadBinaryFile($binaryFieldValue->id);
         } else {
-            throw new NotFoundHttpException(
+            throw $this->createNotFoundException(
                 $this->translator->trans('download.file_not_found', [], 'ngsite')
             );
         }

diff --git a/bundle/Controller/UserController.php b/bundle/Controller/UserController.php
@@ -22,7 +22,6 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Validator\Constraints;
 use function time;
 
@@ -208,7 +207,7 @@ public function activate(string $hash): Response
         $accountKey = $this->accountKeyRepository->getByHash($hash);
 
         if (!$accountKey instanceof EzUserAccountKey) {
-            throw new NotFoundHttpException();
+            throw $this->createNotFoundException();
         }
 
         if (time() - $accountKey->getTime() > $this->getConfigResolver()->getParameter('user.activate_hash_validity_time', 'ngsite')) {
@@ -225,7 +224,7 @@ public function activate(string $hash): Response
         try {
             $user = $this->userService->loadUser($accountKey->getUserId());
         } catch (NotFoundException $e) {
-            throw new NotFoundHttpException();
+            throw $this->createNotFoundException();
         }
 
         $userUpdateStruct = $this->userService->newUserUpdateStruct();
@@ -290,7 +289,7 @@ public function resetPassword(Request $request, string $hash): Response
         $accountKey = $this->accountKeyRepository->getByHash($hash);
 
         if (!$accountKey instanceof EzUserAccountKey) {
-            throw new NotFoundHttpException();
+            throw $this->createNotFoundException();
         }
 
         if (time() - $accountKey->getTime() > $this->getConfigResolver()->getParameter('user.forgot_password_hash_validity_time', 'ngsite')) {
@@ -307,7 +306,7 @@ public function resetPassword(Request $request, string $hash): Response
         try {
             $user = $this->userService->loadUser($accountKey->getUserId());
         } catch (NotFoundException $e) {
-            throw new NotFoundHttpException();
+            throw $this->createNotFoundException();
         }
 
         $form = $this->createResetPasswordForm();