Fix serialization with JMS Serializer for remainitn controllers anc methods.

src/Controller/CommentController.php

@@ -11,8 +11,10 @@ use FOS\RestBundle\Controller\Annotations\Get;
 use FOS\RestBundle\Controller\Annotations\Post;
 use FOS\RestBundle\Controller\Annotations\Route;
 use JMS\Serializer\SerializerBuilder;
+use JMS\Serializer\SerializerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Class DefaultController
@@ -30,13 +32,19 @@ class CommentController extends FramadateController {
 	 */
 	public
 	function getPollCommentsAction(
-		Poll $poll
+      SerializerInterface $serializer,
+      Poll $poll
 	) {
-		return $this->json( [
+    $jsonResponse = $serializer->serialize([
-			'message' => 'here are your comments of the poll',
+        'message' => 'here are your comments of the poll',
-			'data'    => $poll->getComments(),
+        'data'    => $poll->getComments()], 'json');
-		],
+
-			200 );
+    $response = new Response($jsonResponse);
+    $response->headers->set('Content-Type', 'application/json');
+    $response->setStatusCode(200);
+
+    return $response;
+
 	}
 
 	/**

src/Controller/PollController.php

@@ -50,6 +50,7 @@ class PollController extends FramadateController {
    * @param SerializerInterface $serializer
    * @param Poll $poll
    * @param Request $request
+   *
    * @return JsonResponse|Response
    */
 	public function getPollConfig(
@@ -102,8 +103,7 @@ class PollController extends FramadateController {
 	 *     requirements = {"content"="\w+",  "poll_id"="\d+"}
 	 * )
 	 */
-	public
+	public function updatePollConfig(
-	function updatePollConfig(
 		Poll $poll,
 		string $token,
 		Request $request
@@ -211,7 +211,7 @@ class PollController extends FramadateController {
 				// different hours spans
 				$choices = $data[ 'dateList' ];
 			} else {
-
+//TODO (Sébastien) I assume this shouldn't be empty ?
 // all days have the same hour spans
 			}
 
@@ -350,46 +350,46 @@ class PollController extends FramadateController {
 
 	}
 
-
+  /**
-	/**
+   * Get Admin poll config
-	 * Get Admin poll config
+   * @Get(
-	 * @Get(
+   *     path = "/admin/{token}",
-	 *     path = "/admin/{token}",
+   *     name = "get_admin_config",
-	 *     name = "get_admin_config",
+   * )
-	 * )
+   * @param SerializerInterface $serializer
-	 */
+   * @param $token
-	public function getAdministrationConfig( $token ) {
+   *
+   * @return JsonResponse|Response
+   */
+	public function getAdministrationConfig(SerializerInterface $serializer, $token ) {
 		$emPoll    = $this->getDoctrine()->getRepository( Poll::class );
 		$pollFound = $emPoll->findOneByAdminKey( $token );
+
 		if ( $pollFound ) {
 
 			$poll     = $pollFound;
-			$comments = [];
+			$comments = $poll->getComments();
-			$stacks   = [];
+			$stacks   = $poll->getStacksOfVotes();
-			$choices  = [];
+
-			foreach ( $poll->getComments() as $c ) {
-				$comments[] = $c->display();
-			}
-			foreach ( $poll->getStacksOfVotes() as $c ) {
-				$stacks[] = $c->display();
-			}
-			foreach ( $poll->getChoices() as $c ) {
-				$choices[] = $c->display();
-			}
 			$returnedPoll = [
 				'message'        => 'your poll config',
 				'poll'           => $poll,
-				'stacks_count'   => count( $poll->getStacksOfVotes() ),
+				'stacks_count'   => count( $stacks ),
 				'stacks'         => $stacks,
 				'choices_count'  => $poll->computeAnswers(),
-				'choices'        => $choices,
+				'choices'        => $poll->getChoices(),
 				'comments'       => $comments,
 				'comments_count' => count( $comments ),
 				'token'          => $token,
 			];
 
-			return $this->json( $returnedPoll,
+      $jsonResponse = $serializer->serialize($returnedPoll, 'json');
-				200 );
+
+      $response = new Response($jsonResponse);
+      $response->headers->set('Content-Type', 'application/json');
+      $response->setStatusCode(200);
+
+      return $response;
 		}
 
 		return $this->json( [

src/Controller/VoteController.php

@@ -11,8 +11,10 @@ use FOS\RestBundle\Controller\Annotations\Delete;
 use FOS\RestBundle\Controller\Annotations\Patch;
 use FOS\RestBundle\Controller\Annotations\Post;
 use FOS\RestBundle\Controller\Annotations\Route;
+use JMS\Serializer\SerializerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Class DefaultController
@@ -21,18 +23,23 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class VoteController extends FramadateController {
 
-	/**
+  /**
-	 * add a vote stack on a poll
+   * add a vote stack on a poll
-	 * @Post(
+   * @Post(
-	 *     path = "/poll/{id}/vote",
+   *     path = "/poll/{id}/vote",
-	 *     name = "new_vote_stack",
+   *     name = "new_vote_stack",
-	 *     requirements = {"content"="\w+",  "poll_id"="\d+"}
+   *     requirements = {"content"="\w+",  "poll_id"="\d+"}
-	 * )
+   * )
-	 */
+   * @param SerializerInterface $serializer
-	public
+   * @param Poll $poll
-	function newVoteStackAction(
+   * @param Request $request
-		Poll $poll,
+   *
-		Request $request
+   * @return JsonResponse|Response
+   */
+	public function newVoteStackAction(
+      SerializerInterface $serializer,
+      Poll $poll,
+      Request $request
 	) {
 		if ( ! $poll ) {
 			return $this->json( [ 'message' => 'poll not found' ], 404 );
@@ -106,55 +113,57 @@ class VoteController extends FramadateController {
 		if ( $existingOwner ) {
 			$precision = ' from an existing owner : ' . $foundOwner->getEmail();
 		}
-		$comments = [];
+		$stacks   = $poll->getStacksOfVotes();
-		$stacks   = [];
-		$choices  = [];
-		foreach ( $poll->getComments() as $c ) {
-			$comments[] = $c->display();
-		}
-		foreach ( $poll->getStacksOfVotes() as $c ) {
-			$stacks[] = $c->display();
-		}
-		foreach ( $poll->getChoices() as $c ) {
-			$choices[] = $c->display();
-		}
-
 
 		if($poll->getMailOnVote()){
 			$this->sendVoteNotificationAction($stack->getOwner(), $stack);
 		}
 
+		$returnedVoteStack = [
+        'message'              => 'you created a vote stack' . $precision,
+        'poll'                 => $poll,
+        'vote_stack'           => $stack,
+        'stacks'               => $stacks,
+        'comments'             => $poll->getComments(),
+        'choices'              => $poll->getChoices(),
+        'choices_count'        => $poll->computeAnswers(),
+        'vote_count'           => count( $stacks ),
+        'owner'                => $stack->getOwner(),
+        'owner_modifier_token' => $stack->getOwner()->getModifierToken(),
+        'admin_key'            => $poll->getAdminKey(),
+        'json_you_sent'        => $data,
+    ];
+
+    $jsonResponse = $serializer->serialize($returnedVoteStack, 'json');
+
+    $response = new Response($jsonResponse);
+    $response->headers->set('Content-Type', 'application/json');
+    $response->setStatusCode(200);
+
+    return $response;
 
-		return $this->json( [
-			'message'              => 'you created a vote stack' . $precision,
-			'poll'                 => $poll,
-			'vote_stack'           => $stack->display(),
-			'stacks'               => $stacks,
-			'comments'             => $comments,
-			'choices'              => $choices,
-			'choices_count'        => $poll->computeAnswers(),
-			'vote_count'           => count( $poll->getStacksOfVotes() ),
-			'owner'                => $stack->getOwner(),
-			'owner_modifier_token' => $stack->getOwner()->getModifierToken(),
-			'admin_key'            => $poll->getAdminKey(),
-			'json_you_sent'        => $data,
-		],
-			201 );
 	}
 
-	/**
+  /**
-	 * update vote stack
+   * update vote stack
-	 * @Patch(
+   * @Patch(
-	 *     path = "/vote-stack/{id}/token/{modifierToken}",
+   *     path = "/vote-stack/{id}/token/{modifierToken}",
-	 *     name = "update_vote_stack",
+   *     name = "update_vote_stack",
-	 *     requirements = { "id"="\d+"}
+   *     requirements = { "id"="\d+"}
-	 * )
+   * )
-	 */
+   * @param SerializerInterface $serializer
+   * @param StackOfVotes $id
+   * @param $modifierToken
+   * @param Request $request
+   *
+   * @return JsonResponse|Response
+   */
 	public
 	function updateVoteStackAction(
-		StackOfVotes $id,
+      SerializerInterface $serializer,
-		$modifierToken,
+      StackOfVotes $id,
-		Request $request
+      $modifierToken,
+      Request $request
 	) {
 		$voteStack = $id;
 		if ( ! $voteStack ) {
@@ -173,12 +182,18 @@ class VoteController extends FramadateController {
 		// update answers
 		// save evrything
 
-		return $this->json( [
+
-			'message'        => 'ok',
+    $jsonResponse = $serializer->serialize([
-			'modifier_token' => $voteStack->getOwner()->getModifierToken(),
+        'message'        => 'ok',
-			'vote_stack'     => $voteStack->display(),
+        'modifier_token' => $voteStack->getOwner()->getModifierToken(),
-		],
+        'vote_stack'     => $voteStack,
-			200 );
+    ], 'json');
+
+    $response = new Response($jsonResponse);
+    $response->headers->set('Content-Type', 'application/json');
+    $response->setStatusCode(200);
+
+    return $response;
 
 
 	}