Skip to content

Commit

Permalink
Merge pull request #591 from XWB/fosrest2
Browse files Browse the repository at this point in the history 
Removed class constants in ThreadController
  • Loading branch information
@XWB
XWB committed Mar 1, 2017
2 parents b0ecad2 + b8723e7 commit 4612bb2
Showing 1 changed file with 15 additions and 19 deletions.
34 changes: 15 additions & 19 deletions Controller/ThreadController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
*/
class ThreadController extends Controller
{
const HTTP_BAD_REQUEST = 400;
const HTTP_OK = 200;
const HTTP_CREATED = 201;

const VIEW_FLAT = 'flat';
const VIEW_TREE = 'tree';

Expand Down Expand Up @@ -416,7 +412,7 @@ public function getThreadCommentsAction(Request $request, $id)
}
if (count($errors) > 0) {
$view = View::create()
->setStatusCode(self::HTTP_BAD_REQUEST)
->setStatusCode(Response::HTTP_BAD_REQUEST)
->setData(array('errors' => $errors))
->setTemplate(new TemplateReference('FOSCommentBundle', 'Thread', 'errors'));

Expand Down Expand Up @@ -460,7 +456,7 @@ public function getThreadCommentsAction(Request $request, $id)
$templatingHandler = function ($handler, $view, $request) {
$view->setTemplate(new TemplateReference('FOSCommentBundle', 'Thread', 'thread_xml_feed'));

return new Response($handler->renderTemplate($view, 'rss'), self::HTTP_OK, $view->getHeaders());
return new Response($handler->renderTemplate($view, 'rss'), Response::HTTP_OK, $view->getHeaders());
};

$this->get('fos_rest.view_handler')->registerHandler('rss', $templatingHandler);
Expand Down Expand Up @@ -613,7 +609,7 @@ public function postThreadCommentVotesAction(Request $request, $id, $commentId)
*/
protected function onCreateCommentSuccess(FormInterface $form, $id, CommentInterface $parent = null)
{
return View::createRouteRedirect('fos_comment_get_thread_comment', array('id' => $id, 'commentId' => $form->getData()->getId()), self::HTTP_CREATED);
return View::createRouteRedirect('fos_comment_get_thread_comment', array('id' => $id, 'commentId' => $form->getData()->getId()), Response::HTTP_CREATED);
}

/**
Expand All @@ -628,7 +624,7 @@ protected function onCreateCommentSuccess(FormInterface $form, $id, CommentInter
protected function onCreateCommentError(FormInterface $form, $id, CommentInterface $parent = null)
{
$view = View::create()
->setStatusCode(self::HTTP_BAD_REQUEST)
->setStatusCode(Response::HTTP_BAD_REQUEST)
->setData(array(
'form' => $form,
'id' => $id,
Expand All @@ -648,7 +644,7 @@ protected function onCreateCommentError(FormInterface $form, $id, CommentInterfa
*/
protected function onCreateThreadSuccess(FormInterface $form)
{
return View::createRouteRedirect('fos_comment_get_thread', array('id' => $form->getData()->getId()), self::HTTP_CREATED);
return View::createRouteRedirect('fos_comment_get_thread', array('id' => $form->getData()->getId()), Response::HTTP_CREATED);
}

/**
Expand All @@ -661,7 +657,7 @@ protected function onCreateThreadSuccess(FormInterface $form)
protected function onCreateThreadError(FormInterface $form)
{
$view = View::create()
->setStatusCode(self::HTTP_BAD_REQUEST)
->setStatusCode(Response::HTTP_BAD_REQUEST)
->setData(array(
'form' => $form,
))
Expand All @@ -679,7 +675,7 @@ protected function onCreateThreadError(FormInterface $form)
*/
protected function onCreateThreadErrorDuplicate(FormInterface $form)
{
return new Response(sprintf("Duplicate thread id '%s'.", $form->getData()->getId()), self::HTTP_BAD_REQUEST);
return new Response(sprintf("Duplicate thread id '%s'.", $form->getData()->getId()), Response::HTTP_BAD_REQUEST);
}

/**
Expand All @@ -695,7 +691,7 @@ protected function onCreateThreadErrorDuplicate(FormInterface $form)
*/
protected function onCreateVoteSuccess(FormInterface $form, $id, $commentId)
{
return View::createRouteRedirect('fos_comment_get_thread_comment_votes', array('id' => $id, 'commentId' => $commentId), self::HTTP_CREATED);
return View::createRouteRedirect('fos_comment_get_thread_comment_votes', array('id' => $id, 'commentId' => $commentId), Response::HTTP_CREATED);
}

/**
Expand All @@ -710,7 +706,7 @@ protected function onCreateVoteSuccess(FormInterface $form, $id, $commentId)
protected function onCreateVoteError(FormInterface $form, $id, $commentId)
{
$view = View::create()
->setStatusCode(self::HTTP_BAD_REQUEST)
->setStatusCode(Response::HTTP_BAD_REQUEST)
->setData(array(
'id' => $id,
'commentId' => $commentId,
Expand All @@ -731,7 +727,7 @@ protected function onCreateVoteError(FormInterface $form, $id, $commentId)
*/
protected function onEditCommentSuccess(FormInterface $form, $id)
{
return View::createRouteRedirect('fos_comment_get_thread_comment', array('id' => $id, 'commentId' => $form->getData()->getId()), self::HTTP_CREATED);
return View::createRouteRedirect('fos_comment_get_thread_comment', array('id' => $id, 'commentId' => $form->getData()->getId()), Response::HTTP_CREATED);
}

/**
Expand All @@ -745,7 +741,7 @@ protected function onEditCommentSuccess(FormInterface $form, $id)
protected function onEditCommentError(FormInterface $form, $id)
{
$view = View::create()
->setStatusCode(self::HTTP_BAD_REQUEST)
->setStatusCode(Response::HTTP_BAD_REQUEST)
->setData(array(
'form' => $form,
'comment' => $form->getData(),
Expand All @@ -764,7 +760,7 @@ protected function onEditCommentError(FormInterface $form, $id)
*/
protected function onOpenThreadSuccess(FormInterface $form)
{
return View::createRouteRedirect('fos_comment_edit_thread_commentable', array('id' => $form->getData()->getId(), 'value' => !$form->getData()->isCommentable()), self::HTTP_CREATED);
return View::createRouteRedirect('fos_comment_edit_thread_commentable', array('id' => $form->getData()->getId(), 'value' => !$form->getData()->isCommentable()), Response::HTTP_CREATED);
}

/**
Expand All @@ -777,7 +773,7 @@ protected function onOpenThreadSuccess(FormInterface $form)
protected function onOpenThreadError(FormInterface $form)
{
$view = View::create()
->setStatusCode(self::HTTP_BAD_REQUEST)
->setStatusCode(Response::HTTP_BAD_REQUEST)
->setData(array(
'form' => $form,
'id' => $form->getData()->getId(),
Expand All @@ -798,7 +794,7 @@ protected function onOpenThreadError(FormInterface $form)
*/
protected function onRemoveThreadCommentSuccess(FormInterface $form, $id)
{
return View::createRouteRedirect('fos_comment_get_thread_comment', array('id' => $id, 'commentId' => $form->getData()->getId()), self::HTTP_CREATED);
return View::createRouteRedirect('fos_comment_get_thread_comment', array('id' => $id, 'commentId' => $form->getData()->getId()), Response::HTTP_CREATED);
}

/**
Expand All @@ -812,7 +808,7 @@ protected function onRemoveThreadCommentSuccess(FormInterface $form, $id)
protected function onRemoveThreadCommentError(FormInterface $form, $id)
{
$view = View::create()
->setStatusCode(self::HTTP_BAD_REQUEST)
->setStatusCode(Response::HTTP_BAD_REQUEST)
->setData(array(
'form' => $form,
'id' => $id,
Expand Down

0 comments on commit 4612bb2

Please sign in to comment.