Mykees / MkCommentBundle

Interfaces/HasUserInterface.php

Indentation +2 added lines, -2 removed lines

@@ -12,6 +12,6 @@
 
 interface HasUserInterface {
 
-	public function getUser();
-	public function setUser(UserInterface $user);
+    public function getUser();
+    public function setUser(UserInterface $user);
 }

Interfaces/IsCommentable.php

Indentation +6 added lines, -6 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Rafidion Michael
- * Date: 03/09/2015
- * Time: 12:00
- */
+     * Created by PhpStorm.
+     * User: Rafidion Michael
+     * Date: 03/09/2015
+     * Time: 12:00
+     */
 
 namespace Mykees\CommentBundle\Interfaces;
 
 
 interface IsCommentable {
-	public function getId();
+    public function getId();
 }

Listener/CommentListener.php

Indentation +35 added lines, -35 removed lines

@@ -11,40 +11,40 @@
 class CommentListener{
 
 
-	public $container;
-	public $entity;
-	public $fos_user;
-	public $class;
-	public $managerRegistry;
-	public $depth;
-
-
-	public function __construct(ManagerRegistry $managerRegistry, $class, $fos_user_class, $depth)
-	{
-		$this->managerRegistry = $managerRegistry;
-		$this->class = $class;
-		$this->fos_user  = $fos_user_class;
-		$this->depth = $depth;
-	}
-
-
-	public function preRemove(LifecycleEventArgs $args)
-	{
-		$model = $args->getEntity();
-
-		if($model instanceof IsCommentable)
-		{
-			$manager = new CommentQueryManager($this->managerRegistry,$this->class,$this->depth);
-			$manager->preDeleteComment($model);
-		}
-	}
-
-
-	public function getSubscribedEvents()
-	{
-		return [
-			Events::preRemove
-		];
-	}
+    public $container;
+    public $entity;
+    public $fos_user;
+    public $class;
+    public $managerRegistry;
+    public $depth;
+
+
+    public function __construct(ManagerRegistry $managerRegistry, $class, $fos_user_class, $depth)
+    {
+        $this->managerRegistry = $managerRegistry;
+        $this->class = $class;
+        $this->fos_user  = $fos_user_class;
+        $this->depth = $depth;
+    }
+
+
+    public function preRemove(LifecycleEventArgs $args)
+    {
+        $model = $args->getEntity();
+
+        if($model instanceof IsCommentable)
+        {
+            $manager = new CommentQueryManager($this->managerRegistry,$this->class,$this->depth);
+            $manager->preDeleteComment($model);
+        }
+    }
+
+
+    public function getSubscribedEvents()
+    {
+        return [
+            Events::preRemove
+        ];
+    }
 
 }

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

Indentation +77 added lines, -77 removed lines

@@ -18,82 +18,82 @@
 
 class CommentManager extends Manager{
 
-	protected $formFactory;
-	protected $router;
-	protected $comment_class;
-	protected $repository;
-	protected $session;
-	protected $formType;
-
-	public function __construct(FormFactory $formFactory, Router $router, Session $session, CommentFormType $formType, $class)
-	{
-		$this->formFactory  = $formFactory;
-		$this->router       = $router;
-		$this->comment_class = $class;
-		$this->formType = $formType;
-		$this->session = $session;
-	}
-
-
-	/**
-	 * Create Comment Form
-	 * @param IsCommentable $model
-	 * @param array $labels
-	 * @param null $success_message
-	 * @return \Symfony\Component\Form\Form
-	 */
-	public function createForm(IsCommentable $model, $labels = [], $success_message=null)
-	{
-		$dataForm = $this->session->get('form_comment_data');
-		$model_name  = $this->getClassShortName($model);
-		$route    = $this->router->generate('mykees_comment_manage');
-		$comment  = new $this->comment_class;
-		$comment->setModel($model_name);
-		$comment->setModelId($model->getId());
-
-		$this->formType->username = !empty($labels['username']) ? $labels['username'] : false;
-		$this->formType->email    = !empty($labels['email']) ? $labels['email'] : false;
-		$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); }
-
-		$form = $this->formFactory->create(
-			$this->formType,
-			$comment,
-			['action'=> $route,'method'=> 'POST']
-		);
-
-		if( !empty($dataForm) ){
-			$form->submit($dataForm);
-			$this->session->remove('form_comment_data');
-		}
-
-		return $form;
-	}
-
-	/**
-	 * Verify if the comment is a spam
-	 * @param $comment
-	 * @param Request $request
-	 * @param $akismetInit
-	 * @return bool
-	 * @throws \Symfony\Component\Config\Definition\Exception\Exception
-	 */
-	public function isSpam($comment, Request $request, $akismetInit)
-	{
-		if($akismetInit){
-			$akismet     = new Akismet($akismetInit['website'],$akismetInit['api_key'],$request);
-
-			$akismet->setCommentAuthor($comment->getUsername());
-			$akismet->setCommentAuthorEmail($comment->getEmail());
-			$akismet->setCommentContent($comment->getContent());
-			$akismet->setUserIP($comment->getIp());
-
-			return $akismet->isCommentSpam($request);
-		}
-		return false;
-	}
+    protected $formFactory;
+    protected $router;
+    protected $comment_class;
+    protected $repository;
+    protected $session;
+    protected $formType;
+
+    public function __construct(FormFactory $formFactory, Router $router, Session $session, CommentFormType $formType, $class)
+    {
+        $this->formFactory  = $formFactory;
+        $this->router       = $router;
+        $this->comment_class = $class;
+        $this->formType = $formType;
+        $this->session = $session;
+    }
+
+
+    /**
+     * Create Comment Form
+     * @param IsCommentable $model
+     * @param array $labels
+     * @param null $success_message
+     * @return \Symfony\Component\Form\Form
+     */
+    public function createForm(IsCommentable $model, $labels = [], $success_message=null)
+    {
+        $dataForm = $this->session->get('form_comment_data');
+        $model_name  = $this->getClassShortName($model);
+        $route    = $this->router->generate('mykees_comment_manage');
+        $comment  = new $this->comment_class;
+        $comment->setModel($model_name);
+        $comment->setModelId($model->getId());
+
+        $this->formType->username = !empty($labels['username']) ? $labels['username'] : false;
+        $this->formType->email    = !empty($labels['email']) ? $labels['email'] : false;
+        $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); }
+
+        $form = $this->formFactory->create(
+            $this->formType,
+            $comment,
+            ['action'=> $route,'method'=> 'POST']
+        );
+
+        if( !empty($dataForm) ){
+            $form->submit($dataForm);
+            $this->session->remove('form_comment_data');
+        }
+
+        return $form;
+    }
+
+    /**
+     * Verify if the comment is a spam
+     * @param $comment
+     * @param Request $request
+     * @param $akismetInit
+     * @return bool
+     * @throws \Symfony\Component\Config\Definition\Exception\Exception
+     */
+    public function isSpam($comment, Request $request, $akismetInit)
+    {
+        if($akismetInit){
+            $akismet     = new Akismet($akismetInit['website'],$akismetInit['api_key'],$request);
+
+            $akismet->setCommentAuthor($comment->getUsername());
+            $akismet->setCommentAuthorEmail($comment->getEmail());
+            $akismet->setCommentContent($comment->getContent());
+            $akismet->setUserIP($comment->getIp());
+
+            return $akismet->isCommentSpam($request);
+        }
+        return false;
+    }
 
 }

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());

Manager/CommentQueryManager.php

Indentation +329 added lines, -329 removed lines

@@ -13,333 +13,333 @@
 
 class CommentQueryManager extends Manager{
 
-	private $repository;
-	private $comment_class;
-	private $depth;
-	private $depth_reached;
-
-	public function __construct(ManagerRegistry $managerRegistry, $class, $depth)
-	{
-		$this->comment_class = $class;
-		$this->repository = $managerRegistry->getRepository($this->comment_class);
-		$this->depth = $depth;
-	}
-
-
-	/**
-	 * Find one comment
-	 * @param $id
-	 * @param null $model_name
-	 * @param int $model_id
-	 * @return mixed
-	 */
-	public function findOneComment($id, $model_name=null,$model_id=0)
-	{
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
-		$qb = $this->repository->createQueryBuilder('c');
-
-		return $this->oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join);
-	}
-
-
-	/**
-	 * Find a comment by model referer
-	 * @param $id
-	 * @param IsCommentable $model
-	 * @return mixed
-	 */
-	public function findOneCommentByReferer($id,IsCommentable $model)
-	{
-		$model_name  = $this->getClassShortName( $model );
-		$model_id  = $model->getId();
-		$qb = $this->repository->createQueryBuilder('c');
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
-
-		return $this->oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join);
-	}
-
-	/**
-	 * Find all comments for an entity
-	 * @param IsCommentable $model
-	 * @param bool $get_by_id
-	 * @return mixed
-	 */
-	public function findComments(IsCommentable $model, $get_by_id=false)
-	{
-		$model_name  = $this->getClassShortName( $model );
-		$comments = [];
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
-		$qb = $this->repository->createQueryBuilder('c');
-
-		$comments['comments'] = $this->commentQueryResult($qb, $model_name, $model->getId(), $is_join);
-		$comments['count'] = count($comments['comments']);
-
-		return $this->buildCommentStructure($comments,$get_by_id);
-	}
-
-
-	/**
-	 * Find all comments for an entity
-	 * @param $model_name
-	 * @param $model_id
-	 * @param bool $get_by_id
-	 * @return mixed
-	 */
-	public function findCommentsByModelAndId($model_name, $model_id, $get_by_id=false)
-	{
-		$comments = [];
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
-		$qb = $this->repository->createQueryBuilder('c');
-
-		$comments['comments'] = $this->commentQueryResult($qb, $model_name, $model_id, $is_join);
-		$comments['count'] = count($comments['comments']);
-
-		return $this->buildCommentStructure($comments,$get_by_id);
-	}
-
-
-	/**
-	 * Build Comment Structure
-	 * @param $comments
-	 * @param bool $get_by_id
-	 * @return mixed
-	 */
-	private function buildCommentStructure($comments, $get_by_id=false)
-	{
-		$comments_by_id = [];
-		return $this->build($comments,$comments_by_id,$get_by_id);
-	}
-
-
-	private function build($comments,$comments_by_id, $get_by_id)
-	{
-		foreach($comments['comments'] as $comment)
-		{
-			$comments_by_id[$comment->getId()] = $comment;
-			$comment->setDepth($this->depth);
-		}
-
-		//Comment parent and children
-		foreach($comments['comments'] as $k=>$comment)
-		{
-			if($this->depth > 0 && $comment->getParentId() > 0)
-			{
-				$parent_id = $this->depthComment($comments_by_id,$comment->getId());
-
-				//Si la pronfondeur atteinte est plus petite que la profondeur definis
-				//alors la réponse aura l'id du commentaire
-				//Sinon
-				//la réponse aura l'id du parent
-				if($this->depth_reached < $this->depth)
-				{
-					$comment->setDepth($comment->getId());
-				}else{
-					$comment->setDepth($parent_id);
-				}
-				$comment->setDepthReached($this->depth_reached);
-				$comments_by_id[$parent_id]->setChildren($comment);
-				unset($comments['comments'][$k]);
-
-			}else if($this->depth == 0){
-				$comment->setDepth(0);
-			}else{
-				$comment->setDepth($comment->getId());
-			}
-
-		}
-
-		if($get_by_id)
-		{
-			return $comments_by_id;
-		}else{
-			return $comments;
-		}
-	}
-
-	/**
-	 * config depth of comments
-	 * @param $comments_by_id
-	 * @param $comment_id
-	 * @return mixed
-	 */
-	private function depthComment($comments_by_id,$comment_id)
-	{
-		$parent_id=[];
-		$index = $comment_id;
-		$parent = true;
-		$depth_reached = 0;
-
-		while($parent)
-		{
-			$comment = $comments_by_id[$index];
-			if($comment->getParentId())
-			{
-				$parent_id[] = $comments_by_id[$index]->getParentId();
-				$index = $comments_by_id[$index]->getParentId();
-				$depth_reached++;
-			}else{
-				$parent = false;
-			}
-		}
-		$this->depth_reached = $depth_reached;
-		$array_reverse = array_reverse($parent_id);
-
-		return $this->depth < count($array_reverse) ? $array_reverse[$this->depth-1] : end($array_reverse);
-	}
-
-
-	/**
-	 * Retrieve all comments
-	 * @param array $criteria
-	 * @param null $orderBy
-	 * @param null $limit
-	 * @param null $offset
-	 * @return array
-	 */
-	public function findAllComments(array $criteria=[],$orderBy=null,$limit=null,$offset=null)
-	{
-		if(!empty($criteria) || isset($orderBy) || isset($limit) || isset($offset))
-		{
-			return $this->repository->findBy($criteria,$orderBy,$limit,$offset);
-		}else{
-			return $this->repository->findAll();
-		}
-	}
-
-
-	/**
-	 * @param $qb
-	 * @param $model_name
-	 * @param $model_id
-	 * @param $is_join
-	 * @return mixed
-	 */
-	private function commentQueryResult($qb, $model_name, $model_id, $is_join)
-	{
-		if($is_join)
-		{
-			$qb
-				->leftJoin('c.user','u')
-				->addSelect('u')
-			;
-		}
-
-		return $qb
-			->where("c.model = :ref")
-			->setParameter('ref',$model_name)
-			->andWhere("c.modelId = :ref_id")
-			->setParameter('ref_id',$model_id)
-			->orderBy('c.createdAt', 'DESC')
-			->getQuery()
-			->getResult()
-		;
-	}
-
-	private function oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join)
-	{
-		if($is_join)
-		{
-			$qb
-				->leftJoin('c.user','u')
-				->addSelect('u')
-			;
-		}
-		$qb->where('c.id = :id')
-			->setParameter('id',$id)
-		;
-
-		if($model_name)
-		{
-			$qb->andWhere("c.model = :ref")
-				->setParameter('ref',$model_name)
-			;
-		}
-		if($model_id > 0)
-		{
-			$qb->andWhere("c.modelId = :ref_id")
-				->setParameter('ref_id',$model_id)
-			;
-		}
-
-		return $qb->getQuery()->getOneOrNullResult();
-	}
-
-
-	/**
-	 * @param $ids
-	 * @return mixed
-	 */
-	public function deleteByCommentIds($ids)
-	{
-		$comment_class = $this->classRepository($this->comment_class);
-
-		return $this->repository
-			->createQueryBuilder('c')
-			->delete($comment_class,'c')
-			->where("c.id IN(:ids)")
-			->setParameter('ids', array_values($ids))
-			->getQuery()
-			->execute()
-		;
-	}
-
-
-	/**
-	 * Delete a comment by id
-	 * @param $id
-	 * @return mixed
-	 */
-	public function deleteComment($id)
-	{
-		$comment_class = $this->classRepository($this->comment_class);
-
-		return $this->repository
-			->createQueryBuilder('c')
-			->delete($comment_class,'c')
-			->where("c.id = id")
-			->setParameter('id', $id)
-			->getQuery()
-			->execute()
-		;
-	}
-
-
-
-	/**
-	 * Remove ccomment children
-	 * @param $comment
-	 * @return array
-	 */
-	public function getChildren($comment)
-	{
-		$children_ids = [];
-		foreach($comment->getChildren() as $child)
-		{
-			$children_ids[] = $child->getId();
-			if($child->getChildren())
-			{
-				$children_ids = array_merge($children_ids, $this->getChildren($child));
-			}
-		}
-
-		return $children_ids;
-	}
-
-	/**
-	 * Pre delete comment
-	 * @param IsCommentable $referer
-	 * @return bool
-	 */
-	public function preDeleteComment(IsCommentable $referer)
-	{
-		$comments = $this->findComments($referer, true);
-		foreach($comments as $k=>$comment)
-		{
-			$children_ids = $this->getChildren($comment);
-			array_push($children_ids,$k);
-
-			$this->deleteByCommentIds($children_ids);
-		}
-		return true;
-	}
+    private $repository;
+    private $comment_class;
+    private $depth;
+    private $depth_reached;
+
+    public function __construct(ManagerRegistry $managerRegistry, $class, $depth)
+    {
+        $this->comment_class = $class;
+        $this->repository = $managerRegistry->getRepository($this->comment_class);
+        $this->depth = $depth;
+    }
+
+
+    /**
+     * Find one comment
+     * @param $id
+     * @param null $model_name
+     * @param int $model_id
+     * @return mixed
+     */
+    public function findOneComment($id, $model_name=null,$model_id=0)
+    {
+        $is_join = method_exists($this->comment_class,'getUser') ? true : false;
+        $qb = $this->repository->createQueryBuilder('c');
+
+        return $this->oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join);
+    }
+
+
+    /**
+     * Find a comment by model referer
+     * @param $id
+     * @param IsCommentable $model
+     * @return mixed
+     */
+    public function findOneCommentByReferer($id,IsCommentable $model)
+    {
+        $model_name  = $this->getClassShortName( $model );
+        $model_id  = $model->getId();
+        $qb = $this->repository->createQueryBuilder('c');
+        $is_join = method_exists($this->comment_class,'getUser') ? true : false;
+
+        return $this->oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join);
+    }
+
+    /**
+     * Find all comments for an entity
+     * @param IsCommentable $model
+     * @param bool $get_by_id
+     * @return mixed
+     */
+    public function findComments(IsCommentable $model, $get_by_id=false)
+    {
+        $model_name  = $this->getClassShortName( $model );
+        $comments = [];
+        $is_join = method_exists($this->comment_class,'getUser') ? true : false;
+        $qb = $this->repository->createQueryBuilder('c');
+
+        $comments['comments'] = $this->commentQueryResult($qb, $model_name, $model->getId(), $is_join);
+        $comments['count'] = count($comments['comments']);
+
+        return $this->buildCommentStructure($comments,$get_by_id);
+    }
+
+
+    /**
+     * Find all comments for an entity
+     * @param $model_name
+     * @param $model_id
+     * @param bool $get_by_id
+     * @return mixed
+     */
+    public function findCommentsByModelAndId($model_name, $model_id, $get_by_id=false)
+    {
+        $comments = [];
+        $is_join = method_exists($this->comment_class,'getUser') ? true : false;
+        $qb = $this->repository->createQueryBuilder('c');
+
+        $comments['comments'] = $this->commentQueryResult($qb, $model_name, $model_id, $is_join);
+        $comments['count'] = count($comments['comments']);
+
+        return $this->buildCommentStructure($comments,$get_by_id);
+    }
+
+
+    /**
+     * Build Comment Structure
+     * @param $comments
+     * @param bool $get_by_id
+     * @return mixed
+     */
+    private function buildCommentStructure($comments, $get_by_id=false)
+    {
+        $comments_by_id = [];
+        return $this->build($comments,$comments_by_id,$get_by_id);
+    }
+
+
+    private function build($comments,$comments_by_id, $get_by_id)
+    {
+        foreach($comments['comments'] as $comment)
+        {
+            $comments_by_id[$comment->getId()] = $comment;
+            $comment->setDepth($this->depth);
+        }
+
+        //Comment parent and children
+        foreach($comments['comments'] as $k=>$comment)
+        {
+            if($this->depth > 0 && $comment->getParentId() > 0)
+            {
+                $parent_id = $this->depthComment($comments_by_id,$comment->getId());
+
+                //Si la pronfondeur atteinte est plus petite que la profondeur definis
+                //alors la réponse aura l'id du commentaire
+                //Sinon
+                //la réponse aura l'id du parent
+                if($this->depth_reached < $this->depth)
+                {
+                    $comment->setDepth($comment->getId());
+                }else{
+                    $comment->setDepth($parent_id);
+                }
+                $comment->setDepthReached($this->depth_reached);
+                $comments_by_id[$parent_id]->setChildren($comment);
+                unset($comments['comments'][$k]);
+
+            }else if($this->depth == 0){
+                $comment->setDepth(0);
+            }else{
+                $comment->setDepth($comment->getId());
+            }
+
+        }
+
+        if($get_by_id)
+        {
+            return $comments_by_id;
+        }else{
+            return $comments;
+        }
+    }
+
+    /**
+     * config depth of comments
+     * @param $comments_by_id
+     * @param $comment_id
+     * @return mixed
+     */
+    private function depthComment($comments_by_id,$comment_id)
+    {
+        $parent_id=[];
+        $index = $comment_id;
+        $parent = true;
+        $depth_reached = 0;
+
+        while($parent)
+        {
+            $comment = $comments_by_id[$index];
+            if($comment->getParentId())
+            {
+                $parent_id[] = $comments_by_id[$index]->getParentId();
+                $index = $comments_by_id[$index]->getParentId();
+                $depth_reached++;
+            }else{
+                $parent = false;
+            }
+        }
+        $this->depth_reached = $depth_reached;
+        $array_reverse = array_reverse($parent_id);
+
+        return $this->depth < count($array_reverse) ? $array_reverse[$this->depth-1] : end($array_reverse);
+    }
+
+
+    /**
+     * Retrieve all comments
+     * @param array $criteria
+     * @param null $orderBy
+     * @param null $limit
+     * @param null $offset
+     * @return array
+     */
+    public function findAllComments(array $criteria=[],$orderBy=null,$limit=null,$offset=null)
+    {
+        if(!empty($criteria) || isset($orderBy) || isset($limit) || isset($offset))
+        {
+            return $this->repository->findBy($criteria,$orderBy,$limit,$offset);
+        }else{
+            return $this->repository->findAll();
+        }
+    }
+
+
+    /**
+     * @param $qb
+     * @param $model_name
+     * @param $model_id
+     * @param $is_join
+     * @return mixed
+     */
+    private function commentQueryResult($qb, $model_name, $model_id, $is_join)
+    {
+        if($is_join)
+        {
+            $qb
+                ->leftJoin('c.user','u')
+                ->addSelect('u')
+            ;
+        }
+
+        return $qb
+            ->where("c.model = :ref")
+            ->setParameter('ref',$model_name)
+            ->andWhere("c.modelId = :ref_id")
+            ->setParameter('ref_id',$model_id)
+            ->orderBy('c.createdAt', 'DESC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    private function oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join)
+    {
+        if($is_join)
+        {
+            $qb
+                ->leftJoin('c.user','u')
+                ->addSelect('u')
+            ;
+        }
+        $qb->where('c.id = :id')
+            ->setParameter('id',$id)
+        ;
+
+        if($model_name)
+        {
+            $qb->andWhere("c.model = :ref")
+                ->setParameter('ref',$model_name)
+            ;
+        }
+        if($model_id > 0)
+        {
+            $qb->andWhere("c.modelId = :ref_id")
+                ->setParameter('ref_id',$model_id)
+            ;
+        }
+
+        return $qb->getQuery()->getOneOrNullResult();
+    }
+
+
+    /**
+     * @param $ids
+     * @return mixed
+     */
+    public function deleteByCommentIds($ids)
+    {
+        $comment_class = $this->classRepository($this->comment_class);
+
+        return $this->repository
+            ->createQueryBuilder('c')
+            ->delete($comment_class,'c')
+            ->where("c.id IN(:ids)")
+            ->setParameter('ids', array_values($ids))
+            ->getQuery()
+            ->execute()
+        ;
+    }
+
+
+    /**
+     * Delete a comment by id
+     * @param $id
+     * @return mixed
+     */
+    public function deleteComment($id)
+    {
+        $comment_class = $this->classRepository($this->comment_class);
+
+        return $this->repository
+            ->createQueryBuilder('c')
+            ->delete($comment_class,'c')
+            ->where("c.id = id")
+            ->setParameter('id', $id)
+            ->getQuery()
+            ->execute()
+        ;
+    }
+
+
+
+    /**
+     * Remove ccomment children
+     * @param $comment
+     * @return array
+     */
+    public function getChildren($comment)
+    {
+        $children_ids = [];
+        foreach($comment->getChildren() as $child)
+        {
+            $children_ids[] = $child->getId();
+            if($child->getChildren())
+            {
+                $children_ids = array_merge($children_ids, $this->getChildren($child));
+            }
+        }
+
+        return $children_ids;
+    }
+
+    /**
+     * Pre delete comment
+     * @param IsCommentable $referer
+     * @return bool
+     */
+    public function preDeleteComment(IsCommentable $referer)
+    {
+        $comments = $this->findComments($referer, true);
+        foreach($comments as $k=>$comment)
+        {
+            $children_ids = $this->getChildren($comment);
+            array_push($children_ids,$k);
+
+            $this->deleteByCommentIds($children_ids);
+        }
+        return true;
+    }
 }

Spacing +54 added lines, -54 removed lines

@@ -11,7 +11,7 @@ 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Mykees\CommentBundle\Interfaces\IsCommentable;
 
-class CommentQueryManager extends Manager{
+class CommentQueryManager extends Manager {
 
 	private $repository;
 	private $comment_class;
@@ -33,9 +33,9 @@ 
 	 * @param int $model_id
 	 * @return mixed
 	 */
-	public function findOneComment($id, $model_name=null,$model_id=0)
+	public function findOneComment($id, $model_name = null, $model_id = 0)
 	{
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
+		$is_join = method_exists($this->comment_class, 'getUser') ? true : false;
 		$qb = $this->repository->createQueryBuilder('c');
 
 		return $this->oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join);
@@ -48,12 +48,12 @@ 
 	 * @param IsCommentable $model
 	 * @return mixed
 	 */
-	public function findOneCommentByReferer($id,IsCommentable $model)
+	public function findOneCommentByReferer($id, IsCommentable $model)
 	{
-		$model_name  = $this->getClassShortName( $model );
-		$model_id  = $model->getId();
+		$model_name = $this->getClassShortName($model);
+		$model_id = $model->getId();
 		$qb = $this->repository->createQueryBuilder('c');
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
+		$is_join = method_exists($this->comment_class, 'getUser') ? true : false;
 
 		return $this->oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join);
 	}
@@ -64,17 +64,17 @@ 
 	 * @param bool $get_by_id
 	 * @return mixed
 	 */
-	public function findComments(IsCommentable $model, $get_by_id=false)
+	public function findComments(IsCommentable $model, $get_by_id = false)
 	{
-		$model_name  = $this->getClassShortName( $model );
+		$model_name = $this->getClassShortName($model);
 		$comments = [];
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
+		$is_join = method_exists($this->comment_class, 'getUser') ? true : false;
 		$qb = $this->repository->createQueryBuilder('c');
 
 		$comments['comments'] = $this->commentQueryResult($qb, $model_name, $model->getId(), $is_join);
 		$comments['count'] = count($comments['comments']);
 
-		return $this->buildCommentStructure($comments,$get_by_id);
+		return $this->buildCommentStructure($comments, $get_by_id);
 	}
 
 
@@ -85,16 +85,16 @@ 
 	 * @param bool $get_by_id
 	 * @return mixed
 	 */
-	public function findCommentsByModelAndId($model_name, $model_id, $get_by_id=false)
+	public function findCommentsByModelAndId($model_name, $model_id, $get_by_id = false)
 	{
 		$comments = [];
-		$is_join = method_exists($this->comment_class,'getUser') ? true : false;
+		$is_join = method_exists($this->comment_class, 'getUser') ? true : false;
 		$qb = $this->repository->createQueryBuilder('c');
 
 		$comments['comments'] = $this->commentQueryResult($qb, $model_name, $model_id, $is_join);
 		$comments['count'] = count($comments['comments']);
 
-		return $this->buildCommentStructure($comments,$get_by_id);
+		return $this->buildCommentStructure($comments, $get_by_id);
 	}
 
 
@@ -104,54 +104,54 @@ 
 	 * @param bool $get_by_id
 	 * @return mixed
 	 */
-	private function buildCommentStructure($comments, $get_by_id=false)
+	private function buildCommentStructure($comments, $get_by_id = false)
 	{
 		$comments_by_id = [];
-		return $this->build($comments,$comments_by_id,$get_by_id);
+		return $this->build($comments, $comments_by_id, $get_by_id);
 	}
 
 
-	private function build($comments,$comments_by_id, $get_by_id)
+	private function build($comments, $comments_by_id, $get_by_id)
 	{
-		foreach($comments['comments'] as $comment)
+		foreach ($comments['comments'] as $comment)
 		{
 			$comments_by_id[$comment->getId()] = $comment;
 			$comment->setDepth($this->depth);
 		}
 
 		//Comment parent and children
-		foreach($comments['comments'] as $k=>$comment)
+		foreach ($comments['comments'] as $k=>$comment)
 		{
-			if($this->depth > 0 && $comment->getParentId() > 0)
+			if ($this->depth > 0 && $comment->getParentId() > 0)
 			{
-				$parent_id = $this->depthComment($comments_by_id,$comment->getId());
+				$parent_id = $this->depthComment($comments_by_id, $comment->getId());
 
 				//Si la pronfondeur atteinte est plus petite que la profondeur definis
 				//alors la réponse aura l'id du commentaire
 				//Sinon
 				//la réponse aura l'id du parent
-				if($this->depth_reached < $this->depth)
+				if ($this->depth_reached < $this->depth)
 				{
 					$comment->setDepth($comment->getId());
-				}else{
+				}else {
 					$comment->setDepth($parent_id);
 				}
 				$comment->setDepthReached($this->depth_reached);
 				$comments_by_id[$parent_id]->setChildren($comment);
 				unset($comments['comments'][$k]);
 
-			}else if($this->depth == 0){
+			}else if ($this->depth == 0) {
 				$comment->setDepth(0);
-			}else{
+			}else {
 				$comment->setDepth($comment->getId());
 			}
 
 		}
 
-		if($get_by_id)
+		if ($get_by_id)
 		{
 			return $comments_by_id;
-		}else{
+		}else {
 			return $comments;
 		}
 	}
@@ -162,29 +162,29 @@ 
 	 * @param $comment_id
 	 * @return mixed
 	 */
-	private function depthComment($comments_by_id,$comment_id)
+	private function depthComment($comments_by_id, $comment_id)
 	{
-		$parent_id=[];
+		$parent_id = [];
 		$index = $comment_id;
 		$parent = true;
 		$depth_reached = 0;
 
-		while($parent)
+		while ($parent)
 		{
 			$comment = $comments_by_id[$index];
-			if($comment->getParentId())
+			if ($comment->getParentId())
 			{
 				$parent_id[] = $comments_by_id[$index]->getParentId();
 				$index = $comments_by_id[$index]->getParentId();
 				$depth_reached++;
-			}else{
+			}else {
 				$parent = false;
 			}
 		}
 		$this->depth_reached = $depth_reached;
 		$array_reverse = array_reverse($parent_id);
 
-		return $this->depth < count($array_reverse) ? $array_reverse[$this->depth-1] : end($array_reverse);
+		return $this->depth < count($array_reverse) ? $array_reverse[$this->depth - 1] : end($array_reverse);
 	}
 
 
@@ -196,12 +196,12 @@ 
 	 * @param null $offset
 	 * @return array
 	 */
-	public function findAllComments(array $criteria=[],$orderBy=null,$limit=null,$offset=null)
+	public function findAllComments(array $criteria = [], $orderBy = null, $limit = null, $offset = null)
 	{
-		if(!empty($criteria) || isset($orderBy) || isset($limit) || isset($offset))
+		if (!empty($criteria) || isset($orderBy) || isset($limit) || isset($offset))
 		{
-			return $this->repository->findBy($criteria,$orderBy,$limit,$offset);
-		}else{
+			return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+		}else {
 			return $this->repository->findAll();
 		}
 	}
@@ -216,19 +216,19 @@ 
 	 */
 	private function commentQueryResult($qb, $model_name, $model_id, $is_join)
 	{
-		if($is_join)
+		if ($is_join)
 		{
 			$qb
-				->leftJoin('c.user','u')
+				->leftJoin('c.user', 'u')
 				->addSelect('u')
 			;
 		}
 
 		return $qb
 			->where("c.model = :ref")
-			->setParameter('ref',$model_name)
+			->setParameter('ref', $model_name)
 			->andWhere("c.modelId = :ref_id")
-			->setParameter('ref_id',$model_id)
+			->setParameter('ref_id', $model_id)
 			->orderBy('c.createdAt', 'DESC')
 			->getQuery()
 			->getResult()
@@ -237,27 +237,27 @@ 
 
 	private function oneCommentQueryResult($qb, $id, $model_name, $model_id, $is_join)
 	{
-		if($is_join)
+		if ($is_join)
 		{
 			$qb
-				->leftJoin('c.user','u')
+				->leftJoin('c.user', 'u')
 				->addSelect('u')
 			;
 		}
 		$qb->where('c.id = :id')
-			->setParameter('id',$id)
+			->setParameter('id', $id)
 		;
 
-		if($model_name)
+		if ($model_name)
 		{
 			$qb->andWhere("c.model = :ref")
-				->setParameter('ref',$model_name)
+				->setParameter('ref', $model_name)
 			;
 		}
-		if($model_id > 0)
+		if ($model_id > 0)
 		{
 			$qb->andWhere("c.modelId = :ref_id")
-				->setParameter('ref_id',$model_id)
+				->setParameter('ref_id', $model_id)
 			;
 		}
 
@@ -275,7 +275,7 @@ 
 
 		return $this->repository
 			->createQueryBuilder('c')
-			->delete($comment_class,'c')
+			->delete($comment_class, 'c')
 			->where("c.id IN(:ids)")
 			->setParameter('ids', array_values($ids))
 			->getQuery()
@@ -295,7 +295,7 @@ 
 
 		return $this->repository
 			->createQueryBuilder('c')
-			->delete($comment_class,'c')
+			->delete($comment_class, 'c')
 			->where("c.id = id")
 			->setParameter('id', $id)
 			->getQuery()
@@ -313,10 +313,10 @@ 
 	public function getChildren($comment)
 	{
 		$children_ids = [];
-		foreach($comment->getChildren() as $child)
+		foreach ($comment->getChildren() as $child)
 		{
 			$children_ids[] = $child->getId();
-			if($child->getChildren())
+			if ($child->getChildren())
 			{
 				$children_ids = array_merge($children_ids, $this->getChildren($child));
 			}
@@ -333,10 +333,10 @@ 
 	public function preDeleteComment(IsCommentable $referer)
 	{
 		$comments = $this->findComments($referer, true);
-		foreach($comments as $k=>$comment)
+		foreach ($comments as $k=>$comment)
 		{
 			$children_ids = $this->getChildren($comment);
-			array_push($children_ids,$k);
+			array_push($children_ids, $k);
 
 			$this->deleteByCommentIds($children_ids);
 		}

Braces +6 added lines, -6 removed lines

@@ -133,16 +133,16 @@ 
 				if($this->depth_reached < $this->depth)
 				{
 					$comment->setDepth($comment->getId());
-				}else{
+				} else{
 					$comment->setDepth($parent_id);
 				}
 				$comment->setDepthReached($this->depth_reached);
 				$comments_by_id[$parent_id]->setChildren($comment);
 				unset($comments['comments'][$k]);
 
-			}else if($this->depth == 0){
+			} else if($this->depth == 0){
 				$comment->setDepth(0);
-			}else{
+			} else{
 				$comment->setDepth($comment->getId());
 			}
 
@@ -151,7 +151,7 @@ 
 		if($get_by_id)
 		{
 			return $comments_by_id;
-		}else{
+		} else{
 			return $comments;
 		}
 	}
@@ -177,7 +177,7 @@ 
 				$parent_id[] = $comments_by_id[$index]->getParentId();
 				$index = $comments_by_id[$index]->getParentId();
 				$depth_reached++;
-			}else{
+			} else{
 				$parent = false;
 			}
 		}
@@ -201,7 +201,7 @@ 
 		if(!empty($criteria) || isset($orderBy) || isset($limit) || isset($offset))
 		{
 			return $this->repository->findBy($criteria,$orderBy,$limit,$offset);
-		}else{
+		} else{
 			return $this->repository->findAll();
 		}
 	}

Manager/Manager.php

Indentation +66 added lines, -66 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Created by PhpStorm.
- * User: Rafidion Michael
- * Date: 03/09/2015
- * Time: 12:02
- */
+     * Created by PhpStorm.
+     * User: Rafidion Michael
+     * Date: 03/09/2015
+     * Time: 12:02
+     */
 
 namespace Mykees\CommentBundle\Manager;
 
@@ -12,75 +12,75 @@ 
 abstract class Manager {
 
 
-	/**
-	 * @param $ref
-	 * @return string
-	 */
-	public function getBundleShortName ( $ref ){
-		$explode = explode('\\', $this->getClassName($ref));
-		return $explode[0].$explode[1];
-	}
+    /**
+     * @param $ref
+     * @return string
+     */
+    public function getBundleShortName ( $ref ){
+        $explode = explode('\\', $this->getClassName($ref));
+        return $explode[0].$explode[1];
+    }
 
 
-	/**
-	 * @param $ref
-	 * @return string
-	 */
-	public function getBundlePath ( $ref ){
-		$explode = explode('\\', $this->getClassName($ref));
-		return $explode[0].'\\'.$explode[1];
-	}
+    /**
+     * @param $ref
+     * @return string
+     */
+    public function getBundlePath ( $ref ){
+        $explode = explode('\\', $this->getClassName($ref));
+        return $explode[0].'\\'.$explode[1];
+    }
 
 
-	/**
-	 * @param $ref
-	 * @param bool $withouSlash
-	 * @return string
-	 */
-	public function getFullBundlePath($ref,$withouSlash = false)
-	{
-		$explode = explode('\\', $this->getClassName($ref));
-		if($withouSlash)
-		{
-			return $explode[0].$explode[1].':'.$explode[3];
-		}else{
-			return $explode[0].'\\'.$explode[1].'\\'.$explode[2].'\\'.$explode[3];
-		}
-	}
+    /**
+     * @param $ref
+     * @param bool $withouSlash
+     * @return string
+     */
+    public function getFullBundlePath($ref,$withouSlash = false)
+    {
+        $explode = explode('\\', $this->getClassName($ref));
+        if($withouSlash)
+        {
+            return $explode[0].$explode[1].':'.$explode[3];
+        }else{
+            return $explode[0].'\\'.$explode[1].'\\'.$explode[2].'\\'.$explode[3];
+        }
+    }
 
 
-	/**
-	 * @param $ref
-	 * @return string
-	 */
-	public function getClassShortName( $ref ) {
-		$reflection = new \ReflectionClass( $ref );
-		if( $reflection->getParentClass() ) {
-			$reflection = $reflection->getParentClass();
-		}
-		return $reflection->getShortName();
-	}
+    /**
+     * @param $ref
+     * @return string
+     */
+    public function getClassShortName( $ref ) {
+        $reflection = new \ReflectionClass( $ref );
+        if( $reflection->getParentClass() ) {
+            $reflection = $reflection->getParentClass();
+        }
+        return $reflection->getShortName();
+    }
 
 
-	/**
-	 * @param $ref
-	 * @return string
-	 */
-	public function getClassName ( $ref ) {
-		$reflection = new \ReflectionClass( $ref );
-		return $reflection->getName();
-	}
+    /**
+     * @param $ref
+     * @return string
+     */
+    public function getClassName ( $ref ) {
+        $reflection = new \ReflectionClass( $ref );
+        return $reflection->getName();
+    }
 
-	/**
-	 * Retrieve class repository name
-	 * @param $comment_class
-	 * @return string
-	 */
-	public function classRepository($comment_class)
-	{
-		$comment_class_name = $comment_class;
-		$explode = explode('\\',$comment_class_name);
+    /**
+     * Retrieve class repository name
+     * @param $comment_class
+     * @return string
+     */
+    public function classRepository($comment_class)
+    {
+        $comment_class_name = $comment_class;
+        $explode = explode('\\',$comment_class_name);
 
-		return $explode[0] . $explode[1] . ":" . $explode[3];
-	}
+        return $explode[0] . $explode[1] . ":" . $explode[3];
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
 	 * @param $ref
 	 * @return string
 	 */
-	public function getBundleShortName ( $ref ){
+	public function getBundleShortName($ref) {
 		$explode = explode('\\', $this->getClassName($ref));
 		return $explode[0].$explode[1];
 	}
@@ -26,7 +26,7 @@ 
 	 * @param $ref
 	 * @return string
 	 */
-	public function getBundlePath ( $ref ){
+	public function getBundlePath($ref) {
 		$explode = explode('\\', $this->getClassName($ref));
 		return $explode[0].'\\'.$explode[1];
 	}
@@ -37,13 +37,13 @@ 
 	 * @param bool $withouSlash
 	 * @return string
 	 */
-	public function getFullBundlePath($ref,$withouSlash = false)
+	public function getFullBundlePath($ref, $withouSlash = false)
 	{
 		$explode = explode('\\', $this->getClassName($ref));
-		if($withouSlash)
+		if ($withouSlash)
 		{
 			return $explode[0].$explode[1].':'.$explode[3];
-		}else{
+		}else {
 			return $explode[0].'\\'.$explode[1].'\\'.$explode[2].'\\'.$explode[3];
 		}
 	}
@@ -53,9 +53,9 @@ 
 	 * @param $ref
 	 * @return string
 	 */
-	public function getClassShortName( $ref ) {
-		$reflection = new \ReflectionClass( $ref );
-		if( $reflection->getParentClass() ) {
+	public function getClassShortName($ref) {
+		$reflection = new \ReflectionClass($ref);
+		if ($reflection->getParentClass()) {
 			$reflection = $reflection->getParentClass();
 		}
 		return $reflection->getShortName();
@@ -66,8 +66,8 @@ 
 	 * @param $ref
 	 * @return string
 	 */
-	public function getClassName ( $ref ) {
-		$reflection = new \ReflectionClass( $ref );
+	public function getClassName($ref) {
+		$reflection = new \ReflectionClass($ref);
 		return $reflection->getName();
 	}
 
@@ -79,8 +79,8 @@ 
 	public function classRepository($comment_class)
 	{
 		$comment_class_name = $comment_class;
-		$explode = explode('\\',$comment_class_name);
+		$explode = explode('\\', $comment_class_name);
 
-		return $explode[0] . $explode[1] . ":" . $explode[3];
+		return $explode[0].$explode[1].":".$explode[3];
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 		if($locale == 'fr')
 		{
 			return "moins d'une minute";
-		}else{
+		} else{
 			return 'less than a minute';
 		}
 	}

Repository/CommentRepository.php

Indentation +10 added lines, -10 removed lines

@@ -12,14 +12,14 @@
 
 class CommentRepository extends EntityRepository
 {
-	public function deleteByCommentIds(array $ids)
-	{
-		return $this->_em->createQueryBuilder()
-			->delete("MykeesCommentBundle:Comment",'c')
-			->where("c.id IN(:ids)")
-			->setParameter('ids', array_values($ids))
-			->getQuery()
-			->execute()
-		;
-	}
+    public function deleteByCommentIds(array $ids)
+    {
+        return $this->_em->createQueryBuilder()
+            ->delete("MykeesCommentBundle:Comment",'c')
+            ->where("c.id IN(:ids)")
+            ->setParameter('ids', array_values($ids))
+            ->getQuery()
+            ->execute()
+        ;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	public function deleteByCommentIds(array $ids)
 	{
 		return $this->_em->createQueryBuilder()
-			->delete("MykeesCommentBundle:Comment",'c')
+			->delete("MykeesCommentBundle:Comment", 'c')
 			->where("c.id IN(:ids)")
 			->setParameter('ids', array_values($ids))
 			->getQuery()

Tests/Controller/CommentsControllerTest.php

Indentation +166 added lines, -166 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Created by PhpStorm.
- * User: Rafidion Michael
- * Date: 23/04/2015
- * Time: 02:28
- */
+     * Created by PhpStorm.
+     * User: Rafidion Michael
+     * Date: 23/04/2015
+     * Time: 02:28
+     */
 
 namespace Mykees\CommentBundle\Tests\Controller;
 
@@ -15,32 +15,32 @@ 
 
     protected $client;
     protected $container;
-	protected $manager;
-	protected $query_manager;
+    protected $manager;
+    protected $query_manager;
     protected $em;
     protected $commentClass;
     protected $request;
 
-   public function setUp()
-   {
-
+    public function setUp()
+    {
 
-       $this->client = static::createClient();
-       $this->container = $this->client->getContainer();
-	   $this->manager = $this->container->get('mykees.comment.manager');
-	   $this->query_manager = $this->container->get('mykees.comment.query.manager');
-       $this->em = static::$kernel->getContainer()
-           ->get('doctrine')
-           ->getManager()
-       ;
 
-       $fixtures = [
-           'Mykees\CommentBundle\DataFixtures\ORM\LoadCommentData',
-           'Mvc\BlogBundle\DataFixtures\ORM\LoadPostsData',
-       ];
-       $this->loadFixtures($fixtures);
-       parent::setUp();
-   }
+        $this->client = static::createClient();
+        $this->container = $this->client->getContainer();
+        $this->manager = $this->container->get('mykees.comment.manager');
+        $this->query_manager = $this->container->get('mykees.comment.query.manager');
+        $this->em = static::$kernel->getContainer()
+            ->get('doctrine')
+            ->getManager()
+        ;
+
+        $fixtures = [
+            'Mykees\CommentBundle\DataFixtures\ORM\LoadCommentData',
+            'Mvc\BlogBundle\DataFixtures\ORM\LoadPostsData',
+        ];
+        $this->loadFixtures($fixtures);
+        parent::setUp();
+    }
 
     public function testCountCommentHtmlList()
     {
@@ -49,150 +49,150 @@ 
         $this->assertEquals(3,$crawler->filter('.comment-list')->count());
     }
 
-	public function testRemoveAssociateComment()
-	{
-		$this->client->request('GET', '/admin/delete/5');
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+    public function testRemoveAssociateComment()
+    {
+        $this->client->request('GET', '/admin/delete/5');
+        $this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+
+        $count = count($this->query_manager->findAllComments());
+
+        $this->assertEquals(4, $count);
+    }
+
+    public function testAddComment()
+    {
+        $crawler = $this->client->request('GET','/blog/title-1');
+        $this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction',  $this->client->getRequest()->attributes->get('_controller'));
+        $form = $crawler->selectButton('Poster')->form([
+            'mykees_comment[username]'=>'Mykees',
+            'mykees_comment[email]'=>'contact@mykees.fr',
+            'mykees_comment[content]'=>'Salut les guedins',
+            'mykees_comment[parentId]'=>0,
+            'mykees_comment[model]'=>'Post',
+            'mykees_comment[modelId]'=>1,
+        ]);
+
+        $this->client->submit($form);
+
+        $this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+
+        $count = count($this->query_manager->findAllComments());
+
+        $this->assertEquals(6, $count);
+    }
+
+    public function testAddCommentWithEmptyName()
+    {
+        $crawler = $this->client->request('GET','/blog/title-1');
+        $this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction',  $this->client->getRequest()->attributes->get('_controller'));
+        $form = $crawler->selectButton('Poster')->form([
+            'mykees_comment[username]'=>'',
+            'mykees_comment[email]'=>'contact@mykees.fr',
+            'mykees_comment[content]'=>'Salut les guedins',
+            'mykees_comment[parentId]'=>0,
+            'mykees_comment[model]'=>'Post',
+            'mykees_comment[modelId]'=>1,
+        ]);
+
+        $this->client->submit($form);
+
+        $count = count($this->query_manager->findAllComments());
+
+        $this->assertEquals(5, $count);
+    }
+
+    public function testAddCommentWithWrongEmailFormat()
+    {
+
+        $crawler = $this->client->request('GET','/blog/title-1');
+        $form = $crawler->selectButton('Poster')->form([
+            'mykees_comment[username]'=>'Mykees',
+            'mykees_comment[email]'=>'contact.fr',
+            'mykees_comment[content]'=>'Salut les guedins',
+            'mykees_comment[parentId]'=>0,
+            'mykees_comment[model]'=>'Post',
+            'mykees_comment[modelId]'=>1,
+        ]);
+
+        $this->client->submit($form);
+
+        $count = count($this->query_manager->findAllComments());
+
+        $this->assertEquals(5, $count);
+    }
+
+
+    public function testAddCommmentWithAChild()
+    {
+        $crawler = $this->client->request('GET','/blog/title-2');
+
+        $form = $crawler->selectButton('Poster')->form([
+            'mykees_comment[username]'=>'Mykees',
+            'mykees_comment[email]'=>'contact@mykees.fr',
+            'mykees_comment[content]'=>'Salut les guedins',
+            'mykees_comment[parentId]'=>0,
+            'mykees_comment[model]'=>'Post',
+            'mykees_comment[modelId]'=>1,
+        ]);
+        $this->client->submit($form);
+
+        $this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+
+        $count = count($this->query_manager->findAllComments());
+
+        $this->assertEquals(6, $count);
+
+        $form = $crawler->selectButton('Poster')->form([
+            'mykees_comment[username]'=>'Marion',
+            'mykees_comment[email]'=>'contact@marion.fr',
+            'mykees_comment[content]'=>'Salut les guedins',
+            'mykees_comment[parentId]'=>27,
+            'mykees_comment[model]'=>'Post',
+            'mykees_comment[modelId]'=>1,
+        ]);
+        $this->client->submit($form);
 
-		$count = count($this->query_manager->findAllComments());
-
-		$this->assertEquals(4, $count);
-	}
+        $this->assertEquals(302,$this->client->getResponse()->getStatusCode());
 
-	public function testAddComment()
-	{
-		$crawler = $this->client->request('GET','/blog/title-1');
-		$this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction',  $this->client->getRequest()->attributes->get('_controller'));
-		$form = $crawler->selectButton('Poster')->form([
-			'mykees_comment[username]'=>'Mykees',
-			'mykees_comment[email]'=>'contact@mykees.fr',
-			'mykees_comment[content]'=>'Salut les guedins',
-			'mykees_comment[parentId]'=>0,
-			'mykees_comment[model]'=>'Post',
-			'mykees_comment[modelId]'=>1,
-		]);
-
-		$this->client->submit($form);
-
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
-
-		$count = count($this->query_manager->findAllComments());
-
-		$this->assertEquals(6, $count);
-	}
-
-	public function testAddCommentWithEmptyName()
-	{
-		$crawler = $this->client->request('GET','/blog/title-1');
-		$this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction',  $this->client->getRequest()->attributes->get('_controller'));
-		$form = $crawler->selectButton('Poster')->form([
-			'mykees_comment[username]'=>'',
-			'mykees_comment[email]'=>'contact@mykees.fr',
-			'mykees_comment[content]'=>'Salut les guedins',
-			'mykees_comment[parentId]'=>0,
-			'mykees_comment[model]'=>'Post',
-			'mykees_comment[modelId]'=>1,
-		]);
-
-		$this->client->submit($form);
-
-		$count = count($this->query_manager->findAllComments());
-
-		$this->assertEquals(5, $count);
-	}
-
-	public function testAddCommentWithWrongEmailFormat()
-	{
-
-		$crawler = $this->client->request('GET','/blog/title-1');
-		$form = $crawler->selectButton('Poster')->form([
-			'mykees_comment[username]'=>'Mykees',
-			'mykees_comment[email]'=>'contact.fr',
-			'mykees_comment[content]'=>'Salut les guedins',
-			'mykees_comment[parentId]'=>0,
-			'mykees_comment[model]'=>'Post',
-			'mykees_comment[modelId]'=>1,
-		]);
-
-		$this->client->submit($form);
-
-		$count = count($this->query_manager->findAllComments());
-
-		$this->assertEquals(5, $count);
-	}
-
-
-	public function testAddCommmentWithAChild()
-	{
-		$crawler = $this->client->request('GET','/blog/title-2');
-
-		$form = $crawler->selectButton('Poster')->form([
-			'mykees_comment[username]'=>'Mykees',
-			'mykees_comment[email]'=>'contact@mykees.fr',
-			'mykees_comment[content]'=>'Salut les guedins',
-			'mykees_comment[parentId]'=>0,
-			'mykees_comment[model]'=>'Post',
-			'mykees_comment[modelId]'=>1,
-		]);
-		$this->client->submit($form);
-
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
-
-		$count = count($this->query_manager->findAllComments());
-
-		$this->assertEquals(6, $count);
-
-		$form = $crawler->selectButton('Poster')->form([
-			'mykees_comment[username]'=>'Marion',
-			'mykees_comment[email]'=>'contact@marion.fr',
-			'mykees_comment[content]'=>'Salut les guedins',
-			'mykees_comment[parentId]'=>27,
-			'mykees_comment[model]'=>'Post',
-			'mykees_comment[modelId]'=>1,
-		]);
-		$this->client->submit($form);
-
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
-
-		$count = count($this->query_manager->findAllComments());
-		$this->assertEquals(7, $count);
-
-
-		$count = count($this->query_manager->findAllComments(['parentId'=>27]));
-		$this->assertEquals(1, $count);
-	}
-
-
-	public function testPreDeleteComment()
-	{
-		$crawler = $this->client->request('GET','/blog/title-1');
-		$form = $crawler->selectButton('Poster')->form([
-			'mykees_comment[username]'=>'Mykees',
-			'mykees_comment[email]'=>'contact@mykees.fr',
-			'mykees_comment[content]'=>'Salut les guedins',
-			'mykees_comment[parentId]'=>0,
-			'mykees_comment[model]'=>'Post',
-			'mykees_comment[modelId]'=>25,
-		]);
-		$this->client->submit($form);
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
-		$count = count($this->query_manager->findAllComments());
-		$this->assertEquals(6, $count);
-
-
-		$post = $this->em->getRepository('MvcBlogBundle:Post')->find(25);
-		$this->em->remove($post);
-		$this->em->flush();
-
-		$count = count($this->query_manager->findAllComments());
-		$this->assertEquals(5, $count);
-	}
+        $count = count($this->query_manager->findAllComments());
+        $this->assertEquals(7, $count);
 
 
-	public function testWithCommentDepthToZero(){
-		$crawler = $this->client->request('GET', '/blog/title-1');
-		$this->assertEquals(200,$this->client->getResponse()->getStatusCode());
-		$this->assertEquals(0,$crawler->filter('.reply')->count());
-	}
+        $count = count($this->query_manager->findAllComments(['parentId'=>27]));
+        $this->assertEquals(1, $count);
+    }
+
+
+    public function testPreDeleteComment()
+    {
+        $crawler = $this->client->request('GET','/blog/title-1');
+        $form = $crawler->selectButton('Poster')->form([
+            'mykees_comment[username]'=>'Mykees',
+            'mykees_comment[email]'=>'contact@mykees.fr',
+            'mykees_comment[content]'=>'Salut les guedins',
+            'mykees_comment[parentId]'=>0,
+            'mykees_comment[model]'=>'Post',
+            'mykees_comment[modelId]'=>25,
+        ]);
+        $this->client->submit($form);
+        $this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+        $count = count($this->query_manager->findAllComments());
+        $this->assertEquals(6, $count);
+
+
+        $post = $this->em->getRepository('MvcBlogBundle:Post')->find(25);
+        $this->em->remove($post);
+        $this->em->flush();
+
+        $count = count($this->query_manager->findAllComments());
+        $this->assertEquals(5, $count);
+    }
+
+
+    public function testWithCommentDepthToZero(){
+        $crawler = $this->client->request('GET', '/blog/title-1');
+        $this->assertEquals(200,$this->client->getResponse()->getStatusCode());
+        $this->assertEquals(0,$crawler->filter('.reply')->count());
+    }
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
 
 use Liip\FunctionalTestBundle\Test\WebTestCase;
 
-class CommentsControllerTest extends WebTestCase{
+class CommentsControllerTest extends WebTestCase {
 
     protected $client;
     protected $container;
@@ -45,14 +45,14 @@ 
     public function testCountCommentHtmlList()
     {
         $crawler = $this->client->request('GET', '/blog/title-1');
-        $this->assertEquals(200,$this->client->getResponse()->getStatusCode());
-        $this->assertEquals(3,$crawler->filter('.comment-list')->count());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertEquals(3, $crawler->filter('.comment-list')->count());
     }
 
 	public function testRemoveAssociateComment()
 	{
 		$this->client->request('GET', '/admin/delete/5');
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+		$this->assertEquals(302, $this->client->getResponse()->getStatusCode());
 
 		$count = count($this->query_manager->findAllComments());
 
@@ -61,8 +61,8 @@ 
 
 	public function testAddComment()
 	{
-		$crawler = $this->client->request('GET','/blog/title-1');
-		$this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction',  $this->client->getRequest()->attributes->get('_controller'));
+		$crawler = $this->client->request('GET', '/blog/title-1');
+		$this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction', $this->client->getRequest()->attributes->get('_controller'));
 		$form = $crawler->selectButton('Poster')->form([
 			'mykees_comment[username]'=>'Mykees',
 			'mykees_comment[email]'=>'contact@mykees.fr',
@@ -74,7 +74,7 @@ 
 
 		$this->client->submit($form);
 
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+		$this->assertEquals(302, $this->client->getResponse()->getStatusCode());
 
 		$count = count($this->query_manager->findAllComments());
 
@@ -83,8 +83,8 @@ 
 
 	public function testAddCommentWithEmptyName()
 	{
-		$crawler = $this->client->request('GET','/blog/title-1');
-		$this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction',  $this->client->getRequest()->attributes->get('_controller'));
+		$crawler = $this->client->request('GET', '/blog/title-1');
+		$this->assertEquals('Mvc\BlogBundle\Controller\BlogController::showAction', $this->client->getRequest()->attributes->get('_controller'));
 		$form = $crawler->selectButton('Poster')->form([
 			'mykees_comment[username]'=>'',
 			'mykees_comment[email]'=>'contact@mykees.fr',
@@ -104,7 +104,7 @@ 
 	public function testAddCommentWithWrongEmailFormat()
 	{
 
-		$crawler = $this->client->request('GET','/blog/title-1');
+		$crawler = $this->client->request('GET', '/blog/title-1');
 		$form = $crawler->selectButton('Poster')->form([
 			'mykees_comment[username]'=>'Mykees',
 			'mykees_comment[email]'=>'contact.fr',
@@ -124,7 +124,7 @@ 
 
 	public function testAddCommmentWithAChild()
 	{
-		$crawler = $this->client->request('GET','/blog/title-2');
+		$crawler = $this->client->request('GET', '/blog/title-2');
 
 		$form = $crawler->selectButton('Poster')->form([
 			'mykees_comment[username]'=>'Mykees',
@@ -136,7 +136,7 @@ 
 		]);
 		$this->client->submit($form);
 
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+		$this->assertEquals(302, $this->client->getResponse()->getStatusCode());
 
 		$count = count($this->query_manager->findAllComments());
 
@@ -152,7 +152,7 @@ 
 		]);
 		$this->client->submit($form);
 
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+		$this->assertEquals(302, $this->client->getResponse()->getStatusCode());
 
 		$count = count($this->query_manager->findAllComments());
 		$this->assertEquals(7, $count);
@@ -165,7 +165,7 @@ 
 
 	public function testPreDeleteComment()
 	{
-		$crawler = $this->client->request('GET','/blog/title-1');
+		$crawler = $this->client->request('GET', '/blog/title-1');
 		$form = $crawler->selectButton('Poster')->form([
 			'mykees_comment[username]'=>'Mykees',
 			'mykees_comment[email]'=>'contact@mykees.fr',
@@ -175,7 +175,7 @@ 
 			'mykees_comment[modelId]'=>25,
 		]);
 		$this->client->submit($form);
-		$this->assertEquals(302,$this->client->getResponse()->getStatusCode());
+		$this->assertEquals(302, $this->client->getResponse()->getStatusCode());
 		$count = count($this->query_manager->findAllComments());
 		$this->assertEquals(6, $count);
 
@@ -189,10 +189,10 @@ 
 	}
 
 
-	public function testWithCommentDepthToZero(){
+	public function testWithCommentDepthToZero() {
 		$crawler = $this->client->request('GET', '/blog/title-1');
-		$this->assertEquals(200,$this->client->getResponse()->getStatusCode());
-		$this->assertEquals(0,$crawler->filter('.reply')->count());
+		$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+		$this->assertEquals(0, $crawler->filter('.reply')->count());
 	}
 
 }
\ No newline at end of file

Tests/Fixtures/app/AppKernel.php

Indentation +3 added lines, -3 removed lines

@@ -19,9 +19,9 @@
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
 
             new Mvc\BlogBundle\MvcBlogBundle(),
-	        new Mykees\CommentBundle\MykeesCommentBundle(),
-	        new Mykees\MediaBundle\MykeesMediaBundle(),
-	        new Mykees\TagBundle\MykeesTagBundle(),
+            new Mykees\CommentBundle\MykeesCommentBundle(),
+            new Mykees\MediaBundle\MykeesMediaBundle(),
+            new Mykees\TagBundle\MykeesTagBundle(),
             new Liip\FunctionalTestBundle\LiipFunctionalTestBundle(),
         );