diff --git a/docs/source/_static/code/exports/CountPerson.php b/docs/source/_static/code/exports/CountPerson.php
index bc76f96d6..0d94c0c90 100644
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -14,7 +14,7 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
- * 
+ *
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
@@ -25,94 +25,95 @@ class CountPerson implements ExportInterface
      * @var EntityManagerInterface
      */
     protected $entityManager;
-    
+
     public function __construct(
             EntityManagerInterface $em
             )
     {
         $this->entityManager = $em;
     }
-    
+
     public function getType()
     {
         return Declarations::PERSON_TYPE;
     }
-    
+
     public function getDescription()
     {
         return "Count peoples by various parameters.";
     }
-    
+
     public function getTitle()
     {
         return "Count peoples";
     }
-    
+
     public function requiredRole()
     {
         return new Role(PersonVoter::STATS);
     }
-    
+
     public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
     {
         // we gather all center the user choose.
         $centers = array_map(function($el) { return $el['center']; }, $acl);
-        
+
         $qb = $this->entityManager->createQueryBuilder();
-        
+
         $qb->select('COUNT(person.id) AS export_result')
                 ->from('ChillPersonBundle:Person', 'person')
                 ->join('person.center', 'center')
                 ->andWhere('center IN (:authorized_centers)')
                 ->setParameter('authorized_centers', $centers);
                 ;
-        
-        
+
+
         return $qb;
     }
-    
+
     public function getResult($qb, $data)
     {
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
-    
+
     public function getQueryKeys($data)
     {
         // this array match the result keys in the query. We have only
         // one column.
         return array('export_result');
     }
-    
+
     public function getLabels($key, array $values, $data)
     {
-        
-        // the Closure which will be executed by the formatter. 
+
+        // the Closure which will be executed by the formatter.
         return function($value) {
             switch($value) {
                 case '_header':
-                  // we have to process specifically the '_header' string, 
+                  // we have to process specifically the '_header' string,
                   // which will be used by the formatter to show a column title
                   return $this->getTitle();
                 default:
                   // for all value, we do not process them and return them
                   // immediatly
                   return $value;
+            };
         };
     }
-    
+
     public function getAllowedFormattersTypes()
     {
         return array(FormatterInterface::TYPE_TABULAR);
     }
-    
+
     public function buildForm(FormBuilderInterface $builder) {
         // this export does not add any form
     }
-    
+
     public function supportsModifiers()
     {
         // explain the export manager which formatters and filters are allowed
         return array(Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN);
     }
-    
+
 }
diff --git a/docs/source/development/pagination/example.php b/docs/source/development/pagination/example.php
index 6ed1e68ef..71dcb263c 100644
--- a/docs/source/development/pagination/example.php
+++ b/docs/source/development/pagination/example.php
@@ -8,21 +8,21 @@ use Symfony\Component\HttpFoundation\Request;
 
 class ItemController extends Controller {
 
-    public function yourAction() 
+    public function yourAction()
     {
         $em = $this->getDoctrine()->getManager();
         // first, get the number of total item are available
         $total = $em
              ->createQuery("SELECT COUNT (item.id) FROM ChillMyBundle:Item item")
              ->getSingleScalarResult();
-       
+
         // get the PaginatorFactory
         $paginatorFactory = $this->get('chill_main.paginator_factory');
-        
-        // create a pagination instance. This instance is only valid for 
+
+        // create a pagination instance. This instance is only valid for
         // the current route and parameters
         $paginator = $paginatorFactory->create($total);
-        
+
         // launch your query on item. Limit the query to the results
         // for the current page using the paginator
         $items = $em->createQuery("SELECT item FROM ChillMyBundle:Item item WHERE <your clause>")
@@ -30,12 +30,15 @@ class ItemController extends Controller {
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
             // use the paginator to get the number of items to display
             ->setMaxResults($paginator->getItemsPerPage());
-            
-        return $this->render('ChillMyBundle:Item:list.html.twig', array(
-                'items' => $items,
-                'paginator' => $paginator
-                );
-            
+
+        return $this
+            ->render(
+                'ChillMyBundle:Item:list.html.twig',
+                array(
+                    'items' => $items,
+                    'paginator' => $paginator
+                )
+            );
     }
 
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
index 87208bdcf..aef7b1d35 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
@@ -25,7 +25,6 @@ class ThirdPartyTypeManager
      * Method used during the load of the manager by Dependency Injection
      * 
      * @param \Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface $provider
-     * @return \self
      */
     public function addProvider(ThirdPartyTypeProviderInterface $provider): self
     {