Merge pull request #7466 from magento-atwix-pyrrans/AC-2426-fix-default-gateway-url

[Pyrrans] Delivery bunch from 02/23/2022 (AC-2426, AC-2428)

Author: xmav

app/code/Magento/Usps/Model/Carrier.php

@@ -99,7 +99,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      *
      * @var string
      */
-    protected $_defaultGatewayUrl = 'http://production.shippingapis.com/ShippingAPI.dll';
+    protected $_defaultGatewayUrl = 'https://production.shippingapis.com/ShippingAPI.dll';
 
     /**
      * Container types that could be customized for USPS carrier

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Profiler/OutputBambooTestFilter.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /**
  * Stream filter that collect the data that is going through the stream
@@ -11,23 +12,28 @@
  */
 namespace Magento\Test\Profiler;
 
+use PHPUnit\Framework\Assert;
+
 class OutputBambooTestFilter extends \php_user_filter
 {
+    /**
+     * @var string
+     */
     private static $_collectedData = '';
 
     /**
-     * Collect intercepted data
+     * Collect intercepted data.
      *
      * @param resource $in
      * @param resource $out
      * @param int $consumed
      * @param bool $closing
-     * @return int
      *
+     * @return int
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ShortVariable)
      */
-    public function filter($in, $out, &$consumed, $closing)
+    public function filter($in, $out, &$consumed, $closing): int
     {
         while ($bucket = stream_bucket_make_writeable($in)) {
             self::$_collectedData .= $bucket->data;
@@ -37,19 +43,26 @@ public function filter($in, $out, &$consumed, $closing)
         return PSFS_PASS_ON;
     }
 
-    public static function resetCollectedData()
+    /**
+     * This method to reset collection data.
+     *
+     * @return void
+     */
+    public static function resetCollectedData(): void
     {
         self::$_collectedData = '';
     }
 
     /**
-     * Assert that collected data matches expected format
+     * Assert that collected data matches expected format.
      *
      * @param string $expectedData
+     *
+     * @return void
      */
-    public static function assertCollectedData($expectedData)
+    public static function assertCollectedData(string $expectedData): void
     {
-        \PHPUnit\Framework\Assert::assertStringMatchesFormat(
+        Assert::assertStringMatchesFormat(
             $expectedData,
             self::$_collectedData,
             'Expected data went through the stream.'