MAGETWO-91105: Table Rates not working for Armed Forces states in Europe (AE)

svitja · svitja · commit c2df0adcef4c · 2018-10-02T11:32:30.000+03:00
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
@@ -154,12 +154,12 @@ protected function loadRegions()
     /**
      * Retrieve region id.
      *
-     * @param string $countryId
+     * @param int $countryId
      * @param string $regionCode
      * @return string
      * @deprecated
      */
-    public function getRegionId(string $countryId, string $regionCode): string
+    public function getRegionId($countryId, $regionCode)
     {
         $this->loadRegions();
 

Original file line number	Diff line number	Diff line change
`@@ -154,12 +154,12 @@ protected function loadRegions()`
`154`	`154`	`/**`
`155`	`155`	`* Retrieve region id.`
`156`	`156`	`*`
`157`		`- * @param string $countryId`
	`157`	`+ * @param int $countryId`
`158`	`158`	`* @param string $regionCode`
`159`	`159`	`* @return string`
`160`	`160`	`* @deprecated`
`161`	`161`	`*/`
`162`		`- public function getRegionId(string $countryId, string $regionCode): string`
	`162`	`+ public function getRegionId($countryId, $regionCode)`
`163`	`163`	`{`
`164`	`164`	`$this->loadRegions();`
`165`	`165`