Merge remote-tracking branch 'origin/MAGETWO-63601' into troll_bugfix_kanban

Author: rganin

lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php

@@ -46,7 +46,7 @@ class BatchRangeIterator implements BatchIteratorInterface
     /**
      * @var int
      */
-    private $currentBatch = 0;
+    private $currentOffset = 0;
 
     /**
      * @var int
@@ -107,7 +107,7 @@ public function __construct(
     public function current()
     {
         if (null === $this->currentSelect) {
-            $this->isValid = ($this->currentBatch + $this->batchSize) < $this->totalItemCount;
+            $this->isValid = ($this->currentOffset + $this->batchSize) < $this->totalItemCount;
             $this->currentSelect = $this->initSelectObject();
         }
         return $this->currentSelect;
@@ -138,7 +138,7 @@ public function next()
         if (null === $this->currentSelect) {
             $this->current();
         }
-        $this->isValid = ($this->batchSize + $this->currentBatch) < $this->totalItemCount;
+        $this->isValid = ($this->batchSize + $this->currentOffset) < $this->totalItemCount;
         $select = $this->initSelectObject();
         if ($this->isValid) {
             $this->iteration++;
@@ -201,8 +201,8 @@ private function initSelectObject()
          * Reset sort order section from origin select object
          */
         $object->order($this->correlationName . '.' . $this->rangeField . ' ' . \Magento\Framework\DB\Select::SQL_ASC);
-        $object->limit($this->currentBatch, $this->batchSize);
-        $this->currentBatch += $this->batchSize;
+        $object->limit($this->batchSize, $this->currentOffset);
+        $this->currentOffset += $this->batchSize;
 
         return $object;
     }

lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php

@@ -94,7 +94,7 @@ protected function setUp()
      */
     public function testCurrent()
     {
-        $this->selectMock->expects($this->once())->method('limit')->with($this->currentBatch, $this->batchSize);
+        $this->selectMock->expects($this->once())->method('limit')->with($this->batchSize, $this->currentBatch);
         $this->selectMock->expects($this->once())->method('order')->with('correlationName.rangeField' . ' ASC');
         $this->assertEquals($this->selectMock, $this->model->current());
         $this->assertEquals(0, $this->model->key());