Merge remote-tracking branch 'origin/MC-31196' into 2.4-develop-pr16

Author: serhii-balko

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -1512,17 +1512,18 @@ protected function _applyStreetAndRegionWorkarounds(DataObject $address)
         }
         // attempt to fetch region_id from directory
         if ($address->getCountryId() && $address->getRegion()) {
-            $regions = $this->_countryFactory->create()->loadByCode(
-                $address->getCountryId()
-            )->getRegionCollection()->addRegionCodeOrNameFilter(
-                $address->getRegion()
-            )->setPageSize(
-                1
-            );
-            $regionItems = $regions->getItems();
-            $region = array_shift($regionItems);
-            $address->setRegionId($region->getId());
-            $address->setExportedKeys(array_merge($address->getExportedKeys(), ['region_id']));
+            $regions = $this->_countryFactory->create()
+                ->loadByCode($address->getCountryId())
+                ->getRegionCollection()
+                ->addRegionCodeOrNameFilter($address->getRegion())
+                ->setPageSize(1);
+
+            if ($regions->count()) {
+                $regionItems = $regions->getItems();
+                $region = array_shift($regionItems);
+                $address->setRegionId($region->getId());
+                $address->setExportedKeys(array_merge($address->getExportedKeys(), ['region_id']));
+            }
         }
     }
 
@@ -1624,7 +1625,7 @@ protected function _filterPeriodUnit($value)
             case 'year':
                 return 'Year';
             default:
-                break;
+                return '';
         }
     }
 
@@ -1653,7 +1654,7 @@ protected function _filterBillingAgreementStatus($value)
             case 'active':
                 return 'Active';
             default:
-                break;
+                return '';
         }
     }
 
@@ -1694,7 +1695,7 @@ protected function _filterPaymentStatusFromNvpToInfo($value)
             case 'Voided':
                 return \Magento\Paypal\Model\Info::PAYMENTSTATUS_VOIDED;
             default:
-                break;
+                return null;
         }
     }
 
@@ -1712,7 +1713,7 @@ protected function _filterPaymentReviewAction($value)
             case \Magento\Paypal\Model\Pro::PAYMENT_REVIEW_DENY:
                 return 'Deny';
             default:
-                break;
+                return null;
         }
     }
 

dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Paypal\Model\Express;
 
 use Magento\Checkout\Model\Type\Onepage;
+use Magento\Directory\Model\CountryFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Paypal\Model\Api\Nvp;
 use Magento\Paypal\Model\Api\Type\Factory;
@@ -17,8 +18,6 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Class CheckoutTest
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CheckoutTest extends \PHPUnit\Framework\TestCase
@@ -634,10 +633,6 @@ public function testGuestReturnFromPaypal()
             ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress'])
             ->getMock();
 
-        $api->expects($this->any())
-            ->method('call')
-            ->will($this->returnValue([]));
-
         $apiTypeFactory->expects($this->any())
             ->method('create')
             ->will($this->returnValue($api));
@@ -652,6 +647,14 @@ public function testGuestReturnFromPaypal()
             ->method('getExportedShippingAddress')
             ->will($this->returnValue($exportedShippingAddress));
 
+        $this->addCountryFactory($api);
+        $data = [
+            'COUNTRYCODE' => $quote->getShippingAddress()->getCountryId(),
+            'STATE' => 'unknown'
+        ];
+        $api->method('call')
+            ->willReturn($data);
+
         $paypalInfo->expects($this->once())
             ->method('importToPayment')
             ->with($api, $quote->getPayment());
@@ -710,4 +713,19 @@ private function getFixtureQuote(): Quote
 
         return $quoteCollection->getLastItem();
     }
+
+    /**
+     * Adds countryFactory to a mock.
+     *
+     * @param \PHPUnit\Framework\MockObject\MockObject $api
+     * @throws \ReflectionException
+     * @return void
+     */
+    private function addCountryFactory(\PHPUnit\Framework\MockObject\MockObject $api): void
+    {
+        $reflection = new \ReflectionClass($api);
+        $property = $reflection->getProperty('_countryFactory');
+        $property->setAccessible(true);
+        $property->setValue($api, $this->objectManager->get(CountryFactory::class));
+    }
 }