Merge remote-tracking branch 'origin/MAGETWO-53783' into MPI-PR-3005

Author: dkvashninbay

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

@@ -128,12 +128,13 @@ public function getData(ReadInterface $file, $websiteId, $conditionShortName, $c
         $items = [];
         while (false !== ($csvLine = $file->readCsv())) {
             try {
+                $rowNumber++;
                 if (empty($csvLine)) {
                     continue;
                 }
                 $rowData = $this->rowParser->parse(
                     $csvLine,
-                    ++$rowNumber,
+                    $rowNumber,
                     $websiteId,
                     $conditionShortName,
                     $conditionFullName,
@@ -151,7 +152,7 @@ public function getData(ReadInterface $file, $websiteId, $conditionShortName, $c
                         )
                     );
                 }
-                $this->uniqueHash[$hash] = $csvLine;
+                $this->uniqueHash[$hash] = $rowNumber;
 
                 $items[] = $rowData;
                 if (count($items) === $bunchSize) {

app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php

@@ -188,7 +188,7 @@ public function testGetDataWithDuplicatedLine()
         }
         $this->assertEquals($expectedResult, $result);
         $this->assertTrue($this->import->hasErrors());
-        $this->assertEquals(['Duplicate Row #%1 (duplicates row #%2)'], $this->import->getErrors());
+        $this->assertEquals(['Duplicate Row #3 (duplicates row #2)'], $this->import->getErrors());
     }
 
     /**