Merge branch '2.4-develop' of https://github.com/magento/magento2ce into B2B-1610

Author: Roman Hanin

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/Ui/DataProvider/Product/ProductCollection.php

@@ -25,58 +25,4 @@ protected function _productLimitationJoinPrice()
         $this->_productLimitationFilters->setUsePriceIndex(false);
         return $this->_productLimitationPrice(true);
     }
-
-    /**
-     * Return approximately amount if too much entities.
-     *
-     * @return int|mixed
-     */
-    public function getSize()
-    {
-        $sql = $this->getSelectCountSql();
-        $possibleCount = $this->analyzeCount($sql);
-
-        if ($possibleCount > 20000) {
-            return $possibleCount;
-        }
-
-        return parent::getSize();
-    }
-
-    /**
-     * Analyze amount of entities in DB.
-     *
-     * @param $sql
-     * @return int|mixed
-     * @throws \Zend_Db_Statement_Exception
-     */
-    private function analyzeCount($sql)
-    {
-        $results = $this->getConnection()->query('EXPLAIN ' . $sql)->fetchAll();
-        $alias = $this->getMainTableAlias();
-
-        foreach ($results as $result) {
-            if ($result['table'] == $alias) {
-                return $result['rows'];
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Identify main table alias or its name if alias is not defined.
-     *
-     * @return string
-     * @throws \LogicException
-     */
-    private function getMainTableAlias()
-    {
-        foreach ($this->getSelect()->getPart(\Magento\Framework\DB\Select::FROM) as $tableAlias => $tableMetadata) {
-            if ($tableMetadata['joinType'] == 'from') {
-                return $tableAlias;
-            }
-        }
-        throw new \LogicException("Main table cannot be identified.");
-    }
 }

app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php

@@ -7,10 +7,10 @@
 
 namespace Magento\Catalog\ViewModel\Product\Checker;
 
-use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
  * Check is available add to compare.
@@ -39,25 +39,9 @@ public function __construct(StockConfigurationInterface $stockConfiguration)
     public function isAvailableForCompare(ProductInterface $product): bool
     {
         if ((int)$product->getStatus() !== Status::STATUS_DISABLED) {
-            return $this->isInStock($product) || $this->stockConfiguration->isShowOutOfStock();
+            return $product->isSalable() || $this->stockConfiguration->isShowOutOfStock();
         }
 
         return false;
     }
-
-    /**
-     * Get is in stock status.
-     *
-     * @param ProductInterface $product
-     * @return bool
-     */
-    private function isInStock(ProductInterface $product): bool
-    {
-        $quantityAndStockStatus = $product->getQuantityAndStockStatus();
-        if (!$quantityAndStockStatus) {
-            return $product->isSalable();
-        }
-
-        return $quantityAndStockStatus['is_in_stock'] ?? false;
-    }
 }

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 */