Skip to content

Fix Magefan Blog 2.15 / PHP 8.4 compatibility in fulltext collection #28

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
nige-one wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Magefan Blog 2.15 / PHP 8.4 compatibility in fulltext collection #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions Model/ResourceModel/Post/Fulltext/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public function __construct(
\Smile\ElasticsuiteCore\Search\Request\Builder $requestBuilder,
\Magento\Search\Model\SearchEngine $searchEngine,
$searchRequestName = 'blog_search_container',
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
) {

parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $date, $storeManager, $connection, $resource);
Expand Down Expand Up @@ -123,11 +123,18 @@ public function setStoreId($storeId)
/**
* Returns current store id.
*
* Falls back to the current store when no store filter was set,
* e.g. when the collection is built on the catalogsearch result page.
*
* @return int
*/
public function getStoreId()
public function getStoreId(): int
{
return $this->storeId;
if ($this->storeId === null) {
$this->storeId = (int) $this->_storeManager->getStore()->getId();
}

return (int) $this->storeId;
}

/**
Expand Down