composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6933 - SF 6.4 - Remove deprecated calls

Browse Source 
- AggregatePageBrickController (services access)
This commit is contained in:
Benjamin Dalsass
2023-11-20 15:57:33 +01:00
parent 71ef74e211
commit 4990c66502
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
datamodels/2.x/itop-portal-base/portal/src/Controller/AggregatePageBrickController.php
View File

@@ -20,6 +20,7 @@
namespace Combodo\iTop\Portal\Controller; namespace Combodo\iTop\Portal\Controller;
use Combodo\iTop\Portal\Brick\BrickCollection;
use Combodo\iTop\Portal\Brick\BrickNotFoundException; use Combodo\iTop\Portal\Brick\BrickNotFoundException;
use IssueLog; use IssueLog;
use LogChannels; use LogChannels;
@@ -40,6 +41,19 @@ use UserRights;
*/ */
class AggregatePageBrickController extends BrickController 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 \Symfony\Component\HttpFoundation\Request $oRequest
* @param string $sBrickId * @param string $sBrickId
@@ -51,11 +65,8 @@ class AggregatePageBrickController extends BrickController
*/ */
public function DisplayAction(Request $oRequest, $sBrickId) 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 */ /** @var \Combodo\iTop\Portal\Brick\AggregatePageBrick $oBrick */
$oBrick = $oBrickCollection->GetBrickById($sBrickId); $oBrick = $this->oBrickCollection->GetBrickById($sBrickId);
$aAggregatePageBricksConf = $oBrick->GetAggregatePageBricks(); $aAggregatePageBricksConf = $oBrick->GetAggregatePageBricks();
$aAggregatePageBricks = $this->GetOrderedAggregatePageBricksObjectsById($aAggregatePageBricksConf); $aAggregatePageBricks = $this->GetOrderedAggregatePageBricksObjectsById($aAggregatePageBricksConf);
@@ -81,15 +92,12 @@ class AggregatePageBrickController extends BrickController
*/ */
private function GetOrderedAggregatePageBricksObjectsById($aAggregatePageBricksConf) private function GetOrderedAggregatePageBricksObjectsById($aAggregatePageBricksConf)
{ {
/** @var \Combodo\iTop\Portal\Brick\BrickCollection $oBrickCollection */
$oBrickCollection = $this->get('brick_collection');
$aAggregatePageBricks = array(); $aAggregatePageBricks = array();
foreach ($aAggregatePageBricksConf as $sBrickId => $iBrickRank) foreach ($aAggregatePageBricksConf as $sBrickId => $iBrickRank)
{ {
try try
{ {
$oPortalBrick = $oBrickCollection->GetBrickById($sBrickId); $oPortalBrick = $this->oBrickCollection->GetBrickById($sBrickId);
} }
catch (BrickNotFoundException $oException) catch (BrickNotFoundException $oException)
{ {