Fix CS but it seems weird

Controller/Backend/PageController.php

@@ -45,7 +45,6 @@ public function indexAction()
         return $this->render('TheodoRogerCmsBundle:Page:index.html.twig', array('pages' => $pages));
     }
 
-
     /**
      * Edit page action
      *
@@ -200,7 +199,7 @@ public function removeAction($id)
     /**
      * Expand page action
      *
-     * @param integer $id
+     * @param integer $id Id of page to edit
      *
      * @return \Symfony\Component\HttpFoundation\Response
      *
@@ -233,14 +232,10 @@ public function expandAction($id)
      *
      * @param integer $fromId
      *
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\Response
      *
      * @author Vincent Guillon <[email protected]>
      * @since 2011-06-23
-=======
-     * @param $from_id
-     * @return \Symfony\Component\HttpFoundation\Response
->>>>>>> Update phpdocs
      */
     public function siteMapComponentAction($fromId)
     {

Controller/Backend/SnippetController.php

@@ -47,7 +47,7 @@ public function indexAction()
     /**
      * Snippet edit
      *
-     * @param integer $id
+     * @param integer $id Id of edited snippet
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      *
@@ -117,7 +117,7 @@ public function editAction($id)
     /**
      * Snippet delete
      *
-     * @param integer $id
+     * @param integer $id Id of snippet to remove
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      *

Repository/ContentEntityRepository.php

@@ -203,7 +203,7 @@ public function findAll($type = 'page')
 
     /**
      *
-     * @param string $type
+     * @param  string           $type
      * @return EntityRepository
      *
      * @author Fabrice Bernhard <[email protected]>