Merge pull request #6771 from magento-engcom/php8-develop-merge

[EngCom] PHP 8 Compatibility

Author: sivaschenko

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 /** @var $block \Magento\Backend\Block\Media\Uploader */
 ?>
 

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -4,7 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Backend\Block\GlobalSearch */
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
+
+use Magento\Backend\Block\GlobalSearch;
+use Magento\Framework\Json\Helper\Data;
+
+/** @var $block GlobalSearch */
+/** @var Data $helper */
+$helper = $this->helper(Data::class);
+
 ?>
 <div class="search-global" data-mage-init='{"globalSearch": {}}'>
     <form action="#" id="form-search">
@@ -15,9 +23,7 @@
                     class="search-global-input"
                     id="search-global"
                     name="query"
-                    <?php //phpcs:disable ?>
-                    data-mage-init='<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getWidgetInitOptions()) ?>'>
-                    <?php //phpcs:enable ?>
+                    data-mage-init='<?= /* @noEscape */ $helper->jsonEncode($block->getWidgetInitOptions()) ?>'>
             <button
                 type="submit"
                 class="search-global-action"

app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>

app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml

@@ -3,10 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php
-    $_product = $block->getProduct();
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
+$_product = $block->getProduct();
 ?>
 <?php if ($_product->isSaleable() && $block->hasOptions()) : ?>
 <div id="bundleSummary"

app/code/Magento/Captcha/composer.json

@@ -12,9 +12,9 @@
         "magento/module-customer": "*",
         "magento/module-store": "*",
         "magento/module-authorization": "*",
-        "laminas/laminas-captcha": "^2.7.1",
+        "laminas/laminas-captcha": "^2.10",
         "laminas/laminas-db": "^2.8.2",
-        "laminas/laminas-session": "^2.7.3"
+        "laminas/laminas-session": "^2.10"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
 
 $stores = $block->getStoresSortedBySortOrder();

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml

@@ -5,6 +5,7 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 
 /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml

@@ -5,6 +5,7 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date */ ?>
 <script id="custom-option-date-type-template" type="text/x-magento-template">