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

[Amigos] Community Contributions - 2.4-develop

Author: ishakhsuvarov

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

@@ -132,9 +132,9 @@ private function convertElementsToSelect($elements, $attributesToConvert)
             $elements[$code]['dataType'] = 'select';
             $elements[$code]['formElement'] = 'select';
 
-            foreach ($options as $key => $value) {
+            foreach ($options as $value) {
                 $elements[$code]['options'][] = [
-                    'value' => $key,
+                    'value' => $value,
                     'label' => $value,
                 ];
             }

app/code/Magento/Checkout/Controller/Cart/EstimatePost.php

@@ -6,9 +6,10 @@
 namespace Magento\Checkout\Controller\Cart;
 
 use Magento\Framework;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Checkout\Model\Cart as CustomerCart;
 
-class EstimatePost extends \Magento\Checkout\Controller\Cart
+class EstimatePost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
@@ -63,9 +64,7 @@ public function execute()
             ->setCity($city)
             ->setPostcode($postcode)
             ->setRegionId($regionId)
-            ->setRegion($region)
-            ->setCollectShippingRates(true);
-        $this->quoteRepository->save($this->cart->getQuote());
+            ->setRegion($region);
         $this->cart->save();
         return $this->_goBack();
     }

app/code/Magento/NewRelicReporting/etc/csp_whitelist.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+        <policies>
+            <policy id="script-src">
+                <values>
+                    <value id="newrelic-agent" type="host">*.newrelic.com</value>
+                    <value id="newrelic-agent-data" type="host">*.nr-data.net</value>
+                </values>
+            </policy>
+            <policy id="connect-src">
+                <values>
+                    <value id="newrelic-agent" type="host">*.newrelic.com</value>
+                    <value id="newrelic-agent-data" type="host">*.nr-data.net</value>
+                </values>
+            </policy>
+        </policies>
+</csp_whitelist>

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php

@@ -20,21 +20,21 @@
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
 {
     /**
-     * Customer form factory
+     * Customer Metadata form factory
      *
      * @var \Magento\Customer\Model\Metadata\FormFactory
      */
     protected $_customerFormFactory;
 
     /**
-     * Json encoder
+     * Framework Json encoder
      *
      * @var \Magento\Framework\Json\EncoderInterface
      */
     protected $_jsonEncoder;
 
     /**
-     * Directory helper
+     * Directory helper Data
      *
      * @var \Magento\Directory\Helper\Data
      */
@@ -48,28 +48,28 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
     protected $options;
 
     /**
-     * Address service
+     * Address service - AddressRepositoryInterface
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
      */
     protected $addressService;
 
     /**
-     * Address helper
+     * Customer Address helper
      *
      * @var \Magento\Customer\Helper\Address
      */
     protected $_addressHelper;
 
     /**
-     * Search criteria builder
+     * Search criteria builder for getList calls
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
     protected $searchCriteriaBuilder;
 
     /**
-     * Filter builder
+     * Filter builder for getList calls
      *
      * @var \Magento\Framework\Api\FilterBuilder
      */
@@ -235,9 +235,13 @@ protected function _prepareForm()
         if ($prefixElement) {
             $prefixOptions = $this->options->getNamePrefixOptions($this->getStore());
             if (!empty($prefixOptions)) {
+                $mappedPrefixOptions = [];
+                foreach ($prefixOptions as $prefix) {
+                    $mappedPrefixOptions[$prefix] = $prefix;
+                }
                 $fieldset->removeField($prefixElement->getId());
                 $prefixField = $fieldset->addField($prefixElement->getId(), 'select', $prefixElement->getData(), '^');
-                $prefixField->setValues($prefixOptions);
+                $prefixField->setValues($mappedPrefixOptions);
                 if ($this->getAddressId()) {
                     $prefixField->addElementValues($this->getAddress()->getPrefix());
                 }
@@ -322,6 +326,7 @@ private function processCountryOptions(\Magento\Framework\Data\Form\Element\Abst
      * Retrieve Directory Countries collection
      *
      * @deprecated 100.1.3
+     * @see MAGETWO-711174: Introduce deprecated and since doc blocks.
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
      */
     private function getCountriesCollection()
@@ -338,6 +343,7 @@ private function getCountriesCollection()
      * Retrieve Backend Quote Session
      *
      * @deprecated 100.1.3
+     * @see MAGETWO-711174: Introduce deprecated and since doc blocks.
      * @return Quote
      */
     private function getBackendQuoteSession()

app/code/Magento/User/Model/ResourceModel/User.php

@@ -123,6 +123,9 @@ public function recordLogin(ModelUser $user)
             'logdate' => (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
             'lognum' => $user->getLognum() + 1,
         ];
+        
+        $user->setLogdate($data['logdate']);
+        $user->setLognum($data['lognum']);
 
         $condition = ['user_id = ?' => (int)$user->getUserId()];
 

dev/tests/integration/testsuite/Magento/Framework/Url/Helper/DataTest.php

@@ -21,12 +21,12 @@ protected function setUp(): void
 
     public function testGetCurrentBase64Url()
     {
-        $this->assertEquals('aHR0cDovL2xvY2FsaG9zdDo4MS8,', $this->_helper->getCurrentBase64Url());
+        $this->assertEquals('aHR0cDovL2xvY2FsaG9zdDo4MS8~', $this->_helper->getCurrentBase64Url());
     }
 
     public function testGetEncodedUrl()
     {
-        $this->assertEquals('aHR0cDovL2xvY2FsaG9zdDo4MS8,', $this->_helper->getEncodedUrl());
-        $this->assertEquals('aHR0cDovL2V4YW1wbGUuY29tLw,,', $this->_helper->getEncodedUrl('http://example.com/'));
+        $this->assertEquals('aHR0cDovL2xvY2FsaG9zdDo4MS8~', $this->_helper->getEncodedUrl());
+        $this->assertEquals('aHR0cDovL2V4YW1wbGUuY29tLw~~', $this->_helper->getEncodedUrl('http://example.com/'));
     }
 }

dev/tests/integration/testsuite/Magento/Shipping/Helper/DataTest.php

@@ -145,7 +145,7 @@ public function getTrackingPopupUrlBySalesModelDataProvider()
                 'setId',
                 42,
                 'abc',
-                'http://localhost/index.php/shipping/tracking/popup?hash=c2hpcF9pZDo0MjphYmM%2C'
+                'http://localhost/index.php/shipping/tracking/popup?hash=c2hpcF9pZDo0MjphYmM%7E'
             ],
             [\Magento\Sales\Model\Order\Shipment\Track::class,
                 'setEntityId',

lib/internal/Magento/Framework/Url/Encoder.php

@@ -8,13 +8,13 @@
 class Encoder implements EncoderInterface
 {
     /**
-     * base64_encode() for URLs encoding
+     * Method base64_encode() for URLs encoding
      *
      * @param    string $url
      * @return   string
      */
     public function encode($url)
     {
-        return strtr(base64_encode($url), '+/=', '-_,');
+        return strtr(base64_encode($url), '+/=', '-_~');
     }
 }

lib/internal/Magento/Framework/Url/Test/Unit/EncoderTest.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Url\Test\Unit;
+
+use Magento\Framework\Url\Encoder;
+use PHPUnit\Framework\TestCase;
+
+class EncoderTest extends TestCase
+{
+    /**
+     * @var Encoder|null
+     */
+    private ?Encoder $encoder = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->encoder = new Encoder();
+    }
+
+    public function testEncode(): void
+    {
+        $url = 'http://magento2.adobe/encoding';
+
+        self::assertEquals('aHR0cDovL21hZ2VudG8yLmFkb2JlL2VuY29kaW5n', $this->encoder->encode($url));
+    }
+
+    /**
+     * Equals should be replaced by a non-reserved character.
+     */
+    public function testEncodeWithEndingSlash(): void
+    {
+        $url = 'http://magento2.adobe/encoding/with/longer/url/';
+
+        self::assertEquals(
+            'aHR0cDovL21hZ2VudG8yLmFkb2JlL2VuY29kaW5nL3dpdGgvbG9uZ2VyL3VybC8~',
+            $this->encoder->encode($url)
+        );
+    }
+
+    /**
+     * @dataProvider rfc3986Urls
+     *
+     * @see          https://www.rfc-editor.org/rfc/rfc3986.html#section-2.2
+     */
+    public function testEncodeNotContainingRfc3986ReservedCharacters(string $url): void
+    {
+        $genDelims = [':', '/', '?', '#', '[', ']', '@'];
+        $subDelims = ['!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '='];
+
+        $encodedUrl = $this->encoder->encode($url);
+
+        array_map(static function (string $value) use ($encodedUrl): void {
+            self::assertStringNotContainsString($value, $encodedUrl);
+        }, $genDelims);
+
+        array_map(static function (string $value) use ($encodedUrl): void {
+            self::assertStringNotContainsString($value, $encodedUrl);
+        }, $subDelims);
+    }
+
+    public function rfc3986Urls(): array
+    {
+        return [
+            ['http://magento2.adobe/encoding/with/longer/url/'],
+            ['http://magento2.adobe/some/other/random/url?currency=eur&price=2'],
+            ['http://magento2.adobe/yet/not/done/url#anchor']
+        ];
+    }
+}