From fb06df4acb23646cdf653e00fcc8202ea23597e6 Mon Sep 17 00:00:00 2001 From: Mohamed El Mrabet Date: Wed, 26 Nov 2025 12:08:22 +0100 Subject: [PATCH] Fix deprecated warning on PHP 8.4 by making parameter explicitly nullable in Grid Collection constructors --- Model/ResourceModel/Job/Grid/Collection.php | 8 ++++---- Model/ResourceModel/LandingPage/Grid/Collection.php | 10 +++++----- Model/ResourceModel/Query/Grid/Collection.php | 8 ++++---- Model/ResourceModel/QueueArchive/Grid/Collection.php | 6 +++--- Model/ResourceModel/Run/Grid/Collection.php | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Model/ResourceModel/Job/Grid/Collection.php b/Model/ResourceModel/Job/Grid/Collection.php index 8e8e542d2..713acdf3d 100644 --- a/Model/ResourceModel/Job/Grid/Collection.php +++ b/Model/ResourceModel/Job/Grid/Collection.php @@ -22,7 +22,7 @@ class Collection extends JobCollection implements SearchResultInterface * @param mixed $eventObject * @param mixed $resourceModel * @param string $model - * @param null $connection + * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource * * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -37,7 +37,7 @@ public function __construct( $eventObject, $resourceModel, $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, - $connection = null, + ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null, ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null ) { parent::__construct( @@ -91,7 +91,7 @@ public function getSearchCriteria() } /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria + * @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria * * @return $this * @@ -121,7 +121,7 @@ public function setTotalCount($totalCount) } /** - * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items + * @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items * * @return $this * diff --git a/Model/ResourceModel/LandingPage/Grid/Collection.php b/Model/ResourceModel/LandingPage/Grid/Collection.php index 0b4ca6881..cf13d3ab2 100644 --- a/Model/ResourceModel/LandingPage/Grid/Collection.php +++ b/Model/ResourceModel/LandingPage/Grid/Collection.php @@ -21,8 +21,8 @@ class Collection extends LandingPageCollection implements SearchResultInterface * @param mixed $eventObject * @param mixed $resourceModel * @param string $model - * @param null $connection - * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource + * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection + * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource * * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ @@ -36,7 +36,7 @@ public function __construct( $eventObject, $resourceModel, $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, - $connection = null, + ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null, ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null ) { parent::__construct( @@ -76,7 +76,7 @@ public function getSearchCriteria() } /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria + * @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria * * @return $this * @@ -106,7 +106,7 @@ public function setTotalCount($totalCount) } /** - * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items + * @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items * * @return $this * diff --git a/Model/ResourceModel/Query/Grid/Collection.php b/Model/ResourceModel/Query/Grid/Collection.php index 891e8e2b5..b63808436 100644 --- a/Model/ResourceModel/Query/Grid/Collection.php +++ b/Model/ResourceModel/Query/Grid/Collection.php @@ -21,7 +21,7 @@ class Collection extends QueryCollection implements SearchResultInterface * @param mixed $eventObject * @param mixed $resourceModel * @param string $model - * @param null $connection + * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource * * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -36,7 +36,7 @@ public function __construct( $eventObject, $resourceModel, $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, - $connection = null, + ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null, ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null ) { parent::__construct( @@ -76,7 +76,7 @@ public function getSearchCriteria() } /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria + * @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria * * @return $this * @@ -106,7 +106,7 @@ public function setTotalCount($totalCount) } /** - * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items + * @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items * * @return $this * diff --git a/Model/ResourceModel/QueueArchive/Grid/Collection.php b/Model/ResourceModel/QueueArchive/Grid/Collection.php index 86f7b317b..e59cfbadc 100644 --- a/Model/ResourceModel/QueueArchive/Grid/Collection.php +++ b/Model/ResourceModel/QueueArchive/Grid/Collection.php @@ -28,7 +28,7 @@ class Collection extends QueueArchiveCollection implements SearchResultInterface * @param mixed $eventObject * @param mixed $resourceModel * @param string $model - * @param null $connection + * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection * @param AbstractDb|null $resource * * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -43,7 +43,7 @@ public function __construct( $eventObject, $resourceModel, $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, - $connection = null, + ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null, ?AbstractDb $resource = null ) { parent::__construct( @@ -113,7 +113,7 @@ public function setTotalCount($totalCount) } /** - * @param ExtensibleDataInterface[] $items + * @param ExtensibleDataInterface[]|null $items * * @return $this * diff --git a/Model/ResourceModel/Run/Grid/Collection.php b/Model/ResourceModel/Run/Grid/Collection.php index 26129bec2..ae6b55e62 100644 --- a/Model/ResourceModel/Run/Grid/Collection.php +++ b/Model/ResourceModel/Run/Grid/Collection.php @@ -21,7 +21,7 @@ class Collection extends RunCollection implements SearchResultInterface * @param mixed $eventObject * @param mixed $resourceModel * @param string $model - * @param null $connection + * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource * * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -36,7 +36,7 @@ public function __construct( $eventObject, $resourceModel, $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, - $connection = null, + ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null, ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null ) { parent::__construct( @@ -76,7 +76,7 @@ public function getSearchCriteria() } /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria + * @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria * * @return $this * @@ -106,7 +106,7 @@ public function setTotalCount($totalCount) } /** - * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items + * @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items * * @return $this *