Skip to content

Fix PHP 8.4 deprecated warning by making $resource parameter explicitly nullable #1871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mohaelmrabet wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −20
Open

Fix PHP 8.4 deprecated warning by making $resource parameter explicitly nullable #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb06df4
Fix deprecated warning on PHP 8.4 by making parameter explicitly nul…
Nov 26, 2025
7d9fc9e
Merge branch 'main' into fix/php84-nullable-resource-parameter
mohaelmrabet Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Model/ResourceModel/Job/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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(
Expand Down Expand Up @@ -91,7 +91,7 @@ public function getSearchCriteria()
}

/**
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria
*
* @return $this
*
Expand Down Expand Up @@ -121,7 +121,7 @@ public function setTotalCount($totalCount)
}

/**
* @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
* @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items
*
* @return $this
*
Expand Down
10 changes: 5 additions & 5 deletions Model/ResourceModel/LandingPage/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand All @@ -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(
Expand Down Expand Up @@ -76,7 +76,7 @@ public function getSearchCriteria()
}

/**
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria
*
* @return $this
*
Expand Down Expand Up @@ -106,7 +106,7 @@ public function setTotalCount($totalCount)
}

/**
* @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
* @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items
*
* @return $this
*
Expand Down
8 changes: 4 additions & 4 deletions Model/ResourceModel/Query/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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(
Expand Down Expand Up @@ -76,7 +76,7 @@ public function getSearchCriteria()
}

/**
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria
*
* @return $this
*
Expand Down Expand Up @@ -106,7 +106,7 @@ public function setTotalCount($totalCount)
}

/**
* @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
* @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items
*
* @return $this
*
Expand Down
6 changes: 3 additions & 3 deletions Model/ResourceModel/QueueArchive/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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(
Expand Down Expand Up @@ -113,7 +113,7 @@ public function setTotalCount($totalCount)
}

/**
* @param ExtensibleDataInterface[] $items
* @param ExtensibleDataInterface[]|null $items
*
* @return $this
*
Expand Down
8 changes: 4 additions & 4 deletions Model/ResourceModel/Run/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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(
Expand Down Expand Up @@ -76,7 +76,7 @@ public function getSearchCriteria()
}

/**
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria
*
* @return $this
*
Expand Down Expand Up @@ -106,7 +106,7 @@ public function setTotalCount($totalCount)
}

/**
* @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
* @param \Magento\Framework\Api\ExtensibleDataInterface[]|null $items
*
* @return $this
*
Expand Down