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

- Fix static tests

Author: VeronikaYarats

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php

@@ -9,6 +9,9 @@
 use Magento\Framework\Phrase;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\LocationDirectory;
 
+/**
+ * Row parser.
+ */
 class RowParser
 {
     /**
@@ -26,6 +29,8 @@ public function __construct(LocationDirectory $locationDirectory)
     }
 
     /**
+     * Retrieve columns.
+     *
      * @return array
      */
     public function getColumns()
@@ -42,6 +47,8 @@ public function getColumns()
     }
 
     /**
+     * Parse provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param int $websiteId
@@ -93,6 +100,8 @@ public function parse(
     }
 
     /**
+     * Get country id from provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param ColumnResolver $columnResolver
@@ -121,6 +130,8 @@ private function getCountryId(array $rowData, $rowNumber, ColumnResolver $column
     }
 
     /**
+     * Retrieve region id from provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param ColumnResolver $columnResolver
@@ -150,6 +161,8 @@ private function getRegionIds(array $rowData, $rowNumber, ColumnResolver $column
     }
 
     /**
+     * Retrieve zip code from provided row data.
+     *
      * @param array $rowData
      * @param ColumnResolver $columnResolver
      * @return float|int|null|string
@@ -165,6 +178,8 @@ private function getZipCode(array $rowData, ColumnResolver $columnResolver)
     }
 
     /**
+     * Get condition value form provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param string $conditionFullName
@@ -192,6 +207,8 @@ private function getConditionValue(array $rowData, $rowNumber, $conditionFullNam
     }
 
     /**
+     * Retrieve price from provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param ColumnResolver $columnResolver
@@ -217,6 +234,7 @@ private function getPrice(array $rowData, $rowNumber, ColumnResolver $columnReso
 
     /**
      * Parse and validate positive decimal value
+     *
      * Return false if value is not decimal or is not positive
      *
      * @param string $value

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php

@@ -17,6 +17,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
+ * Import offline shipping.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Import
@@ -87,6 +88,8 @@ public function __construct(
     }
 
     /**
+     * Check if there are errors.
+     *
      * @return bool
      */
     public function hasErrors()
@@ -95,6 +98,8 @@ public function hasErrors()
     }
 
     /**
+     * Get errors.
+     *
      * @return array
      */
     public function getErrors()
@@ -103,6 +108,8 @@ public function getErrors()
     }
 
     /**
+     * Retrieve columns.
+     *
      * @return array
      */
     public function getColumns()
@@ -111,6 +118,8 @@ public function getColumns()
     }
 
     /**
+     * Get data from file.
+     *
      * @param ReadInterface $file
      * @param int $websiteId
      * @param string $conditionShortName
@@ -177,6 +186,8 @@ public function getData(ReadInterface $file, $websiteId, $conditionShortName, $c
     }
 
     /**
+     * Retrieve column headers.
+     *
      * @param ReadInterface $file
      * @return array|bool
      * @throws LocalizedException

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php

@@ -6,6 +6,9 @@
 
 namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
 
+/**
+ * Location directory.
+ */
 class LocationDirectory
 {
     /**
@@ -52,6 +55,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve country id.
+     *
      * @param string $countryCode
      * @return null|string
      */
@@ -93,6 +98,8 @@ protected function loadCountries()
     }
 
     /**
+     * Check if there is country id with provided country code.
+     *
      * @param string $countryCode
      * @return bool
      */
@@ -103,6 +110,8 @@ public function hasCountryId($countryCode)
     }
 
     /**
+     * Check if there is region id with provided region code and country id.
+     *
      * @param string $countryId
      * @param string $regionCode
      * @return bool
@@ -141,6 +150,8 @@ protected function loadRegions()
     }
 
     /**
+     * Retrieve region id.
+     *
      * @param int $countryId
      * @param string $regionCode
      * @return string
@@ -155,8 +166,8 @@ public function getRegionId($countryId, $regionCode)
     /**
      * Return region ids for country and region
      *
-     * @param $countryId
-     * @param $regionCode
+     * @param int $countryId
+     * @param string $regionCode
      * @return array
      */
     public function getRegionIds($countryId, $regionCode)