MC-18527: Merge release branch into 2.3-develop

- fix failing tests

Author: krissyhiserote

app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml

@@ -20,6 +20,7 @@
              <group value="SearchEngineMysql"/>
          </annotations>
          <before>
+             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
              <createData entity="ApiDownloadableProduct" stepKey="product"/>
              <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
                  <requiredEntity createDataKey="product"/>
@@ -28,5 +29,8 @@
                  <requiredEntity createDataKey="product"/>
              </createData>
          </before>
+         <after>
+             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+         </after>
      </test>
  </tests>

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -794,10 +794,9 @@ public function testUpdateWithExtensionAttributes(): void
     protected function updateProduct($product)
     {
         if (isset($product['custom_attributes'])) {
-            $countOfProductCustomAttributes = sizeof($product['custom_attributes']);
-            for ($i = 0; $i < $countOfProductCustomAttributes; $i++) {
-                if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
-                    && !is_array($product['custom_attributes'][$i]['value'])
+            foreach ($product['custom_attributes'] as &$customAttribute) {
+                if ($customAttribute['attribute_code'] == 'category_ids'
+                    && !is_array($customAttribute['value'])
                 ) {
                     $customAttribute['value'] = [""];
                 }
@@ -1240,10 +1239,9 @@ protected function getSimpleProductData($productData = [])
     protected function saveProduct($product, $storeCode = null)
     {
         if (isset($product['custom_attributes'])) {
-            $countOfProductCustomAttributes = sizeof($product['custom_attributes']);
-            for ($i = 0; $i < $countOfProductCustomAttributes; $i++) {
-                if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
-                    && !is_array($product['custom_attributes'][$i]['value'])
+            foreach ($product['custom_attributes'] as &$customAttribute) {
+                if ($customAttribute['attribute_code'] == 'category_ids'
+                    && !is_array($customAttribute['value'])
                 ) {
                     $customAttribute['value'] = [""];
                 }

dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_download_limit.php

@@ -15,6 +15,11 @@
 use Magento\Downloadable\Model\Link;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->addDomains(['example.com']);
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = Bootstrap::getObjectManager()