diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php
index 71b24ef6e..af3b2356e 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,9 +19,6 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-
 /**
  * AbstractController class
  *
@@ -31,5 +28,3 @@ abstract class AbstractController
 {
 
 }
-
-?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php
index af18f3bae..d3f3a5304 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,12 +19,7 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-
 abstract class BrickController extends AbstractController
 {
 
 }
-
-?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php
index f99f9e795..70477005e 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -32,7 +32,8 @@ class DefaultController
 
 		// Rendering tiles
 		$aData['aTilesRendering'] = array();
-		foreach($oApp['combodo.portal.instance.conf']['bricks'] as $oBrick)
+		/** @var PortalBrick $oBrick */
+        foreach($oApp['combodo.portal.instance.conf']['bricks'] as $oBrick)
 		{
 			// Doing it only for tile visible on home page to avoid unnecessary rendering
 			if (($oBrick->GetVisibleHome() === true) && ($oBrick->GetTileControllerAction() !== null))
@@ -58,5 +59,3 @@ class DefaultController
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
index cfa5ec300..ba8437cf0 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
@@ -31,6 +31,7 @@ use Combodo\iTop\Portal\Brick\AbstractBrick;
 use Combodo\iTop\Portal\Brick\ManageBrick;
 use Combodo\iTop\Portal\Helper\ApplicationHelper;
 use Combodo\iTop\Portal\Helper\SecurityHelper;
+use Combodo\iTop\Portal\Helper\ScopeValidatorHelper;
 use DBObject;
 use DBObjectSet;
 use DBSearch;
@@ -43,7 +44,6 @@ use Silex\Application;
 use Symfony\Component\HttpFoundation\Request;
 use UnaryExpression;
 use URLButtonItem;
-use UserRights;
 use VariableExpression;
 
 class ManageBrickController extends BrickController
@@ -736,12 +736,14 @@ class ManageBrickController extends BrickController
 		return $aData;
 	}
 
-	/**
-	 * @param Request $oRequest
-	 * @param array $aData
-	 * @param DBSearch $oQuery
-	 * @param string $sClass
-	 */
+    /**
+     * @param Request $oRequest
+     * @param array $aData
+     * @param DBSearch $oQuery
+     * @param string $sClass
+     *
+     * @throws Exception
+     */
 	protected function ManageSearchValue(Request $oRequest, &$aData, DBSearch &$oQuery, $sClass, $aColumnsAttrs)
 	{
 		// Getting search value
@@ -794,28 +796,28 @@ class ManageBrickController extends BrickController
 		$aData['sSearchValue'] = $sSearchValue;
 	}
 
-	/**
-	 * Get the groups using a given attribute code.
-	 * If a limit is given, the remaining groups are aggregated (groupby result and search request).
-	 *
-	 * @param DBSearch $oQuery Initial query
-	 * @param string $sGroupingTabAttCode Attribute code to group by
-	 * @param Application $oApp
-	 * @param ManageBrick $oBrick
-	 *
-	 * @return array of results from the groupby request and the corrsponding search.
-	 * @throws \DictExceptionMissingString
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
+    /**
+     * Get the groups using a given attribute code.
+     * If a limit is given, the remaining groups are aggregated (groupby result and search request).
+     *
+     * @param DBSearch $oQuery Initial query
+     * @param string $sGroupingTabAttCode Attribute code to group by
+     * @param Application $oApp
+     * @param ManageBrick $oBrick
+     *
+     * @return array of results from the groupby request and the corrsponding search.
+     *
+     * @throws \MySQLException
+     * @throws \OQLException
+     * @throws \Exception
+     */
 	protected function GroupByAttribute(
 		DBSearch $oQuery, $sGroupingTabAttCode, Application $oApp, ManageBrick $oBrick
 	) {
 		$aGroupingTabsValues = array();
 		$aDistinctResults = array();
 		$oDistinctQuery = DBSearch::FromOQL($oBrick->GetOql());
-		/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
+		/** @var ScopeValidatorHelper $oScopeHelper */
 		$oScopeHelper = $oApp['scope_validator'];
 		$bHasScope = $oScopeHelper->AddScopeToQuery($oDistinctQuery, $oDistinctQuery->GetClass());
 		if ($bHasScope)
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php
index 7c4a51667..83c376c74 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,8 +19,6 @@
 
 namespace Combodo\iTop\Portal\Router;
 
-use Silex\Application;
-
 class BrowseBrickRouter extends AbstractRouter
 {
 	static $aRoutes = array(
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php
index 6df68230e..b78b85800 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,8 +19,6 @@
 
 namespace Combodo\iTop\Portal\Router;
 
-use Silex\Application;
-
 class CreateBrickRouter extends AbstractRouter
 {
 	static $aRoutes = array(
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php
index 319088a9a..18a37a88a 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,8 +19,6 @@
 
 namespace Combodo\iTop\Portal\Router;
 
-use Silex\Application;
-
 class DefaultRouter extends AbstractRouter
 {
 	static $aRoutes = array(
@@ -36,5 +34,3 @@ class DefaultRouter extends AbstractRouter
 	);
 
 }
-
-?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php
index ecffdf543..c9089fa3f 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,8 +19,6 @@
 
 namespace Combodo\iTop\Portal\Router;
 
-use Silex\Application;
-
 class ObjectRouter extends AbstractRouter
 {
 	static $aRoutes = array(
@@ -113,5 +111,3 @@ class ObjectRouter extends AbstractRouter
 	);
 
 }
-
-?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php
index 1d4a840de..d40118595 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,8 +19,6 @@
 
 namespace Combodo\iTop\Portal\Router;
 
-use Silex\Application;
-
 class UserProfileRouter extends AbstractRouter
 {
 	static $aRoutes = array(
@@ -34,5 +32,3 @@ class UserProfileRouter extends AbstractRouter
 	);
 
 }
-
-?>
\ No newline at end of file