From 4990c66502d9315984d730485e2cc42dec19b308 Mon Sep 17 00:00:00 2001
From: Benjamin Dalsass <benjamin.dalsass@combodo.com>
Date: Mon, 20 Nov 2023 15:57:33 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B06933=20-=20SF=206.4=20-=20Remove=20depre?=
 =?UTF-8?q?cated=20calls=20-=20AggregatePageBrickController=20(services=20?=
 =?UTF-8?q?access)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AggregatePageBrickController.php          | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/AggregatePageBrickController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/AggregatePageBrickController.php
index 0da35e3fc5..450e459cd4 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Controller/AggregatePageBrickController.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/AggregatePageBrickController.php
@@ -20,6 +20,7 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
+use Combodo\iTop\Portal\Brick\BrickCollection;
 use Combodo\iTop\Portal\Brick\BrickNotFoundException;
 use IssueLog;
 use LogChannels;
@@ -40,6 +41,19 @@ use UserRights;
  */
 class AggregatePageBrickController extends BrickController
 {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \Combodo\iTop\Portal\Brick\BrickCollection $oBrickCollection
+	 */
+	public function __construct(
+		protected BrickCollection $oBrickCollection
+	)
+	{
+
+	}
+
 	/**
 	 * @param \Symfony\Component\HttpFoundation\Request $oRequest
 	 * @param string $sBrickId
@@ -51,11 +65,8 @@ class AggregatePageBrickController extends BrickController
 	 */
 	public function DisplayAction(Request $oRequest, $sBrickId)
 	{
-		/** @var \Combodo\iTop\Portal\Brick\BrickCollection $oBrickCollection */
-		$oBrickCollection = $this->get('brick_collection');
-
 		/** @var \Combodo\iTop\Portal\Brick\AggregatePageBrick $oBrick */
-		$oBrick = $oBrickCollection->GetBrickById($sBrickId);
+		$oBrick = $this->oBrickCollection->GetBrickById($sBrickId);
 
 		$aAggregatePageBricksConf = $oBrick->GetAggregatePageBricks();
 		$aAggregatePageBricks = $this->GetOrderedAggregatePageBricksObjectsById($aAggregatePageBricksConf);
@@ -81,15 +92,12 @@ class AggregatePageBrickController extends BrickController
 	 */
 	private function GetOrderedAggregatePageBricksObjectsById($aAggregatePageBricksConf)
 	{
-		/** @var \Combodo\iTop\Portal\Brick\BrickCollection $oBrickCollection */
-		$oBrickCollection = $this->get('brick_collection');
-
 		$aAggregatePageBricks = array();
 		foreach ($aAggregatePageBricksConf as $sBrickId => $iBrickRank)
 		{
 			try
 			{
-				$oPortalBrick = $oBrickCollection->GetBrickById($sBrickId);
+				$oPortalBrick = $this->oBrickCollection->GetBrickById($sBrickId);
 			}
 			catch (BrickNotFoundException $oException)
 			{