From 71ef74e211ea078c710756ce9c4f2ed60d1c1422 Mon Sep 17 00:00:00 2001 From: Benjamin Dalsass Date: Mon, 20 Nov 2023 15:54:21 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B06933=20-=20SF=206.4=20-=20Remove=20depre?= =?UTF-8?q?cated=20calls=20-=20BrowseBrickController=20(services=20access)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Controller/BrowseBrickController.php | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php index 507848bf5b..4d5d76c9c1 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php @@ -24,8 +24,11 @@ use AttributeExternalKey; use AttributeLinkedSetIndirect; use BinaryExpression; use Combodo\iTop\Portal\Brick\AbstractBrick; +use Combodo\iTop\Portal\Brick\BrickCollection; use Combodo\iTop\Portal\Brick\BrowseBrick; +use Combodo\iTop\Portal\Helper\BrickControllerHelper; use Combodo\iTop\Portal\Helper\BrowseBrickHelper; +use Combodo\iTop\Portal\Helper\RequestManipulatorHelper; use DBObjectSearch; use DBObjectSet; use DBSearch; @@ -48,6 +51,26 @@ use VariableExpression; */ class BrowseBrickController extends BrickController { + + /** + * Constructor. + * + * @param \Combodo\iTop\Portal\Helper\BrowseBrickHelper $oBrowseBrickHelper + * @param \Combodo\iTop\Portal\Helper\RequestManipulatorHelper $oRequestManipulator + * @param \Combodo\iTop\Portal\Helper\BrickControllerHelper $oBrickControllerHelper + * @param \Combodo\iTop\Portal\Brick\BrickCollection $oBrickCollection + */ + public function __construct( + protected BrowseBrickHelper $oBrowseBrickHelper, + protected RequestManipulatorHelper $oRequestManipulator, + protected BrickControllerHelper $oBrickControllerHelper, + protected BrickCollection $oBrickCollection + ) + { + + } + + /** * @param \Symfony\Component\HttpFoundation\Request $oRequest * @param string $sBrickId @@ -69,15 +92,8 @@ class BrowseBrickController extends BrickController { $sPortalId = $this->getParameter('combodo.portal.instance.id'); - /** @var \Combodo\iTop\Portal\Helper\BrowseBrickHelper $oBrowseBrickHelper */ - $oBrowseBrickHelper = $this->get('browse_brick'); - /** @var \Combodo\iTop\Portal\Helper\RequestManipulatorHelper $oRequestManipulator */ - $oRequestManipulator = $this->get('request_manipulator'); - /** @var \Combodo\iTop\Portal\Helper\BrickControllerHelper */ - $oBrickControllerHelper = $this->get('brick_controller_helper'); - /** @var \Combodo\iTop\Portal\Brick\BrowseBrick $oBrick */ - $oBrick = $this->get('brick_collection')->getBrickById($sBrickId); + $oBrick = $this->oBrickCollection->getBrickById($sBrickId); // Getting available browse modes $aBrowseModes = $oBrick->GetAvailablesBrowseModes(); @@ -85,10 +101,10 @@ class BrowseBrickController extends BrickController // Getting current browse mode (First from router parameter, then default brick value) $sBrowseMode = (!empty($sBrowseMode)) ? $sBrowseMode : $oBrick->GetDefaultBrowseMode(); // Getting current dataloading mode (First from router parameter, then query parameter, then default brick value) - $sDataLoading = ($sDataLoading !== null) ? $sDataLoading : $oRequestManipulator->ReadParam('sDataLoading', + $sDataLoading = ($sDataLoading !== null) ? $sDataLoading : $this->oRequestManipulator->ReadParam('sDataLoading', $oBrick->GetDataLoading()); // Getting search value - $sRawSearchValue = $oRequestManipulator->ReadParam('sSearchValue', ''); + $sRawSearchValue = $this->oRequestManipulator->ReadParam('sSearchValue', ''); $sSearchValue = html_entity_decode($sRawSearchValue); if (strlen($sSearchValue) > 0) { @@ -98,7 +114,7 @@ class BrowseBrickController extends BrickController $aData = array(); $aLevelsProperties = array(); $aLevelsClasses = array(); - $oBrowseBrickHelper->TreeToFlatLevelsProperties($oBrick->GetLevels(), $aLevelsProperties); + $this->oBrowseBrickHelper->TreeToFlatLevelsProperties($oBrick->GetLevels(), $aLevelsProperties); // Consistency checks if (!in_array($sBrowseMode, array_keys($aBrowseModes))) @@ -298,8 +314,8 @@ class BrowseBrickController extends BrickController { case BrowseBrick::ENUM_BROWSE_MODE_LIST: // Retrieving parameters - $iPageNumber = (int)$oRequestManipulator->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT); - $iListLength = (int)$oRequestManipulator->ReadParam('iListLength', BrowseBrick::DEFAULT_LIST_LENGTH, + $iPageNumber = (int)$this->oRequestManipulator->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT); + $iListLength = (int)$this->oRequestManipulator->ReadParam('iListLength', BrowseBrick::DEFAULT_LIST_LENGTH, FILTER_SANITIZE_NUMBER_INT); // Getting total records number @@ -315,8 +331,8 @@ class BrowseBrickController extends BrickController case BrowseBrick::ENUM_BROWSE_MODE_TREE: case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC: // Retrieving parameters - $sLevelAlias = $oRequestManipulator->ReadParam('sLevelAlias', ''); - $sNodeId = $oRequestManipulator->ReadParam('sNodeId', ''); + $sLevelAlias = $this->oRequestManipulator->ReadParam('sLevelAlias', ''); + $sNodeId = $this->oRequestManipulator->ReadParam('sNodeId', ''); // If no values for those parameters, we might be loading page in lazy mode for the first time, therefore the URL doesn't have those information. if (empty($sLevelAlias)) @@ -415,7 +431,7 @@ class BrowseBrickController extends BrickController $oSet->OptimizeColumnLoad($aColumnAttrs); // Setting specified column sort, setting default datamodel one otherwise - $aSortedParams = $oBrickControllerHelper->ExtractSortParams(); + $aSortedParams = $this->oBrickControllerHelper->ExtractSortParams(); if (!empty($aSortedParams)) { $oSet->SetOrderBy($aSortedParams); @@ -432,12 +448,12 @@ class BrowseBrickController extends BrickController { case BrowseBrick::ENUM_BROWSE_MODE_TREE: case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC: - $oBrowseBrickHelper->AddToTreeItems($aItems, $aCurrentRow, $aLevelsProperties, null); + $this->oBrowseBrickHelper->AddToTreeItems($aItems, $aCurrentRow, $aLevelsProperties, null); break; case BrowseBrick::ENUM_BROWSE_MODE_LIST: default: - $aItems[] = $oBrowseBrickHelper->AddToFlatItems($aCurrentRow, $aLevelsProperties); + $aItems[] = $this->oBrowseBrickHelper->AddToFlatItems($aCurrentRow, $aLevelsProperties); break; } }