AC-1685: Fix Integration Tests to be compatible with PHP 8.1

Author: xmav

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

@@ -377,7 +377,7 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             $query = $this->getSelect();
             $rows = $this->_fetchAll($query);
         } catch (\Exception $e) {
-            $this->printLogQuery(false, true, $query ?? 'n/a');
+            $this->printLogQuery(false, true, $query);
             throw $e;
         }
 

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

@@ -324,7 +324,8 @@ public function getEntityHasMessage()
      */
     public function getEscaped($value, $defaultValue = '')
     {
-        return $this->escapeHtml(trim($value) != '' ? $value : $defaultValue);
+        $value = ($value !== null && trim($value) != '') ? $value : $defaultValue;
+        return $this->escapeHtml($value);
     }
 
     /**

app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml

@@ -64,7 +64,7 @@ switch ($block->getCheckoutType()):
                                            name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][from]"
                                            id="gift-message-whole-from"
                                            title="<?= $block->escapeHtmlAttr(__('From')) ?>"
-                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender() ?? '', $block->getDefaultFrom()) ?>"
+                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>"
                                            class="input-text">
                                 </div>
                             </div>
@@ -76,7 +76,7 @@ switch ($block->getCheckoutType()):
                                     <input type="text"
                                            name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][to]"
                                            id="gift-message-whole-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>"
-                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient() ?? '', $block->getDefaultTo()) ?>"
+                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>"
                                            class="input-text">
                                 </div>
                             </div>
@@ -165,7 +165,7 @@ script;
                                                     value=
                                                     "<?= /* @noEscape */
                                                      $block->getEscaped(
-                                                         $block->getMessage($_item)->getSender() ?? '',
+                                                         $block->getMessage($_item)->getSender(),
                                                          $block->getDefaultFrom()
                                                      ) ?>" class="input-text">
                                          </div>
@@ -179,7 +179,7 @@ script;
                                                    name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][to]"
                                                    id="gift-message-<?= (int) $_item->getId() ?>-to"
                                                    title="<?= $block->escapeHtmlAttr(__('To')) ?>"
-                                                   value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient() ?? '', $block->getDefaultTo()) ?>"
+                                                   value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>"
                                                    class="input-text">
                                         </div>
                                      </div>
@@ -291,7 +291,7 @@ script;
                                         ->getId() ?>][from]"
                                            id="gift-message-<?= (int) $block->getEntity()->getId() ?>-from"
                                            title="<?= $block->escapeHtmlAttr(__('From')) ?>"
-                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender() ?? '', $block->getDefaultFrom()) ?>"
+                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>"
                                            class="input-text">
                                 </div>
                             </div>
@@ -304,7 +304,7 @@ script;
                                         ->getId() ?>][to]"
                                            id="gift-message-<?= (int) $block->getEntity()->getId() ?>-to"
                                            title="<?= $block->escapeHtmlAttr(__('To')) ?>"
-                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient() ?? '', $block->getDefaultTo()) ?>"
+                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>"
                                            class="input-text">
                                 </div>
                             </div>
@@ -391,7 +391,7 @@ script;
                                                        name="giftmessage[quote_address_item][<?= (int) $_item->getId()
                                                         ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from"
                                                        title="<?= $block->escapeHtmlAttr(__('From')) ?>"
-                                                       value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender() ?? '', $block->getDefaultFrom()) ?>"
+                                                       value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>"
                                                        class="input-text">
                                             </div>
                                         </div>
@@ -404,7 +404,7 @@ script;
                                                        name="giftmessage[quote_address_item][<?= (int) $_item->getId()
                                                         ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to"
                                                        title="<?= $block->escapeHtmlAttr(__('To')) ?>"
-                                                       value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient() ?? '', $block->getDefaultTo()) ?>"
+                                                       value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>"
                                                        class="input-text">
                                             </div>
                                         </div>