Merge pull request #7842 from magento-amigos/2.4-develop-prs

andrewbess · web-flow · commit dbc97f92752d · 2022-08-31T10:39:35.000+03:00
[Amigos] Community Contributions - 2.4-develop
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -27,6 +27,7 @@
 </div>
 HTML;
     }
+    http_response_code(503);
     exit(1);
 }
 
diff --git a/app/code/Magento/Authorization/README.md b/app/code/Magento/Authorization/README.md
@@ -4,7 +4,7 @@ The Magento_Authorization module enables management of access control list roles
 
 ## Installation details
 
-The Magento_AdminNotification module creates the following tables in the database:
+The Magento_Authorization module creates the following tables in the database using `db_schema.xml`:
 
 - `authorization_role`
 - `authorization_rule`
diff --git a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
@@ -45,6 +45,7 @@ public function beforeSetForm(ProductAttributeFrontTabBlock $subject, Form $form
             [
                 'name' => 'search_weight',
                 'label' => __('Search Weight'),
+                'note' => __('10 is the highest priority/heaviest weighting.'),
                 'values' => $this->weightSource->getOptions()
             ],
             'is_searchable'
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php
@@ -111,6 +111,7 @@ public function testBeforeSetForm()
                 [
                     'name' => 'search_weight',
                     'label' => __('Search Weight'),
+                    'note' => __('10 is the highest priority/heaviest weighting.'),
                     'values' => $weightOptions
                 ],
                 'is_searchable',
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -95,6 +95,7 @@
                                                                 <item name="element" xsi:type="string">#opc-new-shipping-address</item>
                                                                 <item name="options" xsi:type="array">
                                                                     <item name="type" xsi:type="string">popup</item>
+                                                                    <item name="modalClass" xsi:type="string">new-shipping-address-modal</item>
                                                                     <item name="responsive" xsi:type="boolean">true</item>
                                                                     <item name="innerScroll" xsi:type="boolean">true</item>
                                                                     <item name="title" xsi:type="string" translate="true">Shipping Address</item>
diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\NewRelicReporting\Model;
 
-use Exception;
+use Throwable;
 
 /**
  * Wrapper for New Relic functions
@@ -33,10 +33,10 @@ public function addCustomParameter($param, $value)
     /**
      * Wrapper for 'newrelic_notice_error' function
      *
-     * @param  Exception $exception
+     * @param Throwable $exception
      * @return void
      */
-    public function reportError(Exception $exception)
+    public function reportError(Throwable $exception)
     {
         if ($this->isExtensionInstalled()) {
             newrelic_notice_error($exception->getMessage(), $exception);
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
@@ -273,7 +273,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
      */
     private function prepareCarrier(string $carrierCode, RateRequest $request): AbstractCarrier
     {
-        $carrier = $this->isShippingCarrierAvailable($carrierCode)
+        $carrier = $this->isShippingCarrierAvailable($carrierCode, $request->getStoreId())
             ? $this->_carrierFactory->create($carrierCode, $request->getStoreId())
             : null;
         if (!$carrier) {
@@ -541,13 +541,15 @@ public function setCarrierAvailabilityConfigField($code = 'active')
      * Checks availability of carrier.
      *
      * @param string $carrierCode
+     * @param null|int $storeId
      * @return bool
      */
-    private function isShippingCarrierAvailable(string $carrierCode): bool
+    private function isShippingCarrierAvailable(string $carrierCode, ?int $storeId = null): bool
     {
         return $this->_scopeConfig->isSetFlag(
             'carriers/' . $carrierCode . '/' . $this->_availabilityConfigField,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
         );
     }
 }
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Theme\Block\Html;
 
+use Magento\Framework\Escaper;
+
 /**
  * Html page header block
  *
@@ -14,6 +16,27 @@
  */
 class Header extends \Magento\Framework\View\Element\Template
 {
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param Magento\Framework\Escaper $escaper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Escaper $escaper,
+        array $data = []
+    ) {
+        $this->escaper = $escaper;
+        parent::__construct($context, $data);
+    }
+
     /**
      * Current template name
      *
@@ -34,6 +57,7 @@ public function getWelcome()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
+        $this->_data['welcome'] =  $this->escaper->escapeQuote($this->_data['welcome'], true);
         return __($this->_data['welcome']);
     }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/HeaderTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/HeaderTest.php
@@ -14,6 +14,7 @@
 use Magento\Theme\Block\Html\Header;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Escaper;
 
 class HeaderTest extends TestCase
 {
@@ -27,6 +28,11 @@ class HeaderTest extends TestCase
      */
     protected $scopeConfig;
 
+    /**
+     * @var Escaper|MockObject
+     */
+    private $escaper;
+
     protected function setUp(): void
     {
         $context = $this->getMockBuilder(Context::class)
@@ -38,10 +44,13 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $context->expects($this->once())->method('getScopeConfig')->willReturn($this->scopeConfig);
-
+        $this->escaper = $this->createPartialMock(Escaper::class, ['escapeQuote']);
         $this->unit = (new ObjectManager($this))->getObject(
             Header::class,
-            ['context' => $context]
+            [
+               'context' => $context,
+               'escaper' => $this->escaper
+            ]
         );
     }
 
@@ -51,6 +60,11 @@ public function testGetWelcomeDefault()
             ->with('design/header/welcome', ScopeInterface::SCOPE_STORE)
             ->willReturn('Welcome Message');
 
+        $this->escaper->expects($this->once())
+            ->method('escapeQuote')
+            ->with('Welcome Message', true)
+            ->willReturn('Welcome Message');
+
         $this->assertEquals('Welcome Message', $this->unit->getWelcome());
     }
 }
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -10,32 +10,34 @@
  */
 $welcomeMessage = $block->getWelcome();
 ?>
-<?php if ($block->getShowPart() == 'welcome') : ?>
+<?php if ($block->getShowPart() == 'welcome'): ?>
     <li class="greet welcome" data-bind="scope: 'customer'">
         <!-- ko if: customer().fullname  -->
         <span class="logged-in"
-              data-bind="text: new String('<?= $escaper->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
+              data-bind="text: new String('<?= $escaper->escapeHtml(__('Welcome, %1!', '%1')) ?>').
+              replace('%1', customer().fullname)">
         </span>
         <!-- /ko -->
         <!-- ko ifnot: customer().fullname  -->
         <span class="not-logged-in"
-              data-bind="html: '<?= $escaper->escapeHtmlAttr($welcomeMessage) ?>'"></span>
+              data-bind="text: '<?= $escaper->escapeHtml($welcomeMessage) ?>'"></span>
         <?= $block->getBlockHtml('header.additional') ?>
         <!-- /ko -->
     </li>
+    <?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
     <script type="text/x-magento-init">
-    {
-        "*": {
-            "Magento_Ui/js/core/app": {
-                "components": {
-                    "customer": {
-                        "component": "Magento_Customer/js/view/customer"
+        {
+            "*": {
+                "Magento_Ui/js/core/app": {
+                    "components": {
+                        "customer": {
+                            "component": "Magento_Customer/js/view/customer"
+                        }
                     }
                 }
             }
         }
-    }
     </script>
-<?php elseif ($block->getShowPart() == 'other') :?>
+<?php elseif ($block->getShowPart() == 'other'): ?>
     <?= $block->getChildHtml() ?>
 <?php endif ?>
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -720,7 +720,6 @@ private function _otherText()
                 ],
                 JSON_HEX_QUOT
             );
-
             $spanHtml = $this->_getDataTranslateSpan(
                 '[' . $this->escaper->escapeHtmlAttr($translateProperties) . ']',
                 $matches[1][0]
diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -284,6 +284,7 @@
     </type>
     <type name="Magento\Framework\Api\FilterBuilder" shared="false" />
     <type name="Magento\Framework\Api\SearchCriteriaBuilder" shared="false" />
+    <type name="Magento\Framework\Api\SortOrderBuilder" shared="false" />
     <type name="Magento\Framework\View\Layout\Builder" shared="false" />
     <type name="Magento\Framework\View\Page\Builder" shared="false" />
     <type name="Magento\Framework\Message\Manager">
diff --git a/lib/internal/Magento/Framework/Async/Code/Generator/ProxyDeferredGenerator.php b/lib/internal/Magento/Framework/Async/Code/Generator/ProxyDeferredGenerator.php
@@ -246,7 +246,7 @@ private function getReturnTypeValue(\ReflectionMethod $method): ?string
         $returnTypeValue = null;
         $returnType = $method->getReturnType();
         if ($returnType) {
-            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
+            $returnTypeValue = ($returnType->allowsNull() && $returnType->getName() !== 'mixed' ? '?' : '');
             $returnTypeValue .= ($returnType->getName() === 'self')
                 ? $this->_getFullyQualifiedClassName($method->getDeclaringClass()->getName())
                 : $returnType->getName();
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -352,7 +352,7 @@ private function extractParameterType(
             $typeName = $parameterType;
         }
 
-        if ($parameter->allowsNull()) {
+        if ($parameter->allowsNull() && $typeName !== 'mixed') {
             $typeName = '?' . $typeName;
         }
 
diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
@@ -212,7 +212,7 @@ private function getReturnTypeValue(\ReflectionMethod $method): ?string
         $returnTypeValue = null;
         $returnType = $method->getReturnType();
         if ($returnType) {
-            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
+            $returnTypeValue = ($returnType->allowsNull() && $returnType->getName() !== 'mixed' ? '?' : '');
             $returnTypeValue .= ($returnType->getName() === 'self')
                 ? $this->_getFullyQualifiedClassName($method->getDeclaringClass()->getName())
                 : $returnType->getName();
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
@@ -1,30 +1,23 @@
 <?php
 /**
- * Proxy generator
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 namespace Magento\Framework\ObjectManager\Code\Generator;
 
-/**
- * Class Proxy
- *
- * @package Magento\Framework\ObjectManager\Code\Generator
- */
 class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
 {
     /**
      * Entity type
      */
-    const ENTITY_TYPE = 'proxy';
+    public const ENTITY_TYPE = 'proxy';
 
     /**
      * Marker interface
      */
-    const NON_INTERCEPTABLE_INTERFACE = \Magento\Framework\ObjectManager\NoninterceptableInterface::class;
+    public const NON_INTERCEPTABLE_INTERFACE = \Magento\Framework\ObjectManager\NoninterceptableInterface::class;
 
     /**
      * Returns default result class name
@@ -287,7 +280,7 @@ private function getReturnTypeValue(\ReflectionMethod $method): ?string
         $returnTypeValue = null;
         $returnType = $method->getReturnType();
         if ($returnType) {
-            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
+            $returnTypeValue = ($returnType->allowsNull() && $returnType->getName() !== 'mixed' ? '?' : '');
             $returnTypeValue .= ($returnType->getName() === 'self')
                 ? $this->_getFullyQualifiedClassName($method->getDeclaringClass()->getName())
                 : $returnType->getName();
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/ProxyTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/ProxyTest.php
@@ -15,6 +15,8 @@
 
 class ProxyTest extends TestCase
 {
+    private const MIXED_TYPE_PHP_VERSION = '8.0.0';
+
     /**
      * @var MockObject
      */
@@ -52,4 +54,36 @@ public function testGenerate()
         $model->expects($this->once())->method('_validateData')->willReturn(true);
         $this->assertEquals('sample_file.php', $model->generate());
     }
+
+    public function testGenerateMixedType()
+    {
+        if (version_compare(PHP_VERSION, self::MIXED_TYPE_PHP_VERSION) < 0) {
+            $this->markTestSkipped('This test requires at least PHP version ' . self::MIXED_TYPE_PHP_VERSION);
+        }
+
+        require_once __DIR__ . '/_files/SampleMixed.php';
+        $model = $this->getMockBuilder(Proxy::class)
+            ->setMethods(['_validateData'])
+            ->setConstructorArgs(
+                [
+                    \Magento\Framework\ObjectManager\Code\Generator\SampleMixed::class,
+                    null,
+                    $this->ioObjectMock,
+                    null,
+                    null,
+                    $this->createMock(FileResolver::class)
+                ]
+            )
+            ->getMock();
+        $sampleMixedProxyCode = file_get_contents(__DIR__ . '/_files/SampleMixedProxy.txt');
+
+        $this->ioObjectMock->expects($this->once())->method('generateResultFileName')
+            ->with('\\' . \Magento\Framework\ObjectManager\Code\Generator\SampleMixed_Proxy::class)
+            ->willReturn('sample_mixed_file.php');
+        $this->ioObjectMock->expects($this->once())->method('writeResultFile')
+            ->with('sample_mixed_file.php', $sampleMixedProxyCode);
+
+        $model->expects($this->once())->method('_validateData')->willReturn(true);
+        $this->assertEquals('sample_mixed_file.php', $model->generate());
+    }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixed.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixed.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\ObjectManager\Code\Generator;
+
+/**
+ * Class SampleMixed for Proxy and Factory generation with mixed type
+ */
+class SampleMixed
+{
+    /**
+     * @var mixed
+     */
+    protected mixed $mixed = null;
+
+    /**
+     * @param mixed $mixed
+     * @return void
+     */
+    public function setMixed(mixed $mixed = null): void
+    {
+        $this->mixed = $mixed;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMixed(): mixed
+    {
+        return $this->mixed;
+    }
+}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixedProxy.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixedProxy.txt
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php
diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`</div>`
`28`	`28`	`HTML;`
`29`	`29`	`}`
	`30`	`+ http_response_code(503);`
`30`	`31`	`exit(1);`
`31`	`32`	`}`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function beforeSetForm(ProductAttributeFrontTabBlock $subject, Form $form`
`45`	`45`	`[`
`46`	`46`	`'name' => 'search_weight',`
`47`	`47`	`'label' => __('Search Weight'),`
	`48`	`+ 'note' => __('10 is the highest priority/heaviest weighting.'),`
`48`	`49`	`'values' => $this->weightSource->getOptions()`
`49`	`50`	`],`
`50`	`51`	`'is_searchable'`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ public function testBeforeSetForm()`
`111`	`111`	`[`
`112`	`112`	`'name' => 'search_weight',`
`113`	`113`	`'label' => __('Search Weight'),`
	`114`	`+ 'note' => __('10 is the highest priority/heaviest weighting.'),`
`114`	`115`	`'values' => $weightOptions`
`115`	`116`	`],`
`116`	`117`	`'is_searchable',`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req`
`273`	`273`	`*/`
`274`	`274`	`private function prepareCarrier(string $carrierCode, RateRequest $request): AbstractCarrier`
`275`	`275`	`{`
`276`		`- $carrier = $this->isShippingCarrierAvailable($carrierCode)`
	`276`	`+ $carrier = $this->isShippingCarrierAvailable($carrierCode, $request->getStoreId())`
`277`	`277`	`? $this->_carrierFactory->create($carrierCode, $request->getStoreId())`
`278`	`278`	`: null;`
`279`	`279`	`if (!$carrier) {`
`@@ -541,13 +541,15 @@ public function setCarrierAvailabilityConfigField($code = 'active')`
`541`	`541`	`* Checks availability of carrier.`
`542`	`542`	`*`
`543`	`543`	`* @param string $carrierCode`
	`544`	`+ * @param null\|int $storeId`
`544`	`545`	`* @return bool`
`545`	`546`	`*/`
`546`		`- private function isShippingCarrierAvailable(string $carrierCode): bool`
	`547`	`+ private function isShippingCarrierAvailable(string $carrierCode, ?int $storeId = null): bool`
`547`	`548`	`{`
`548`	`549`	`return $this->_scopeConfig->isSetFlag(`
`549`	`550`	`'carriers/' . $carrierCode . '/' . $this->_availabilityConfigField,`
`550`		`- \Magento\Store\Model\ScopeInterface::SCOPE_STORE`
	`551`	`+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,`
	`552`	`+ $storeId`
`551`	`553`	`);`
`552`	`554`	`}`
`553`	`555`	`}`