Merge branch '2.4-develop' of github.com:MeCapron/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

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']
+        ];
+    }
+}