MAGETWO-51296: [Github] Multiple calls to getCountryInfo result in a fatal error #3858

- To provide correct error message.

Author: Hayder Sharhan

app/code/Magento/Directory/Model/CountryInformationAcquirer.php

@@ -97,16 +97,16 @@ public function getCountryInfo($countryId)
         );
 
         $countriesCollection = $this->directoryHelper->getCountryCollection($store)->load();
+        $regions = $this->directoryHelper->getRegionData();
+        $country = $countriesCollection->getItemById($countryId);
 
-        if ($countriesCollection->count() == 0) {
+        if (!$country) {
             throw new NoSuchEntityException(
                 __(
                     'Requested country is not available.'
                 )
             );
         }
-        $regions = $this->directoryHelper->getRegionData();
-        $country = $countriesCollection->getItemById($countryId);
         $countryInfo = $this->setCountryInfo($country, $regions, $storeLocale);
 
         return $countryInfo;

app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php

@@ -143,7 +143,7 @@ public function loadByStore($store = null)
      * Loads Item By Id
      *
      * @param string $countryId
-     * @return \Magento\Directory\Model\ResourceModel\Country
+     * @return \Magento\Directory\Model\ResourceModel\Country|null
      */
     public function getItemById($countryId)
     {
@@ -152,7 +152,7 @@ public function getItemById($countryId)
                 return $country;
             }
         }
-        return $this->_countryFactory->create();
+        return null;
     }
 
     /**

app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php

@@ -130,7 +130,6 @@ public function testGetCountryInfo()
             false
         );
         $countryCollection->expects($this->once())->method('load')->willReturnSelf();
-        $countryCollection->expects($this->once())->method('count')->willReturn(1);
         $countryCollection->expects($this->once())->method('getItemById')->with('AE')->willReturn($testCountryInfo);
 
         $this->directoryHelper->expects($this->once())->method('getCountryCollection')->willReturn($countryCollection);
@@ -174,9 +173,9 @@ public function testGetCountryInfoNotFound()
             false
         );
         $countryCollection->expects($this->once())->method('load')->willReturnSelf();
-        $countryCollection->expects($this->once())->method('count')->willReturn(0);
 
         $this->directoryHelper->expects($this->once())->method('getCountryCollection')->willReturn($countryCollection);
+        $countryCollection->expects($this->once())->method('getItemById')->willReturn(null);
         $this->model->getCountryInfo('AE');
     }
 }