Skip to content

Commit 0bc38f1

Browse files
committed
AC-1685: Fix Integration Tests to be compatible with PHP 8.1
- fix static tests
1 parent 0d0765c commit 0bc38f1

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,13 +368,12 @@ public function _loadEntities($printQuery = false, $logQuery = false)
368368
$this->getEntity();
369369

370370
$this->printLogQuery($printQuery, $logQuery);
371-
371+
/**
372+
* Prepare select query
373+
* @var string $query
374+
*/
375+
$query = $this->getSelect();
372376
try {
373-
/**
374-
* Prepare select query
375-
* @var string $query
376-
*/
377-
$query = $this->getSelect();
378377
$rows = $this->_fetchAll($query);
379378
} catch (\Exception $e) {
380379
$this->printLogQuery(false, true, $query);

app/code/Magento/GiftMessage/Block/Message/Inline.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class Inline extends \Magento\Framework\View\Element\Template
3636
protected $_template = 'Magento_GiftMessage::inline.phtml';
3737

3838
/**
39-
* Gift message message
40-
*
4139
* @var \Magento\GiftMessage\Helper\Message|null
4240
*/
4341
protected $_giftMessageMessage = null;

0 commit comments

Comments
 (0)