Mykees / MkCommentBundle

Controller/CommentsController.php

Doc Comments +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
 
 	/**
 	 * @param $params
-	 * @param $request
+	 * @param Request $request
 	 * @param $comment_class
 	 * @return Response
 	 */
@@ -98,7 +98,7 @@ 
 	 * Return a template
 	 * @param $comment
 	 * @param $request
-	 * @param $max_depth
+	 * @param boolean $max_depth
 	 * @return string
 	 */
 	private function renderResponse($comment,$request,$max_depth)
@@ -213,8 +213,8 @@ 
 	}
 
 	/**
-	 * @param $request
-	 * @param $session
+	 * @param Request $request
+	 * @param \Symfony\Component\HttpFoundation\Session\SessionInterface $session
 	 */
 	private function error($request, $session)
 	{
@@ -245,7 +245,7 @@ 
 
 	/**
 	 * Error message for Ajax
-	 * @param $form
+	 * @param \Symfony\Component\Form\Form $form
 	 * @return Response
 	 */
 	private function returnAjaxErrors($form)

Spacing +38 added lines, -38 removed lines

@@ -32,30 +32,30 @@ 
 
 		$comment_class_name = $this->container->getParameter('mykees_comment.comment.class');
 		$comment_class = new $comment_class_name();
-		$form = $this->createForm($this->get('mykees.comment.form'),$comment_class);
+		$form = $this->createForm($this->get('mykees.comment.form'), $comment_class);
 
-		if('POST' == $request->getMethod()) {
+		if ('POST' == $request->getMethod()) {
 
 			if ($form->handleRequest($request)->isValid()) {
 
-				if($request->isXmlHttpRequest()) {
-					return $this->ajaxInfo($params,$request,$comment_class);
+				if ($request->isXmlHttpRequest()) {
+					return $this->ajaxInfo($params, $request, $comment_class);
 				}
 
 				$this->postInfo($params, $request, $comment_class, $params['session']);
 
-			}else{
+			}else {
 
-				if($request->isXmlHttpRequest()) {
+				if ($request->isXmlHttpRequest()) {
 					return $this->returnAjaxErrors($form);
-				}else{
+				}else {
 					$this->error($request, $params['session']);
 				}
 			}
 
 		}
 
-		return $this->redirect($request->headers->get('referer') . '#comments_area');
+		return $this->redirect($request->headers->get('referer').'#comments_area');
 	}
 
 	/**
@@ -64,25 +64,25 @@ 
 	 * @param $comment_class
 	 * @return Response
 	 */
-	private function ajaxInfo($params,$request,$comment_class)
+	private function ajaxInfo($params, $request, $comment_class)
 	{
 
 		$comment = $this->postInfo($params, $request, $comment_class, $params['session']);
 		$comment_depth = $this->container->getParameter('comment.depth');
 
 		// Si la profondeur du commentaire parent est inférieure ou égale à la profondeur définis
-		if($request->request->get('depth') < $comment_depth && $comment_depth >= 1)
+		if ($request->request->get('depth') < $comment_depth && $comment_depth >= 1)
 		{
-			$comment->setDepthReached($request->request->get('depth') + 1);//On incremente la profondeur max
+			$comment->setDepthReached($request->request->get('depth') + 1); //On incremente la profondeur max
 			$comment->setDepth($comment->getId()); //la profondeur de réponse est égale a l'id
 			$max_depth = false;
-		}else{
-			$comment->setDepthReached($request->request->get('depth'));//On à atteint la profondeur max
-			$comment->setDepth($comment->getParentId());//la profondeur de réponse est éagle au commentaire parent
+		}else {
+			$comment->setDepthReached($request->request->get('depth')); //On à atteint la profondeur max
+			$comment->setDepth($comment->getParentId()); //la profondeur de réponse est éagle au commentaire parent
 			$max_depth = true;
 		}
 
-		$template = $this->renderResponse($comment,$request,$max_depth);
+		$template = $this->renderResponse($comment, $request, $max_depth);
 		$json = json_encode([
 			'template'=>$template,
 			"parent_id"=>$comment->getParentId(),
@@ -101,20 +101,20 @@ 
 	 * @param $max_depth
 	 * @return string
 	 */
-	private function renderResponse($comment,$request,$max_depth)
+	private function renderResponse($comment, $request, $max_depth)
 	{
-		if($comment->getParentId() > 0)
+		if ($comment->getParentId() > 0)
 		{
-			if( ($request->request->get('response_type') === "true" && $max_depth === true) ||
+			if (($request->request->get('response_type') === "true" && $max_depth === true) ||
 				($request->request->get('response_type') === "false" && $max_depth === true) ||
 				($request->request->get('response_type') === "true" && $max_depth === false)
-			){
-				return $this->renderView('MykeesCommentBundle:Comments:unwrap_replies.html.twig',['comment'=>$comment,'recent_reply'=>true]);
-			}else{
-				return $this->renderView('MykeesCommentBundle:Comments:replies.html.twig',['comment'=>$comment,'recent_reply'=>true]);
+			) {
+				return $this->renderView('MykeesCommentBundle:Comments:unwrap_replies.html.twig', ['comment'=>$comment, 'recent_reply'=>true]);
+			}else {
+				return $this->renderView('MykeesCommentBundle:Comments:replies.html.twig', ['comment'=>$comment, 'recent_reply'=>true]);
 			}
-		}else{
-			return $this->renderView('MykeesCommentBundle:Comments:comment.html.twig',['comment'=>$comment,'recent_reply'=>true]);
+		}else {
+			return $this->renderView('MykeesCommentBundle:Comments:comment.html.twig', ['comment'=>$comment, 'recent_reply'=>true]);
 		}
 	}
 
@@ -130,7 +130,7 @@ 
 	private function postInfo($params, $request, $comment, $session)
 	{
 		$this->userInfo($request, $comment);
-		$this->commentInfo($params,$comment,$request,$params['ref_id']);
+		$this->commentInfo($params, $comment, $request, $params['ref_id']);
 
 		$this->save($comment);
 		$this->messageFlash($session);
@@ -158,14 +158,14 @@ 
 	 * @param $ref_id
 	 * @return mixed
 	 */
-	private function commentInfo($params,$comment,$request,$ref_id)
+	private function commentInfo($params, $comment, $request, $ref_id)
 	{
 		$comment->setIp($request->getClientIp());
 		$comment->setModel($params['ref']);
 		$comment->setModelId($ref_id);
 		//Spam ?
 		$akismet = $this->container->hasParameter('akismet') ? $this->container->getParameter('akismet') : null;
-		$params['manager']->isSpam($comment,$request,$akismet) ? $comment->setSpam(1) : $comment->setSpam(0);
+		$params['manager']->isSpam($comment, $request, $akismet) ? $comment->setSpam(1) : $comment->setSpam(0);
 
 		return $comment;
 	}
@@ -178,15 +178,15 @@ 
 	 */
 	private function userInfo($request, $comment)
 	{
-		$is_join = method_exists($comment,'getUser') ? true : false;
+		$is_join = method_exists($comment, 'getUser') ? true : false;
 
-		if($this->getUser() !== null)
+		if ($this->getUser() !== null)
 		{
-			if($this->getUser()->getUsername() != $comment->getUsername() || $this->getUser()->getEmail() != $comment->getEmail())
+			if ($this->getUser()->getUsername() != $comment->getUsername() || $this->getUser()->getEmail() != $comment->getEmail())
 			{
-				return $this->redirect($request->headers->get('referer') . '#comments_area');
+				return $this->redirect($request->headers->get('referer').'#comments_area');
 			}
-			if($is_join)
+			if ($is_join)
 			{
 				$comment->setUser($this->getUser());
 			}
@@ -203,11 +203,11 @@ 
 	private function messageFlash($session)
 	{
 		$html = $session->has('success_message') ? $session->get('success_message') : "<strong>Merci!</strong> Votre message à bien été posté.";
-		if($this->get('session')->getFlashBag()->has('comment_success'))
+		if ($this->get('session')->getFlashBag()->has('comment_success'))
 		{
-			$this->get('session')->getFlashBag()->set('comment_success','');
+			$this->get('session')->getFlashBag()->set('comment_success', '');
 		}
-		$this->get('session')->getFlashBag()->add('comment_success',$html);
+		$this->get('session')->getFlashBag()->add('comment_success', $html);
 
 		return true;
 	}
@@ -219,9 +219,9 @@ 
 	private function error($request, $session)
 	{
 		$requestData = $request->request->get('mykees_comment');
-		if(!empty($requestData))
+		if (!empty($requestData))
 		{
-			$session->set('form_comment_data',$request->request->get('mykees_comment'));
+			$session->set('form_comment_data', $request->request->get('mykees_comment'));
 		}
 	}
 
@@ -250,7 +250,7 @@ 
 	 */
 	private function returnAjaxErrors($form)
 	{
-		$json = json_encode(['error'=>'error','error_fields'=>$this->getErrorsAsArray($form)]);
+		$json = json_encode(['error'=>'error', 'error_fields'=>$this->getErrorsAsArray($form)]);
 		return new Response($json);
 	}
 }

Twig/Extension/CommentExtension.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	/**
 	 * Returns a list of functions to add to the existing list.
 	 *
-	 * @return array An array of functions
+	 * @return \Twig_SimpleFunction[] An array of functions
 	 */
 	public function getFunctions()
 	{

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
 
 use Symfony\Component\Validator\Constraints\DateTime;
 
-class CommentExtension extends \Twig_Extension{
+class CommentExtension extends \Twig_Extension {
 
 	/**
 	 * Returns a list of functions to add to the existing list.
@@ -42,9 +42,9 @@ 
 	}
 
 
-	public function commentForm(\Twig_Environment $env, $form, $ajax=false, $options=[])
+	public function commentForm(\Twig_Environment $env, $form, $ajax = false, $options = [])
 	{
-		return $env->render('MykeesCommentBundle:Comments:form.html.twig',[
+		return $env->render('MykeesCommentBundle:Comments:form.html.twig', [
 			'form'=>$form,
 			'ajax'=>$ajax,
 			'options'=>$options
@@ -58,16 +58,16 @@ 
 	 * @param bool $canAdminComment
 	 * @return string
 	 */
-	public function commentsList(\Twig_Environment $env,$comments, $canAdminComment=false, $options=[])
+	public function commentsList(\Twig_Environment $env, $comments, $canAdminComment = false, $options = [])
 	{
-		return $env->render('MykeesCommentBundle:Comments:comments.html.twig',[
+		return $env->render('MykeesCommentBundle:Comments:comments.html.twig', [
 			'comments'=>$comments,
 			"canAdminComment"=>$canAdminComment
 		]);
 	}
 
 
-	public function dateInterval($date,$locale)
+	public function dateInterval($date, $locale)
 	{
 		$comment_date = new \DateTime($date);
 		$dateNow = new \DateTime('NOW');
@@ -81,25 +81,25 @@ 
 			$interval->format('%i')
 		];
 		$unity_en = [
-			['year','years'],
-			['month','months'],
-			['day','days'],
-			['hour','hours'],
-			['minute','minutes']
+			['year', 'years'],
+			['month', 'months'],
+			['day', 'days'],
+			['hour', 'hours'],
+			['minute', 'minutes']
 		];
 		$unity_fr = [
-			['an','ans'],
-			['mois','mois'],
-			['jour','jours'],
-			['heure','heures'],
-			['minute','minutes']
+			['an', 'ans'],
+			['mois', 'mois'],
+			['jour', 'jours'],
+			['heure', 'heures'],
+			['minute', 'minutes']
 		];
 
 		$periodesLength = count($periodes);
 
-		for($i=0; $i < $periodesLength; $i++)
+		for ($i = 0; $i < $periodesLength; $i++)
 		{
-			if(intval($periodes[$i]) >= 1 && $i < count($periodes))
+			if (intval($periodes[$i]) >= 1 && $i < count($periodes))
 			{
 				$locale_unity = $locale == "fr" ? $unity_fr : $unity_en;
 				$u = $periodes[$i] > 1 ? $locale_unity[$i][1] : $locale_unity[$i][0];
@@ -107,10 +107,10 @@ 
 				return $periodes[$i].' '.$u;
 			}
 		}
-		if($locale == 'fr')
+		if ($locale == 'fr')
 		{
 			return "moins d'une minute";
-		}else{
+		}else {
 			return 'less than a minute';
 		}
 	}

Controller/AdminCommentsController.php

Spacing +3 added lines, -3 removed lines

@@ -15,10 +15,10 @@ 
 	public function deleteWithChildrenAction($model, $model_id, $comment_id, Request $request)
 	{
 		$manager = $this->get('mykees.comment.query.manager');
-		$comments = $manager->findCommentsByModelAndId($model, $model_id,true);
+		$comments = $manager->findCommentsByModelAndId($model, $model_id, true);
 		$children_ids = $manager->getChildren($comments[$comment_id]);
 
-		array_push($children_ids,$comment_id);
+		array_push($children_ids, $comment_id);
 
 		$manager->deleteByCommentIds($children_ids);
 
@@ -29,7 +29,7 @@ 
 	public function deleteAction($id, Request $request)
 	{
 		$class = $this->container->getParameter('mykees_comment.comment.class');
-		$explose_class = explode('\\',$class);
+		$explose_class = explode('\\', $class);
 		$repository = $explose_class[0].$explose_class[1].':'.$explose_class[3];
 		$comment = $this->gEm()->getRepository($repository)->find($id);
 

DataFixtures/ORM/LoadCommentData.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class LoadCommentData implements FixtureInterface,ContainerAwareInterface{
+class LoadCommentData implements FixtureInterface, ContainerAwareInterface{
 
 	public $container;
 
@@ -38,7 +38,7 @@ 
 	{
 		$comment_class = $this->container->getParameter('mykees_comment.comment.class');
 
-		for($i=1; $i<=5 ;$i++)
+		for ($i = 1; $i <= 5; $i++)
 		{
 			$comment = new $comment_class();
 			$comment->setUsername('admin'.$i);
@@ -46,10 +46,10 @@ 
 			$comment->setContent('contenu n-'.$i);
 			$comment->setCreatedAt(new \DateTime());
 			$comment->setModel('Post');
-			if($i <= 3)
+			if ($i <= 3)
 			{
 				$comment->setModelId(1);
-			}else{
+			}else {
 				$comment->setModelId($i);
 			}
 			$comment->setParentId(0);

Entity/Comment.php

Spacing +1 added lines, -1 removed lines

@@ -314,7 +314,7 @@
 	 */
 	public function setChildren(Comment $children)
 	{
-		array_unshift($this->children,$children);
+		array_unshift($this->children, $children);
 	}
 
 	/**

Form/Type/CommentFormEditType.php

Spacing +5 added lines, -5 removed lines

@@ -24,20 +24,20 @@
 			->add('username')
 			->add('email')
 			->add('content')
-			->add('model',"text",[
+			->add('model', "text", [
 				'required'=>false
 			])
-			->add('modelId',"text",[
+			->add('modelId', "text", [
 				'required'=>false
 			])
-			->add('parentId',"text",[
+			->add('parentId', "text", [
 				'required'=>false
 			])
-			->add('spam',"text",[
+			->add('spam', "text", [
 				'required'=>false,
 				'data'=>0
 			])
-			->add('ip',"text",[
+			->add('ip', "text", [
 				'required'=>false
 			])
 		;

Form/Type/CommentFormType.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
 	public function __construct(TokenStorageInterface $tokenStorage)
 	{
 		$this->tokenStorage = $tokenStorage->getToken();
-		$this->user = method_exists($this->tokenStorage,'getUser') ? $this->tokenStorage->getUser() : array();
+		$this->user = method_exists($this->tokenStorage, 'getUser') ? $this->tokenStorage->getUser() : array();
 	}
     /**
      * @param FormBuilderInterface $builder
@@ -27,34 +27,34 @@ 
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-	    if(empty($this->user) || $this->user == 'anon.')
+	    if (empty($this->user) || $this->user == 'anon.')
 	    {
 		    $builder
-			    ->add('username','text',[
+			    ->add('username', 'text', [
 				    'label'=> $this->username
 			    ])
-			    ->add('email','text',[
+			    ->add('email', 'text', [
 				    'label'=> $this->email
 			    ])
-			    ->add('content','textarea',[
+			    ->add('content', 'textarea', [
 				    'label'=> $this->content
 			    ])
-			    ->add('parentId','hidden',['data'=>0])
-			    ->add('model','hidden')
-			    ->add('modelId','hidden')
+			    ->add('parentId', 'hidden', ['data'=>0])
+			    ->add('model', 'hidden')
+			    ->add('modelId', 'hidden')
 		    ;
-	    }else{
+	    }else {
 		    $builder
-			    ->add('username','hidden',[
+			    ->add('username', 'hidden', [
 				    'data'=>$this->user->getUsername()
 			    ])
-			    ->add('email','hidden',[
+			    ->add('email', 'hidden', [
 				    'data'=>$this->user->getEmail()
 			    ])
 			    ->add('content')
-			    ->add('parentId','hidden',['data'=>0])
-			    ->add('model','hidden')
-			    ->add('modelId','hidden')
+			    ->add('parentId', 'hidden', ['data'=>0])
+			    ->add('model', 'hidden')
+			    ->add('modelId', 'hidden')
 		    ;
 	    }
     }

Listener/CommentListener.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 use Mykees\CommentBundle\Manager\CommentQueryManager;
 use Doctrine\Common\Persistence\ManagerRegistry;
 
-class CommentListener{
+class CommentListener {
 
 
 	public $container;
@@ -23,7 +23,7 @@ 
 	{
 		$this->managerRegistry = $managerRegistry;
 		$this->class = $class;
-		$this->fos_user  = $fos_user_class;
+		$this->fos_user = $fos_user_class;
 		$this->depth = $depth;
 	}
 
@@ -32,9 +32,9 @@ 
 	{
 		$model = $args->getEntity();
 
-		if($model instanceof IsCommentable)
+		if ($model instanceof IsCommentable)
 		{
-			$manager = new CommentQueryManager($this->managerRegistry,$this->class,$this->depth);
+			$manager = new CommentQueryManager($this->managerRegistry, $this->class, $this->depth);
 			$manager->preDeleteComment($model);
 		}
 	}

Manager/CommentManager.php

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 use Symfony\Component\HttpFoundation\Session\Session;
 use Mykees\CommentBundle\Form\Type\CommentFormType;
 
-class CommentManager extends Manager{
+class CommentManager extends Manager {
 
 	protected $formFactory;
 	protected $router;
@@ -42,10 +42,10 @@ 
 	 * @param null $success_message
 	 * @return \Symfony\Component\Form\Form
 	 */
-	public function createForm(IsCommentable $model, $labels = [], $success_message=null)
+	public function createForm(IsCommentable $model, $labels = [], $success_message = null)
 	{
 		$dataForm = $this->session->get('form_comment_data');
-		$model_name  = $this->getClassShortName($model);
+		$model_name = $this->getClassShortName($model);
 		$route    = $this->router->generate('mykees_comment_manage');
 		$comment  = new $this->comment_class;
 		$comment->setModel($model_name);
@@ -56,16 +56,16 @@ 
 		$this->formType->content  = !empty($labels['content']) ? $labels['content'] : false;
 
 
-		if($this->session->has('success_message')) { $this->session->remove('success_message'); }
-		if($success_message) { $this->session->set('success_message',$success_message); }
+		if ($this->session->has('success_message')) { $this->session->remove('success_message'); }
+		if ($success_message) { $this->session->set('success_message', $success_message); }
 
 		$form = $this->formFactory->create(
 			$this->formType,
 			$comment,
-			['action'=> $route,'method'=> 'POST']
+			['action'=> $route, 'method'=> 'POST']
 		);
 
-		if( !empty($dataForm) ){
+		if (!empty($dataForm)) {
 			$form->submit($dataForm);
 			$this->session->remove('form_comment_data');
 		}
@@ -83,8 +83,8 @@ 
 	 */
 	public function isSpam($comment, Request $request, $akismetInit)
 	{
-		if($akismetInit){
-			$akismet     = new Akismet($akismetInit['website'],$akismetInit['api_key'],$request);
+		if ($akismetInit) {
+			$akismet = new Akismet($akismetInit['website'], $akismetInit['api_key'], $request);
 
 			$akismet->setCommentAuthor($comment->getUsername());
 			$akismet->setCommentAuthorEmail($comment->getEmail());