AC-13253: Investigate alternative for laminas/laminas-mail as it is abandoned

Author: cod43156

app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Bundle\Pricing\Adjustment;
@@ -173,12 +173,9 @@ private function addMiniMaxPriceList(Product $bundleProduct, $selectionsCollecti
      */
     private function addMaximumMultiSelectionPriceList(Product $bundleProduct, $selectionsCollection, $useRegularPrice)
     {
-        $websiteId = null;
-        if (!$this->catalogData->isPriceGlobal()) {
-            $websiteId = (int)$this->storeManager->getStore()->getWebsiteId();
-            if ($websiteId === 0) {
-                $websiteId = $this->websiteRepository->getDefault()->getId();
-            }
+        $websiteId = (int)$this->storeManager->getStore()->getWebsiteId();
+        if ($websiteId === 0) {
+            $websiteId = $this->websiteRepository->getDefault()->getId();
         }
         $selectionsCollection->addPriceData(null, $websiteId);
 

app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/DefaultSelectionPriceListProviderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -189,7 +189,10 @@ public function testGetPriceList(): void
         $this->model->getPriceList($this->product, false, false);
     }
 
-    public function testGetPriceListForFixedPriceType(): void
+    /**
+     * @dataProvider dataProvider
+     */
+    public function testGetPriceListForFixedPriceType($websiteId): void
     {
         $optionId = 1;
 
@@ -218,13 +221,19 @@ public function testGetPriceListForFixedPriceType(): void
             ->willReturn($this->store);
         $this->store->expects($this->once())
             ->method('getWebsiteId')
-            ->willReturn(0);
-        $this->websiteRepository->expects($this->once())
-            ->method('getDefault')
-            ->willReturn($this->website);
-        $this->website->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
+            ->willReturn($websiteId);
+
+        if ($websiteId) {
+            $this->websiteRepository->expects($this->never())
+                ->method('getDefault');
+        } else {
+            $this->websiteRepository->expects($this->once())
+                ->method('getDefault')
+                ->willReturn($this->website);
+            $this->website->expects($this->once())
+                ->method('getId')
+                ->willReturn(1);
+        }
         $this->selectionCollection->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator([]));
@@ -271,4 +280,12 @@ public function testGetPriceListWithSearchMin(): void
 
         $this->model->getPriceList($this->product, true, false);
     }
+
+    public static function dataProvider()
+    {
+        return [
+            'website provided' => [1],
+            'website not provided' => [0]
+        ];
+    }
 }

app/code/Magento/Directory/Test/Unit/Model/Country/Postcode/ValidatorTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -31,17 +31,25 @@ protected function setUp(): void
             'US' => [
                 'pattern_1' => ['pattern' => '^[0-9]{5}\-[0-9]{4}$'],
                 'pattern_2' => ['pattern' => '^[0-9]{5}$']
+            ],
+            'NL' => [
+                'pattern_1' => ['pattern' => '^[1-9][0-9]{3}\s?[a-zA-Z]{2}$'],
+                'pattern_2' => ['pattern' => '^[1-9][0-9]{3}$']
             ]
         ];
         $this->postcodesConfigMock->expects($this->once())->method('getPostCodes')->willReturn($postCodes);
         $this->model = new Validator($this->postcodesConfigMock);
     }
 
-    public function testValidatePositive()
+    /**
+     * @param string $postCode
+     * @param string $countryId
+     * @return void
+     * @dataProvider getCountryPostcodes
+     */
+    public function testValidatePositive(string $postCode, string $countryId): void
     {
-        $postcode = '12345-6789';
-        $countryId = 'US';
-        $this->assertTrue($this->model->validate($postcode, $countryId));
+        $this->assertTrue($this->model->validate($postCode, $countryId));
     }
 
     public function testValidateNegative()
@@ -59,4 +67,25 @@ public function testValidateThrowExceptionIfCountryDoesNotExist()
         $countryId = 'QQ';
         $this->assertFalse($this->model->validate($postcode, $countryId));
     }
+
+    /**
+     * @return \string[][]
+     */
+    public static function getCountryPostcodes(): array
+    {
+        return [
+            [
+                'postCode' => '12345-6789',
+                'countryId' => 'US'
+            ],
+            [
+                'postCode' => '1234',
+                'countryId' => 'NL'
+            ],
+            [
+                'postCode' => '1234AB',
+                'countryId' => 'NL'
+            ]
+        ];
+    }
 }

app/code/Magento/Directory/etc/zip_codes.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Directory:etc/zip_codes.xsd">
     <zip countryCode="AD">
@@ -569,6 +569,7 @@
     <zip countryCode="NL">
         <codes>
             <code id="pattern_1" active="true" example="1234 AB/1234AB">^[1-9][0-9]{3}\s?[a-zA-Z]{2}$</code>
+            <code id="pattern_2" active="true" example="1234">^[1-9][0-9]{3}$</code>
         </codes>
     </zip>
     <zip countryCode="NO">