File tree Expand file tree Collapse file tree 2 files changed +1
-3
lines changed
app/code/Magento/CatalogImportExport Expand file tree Collapse file tree 2 files changed +1
-3
lines changed Original file line number Diff line number Diff line change @@ -1008,7 +1008,7 @@ public function export()
10081008 $ this ->paginateCollection ($ page , $ this ->getItemsPerPage ());
10091009
10101010 $ exportData = $ this ->getExportData ();
1011- if (count ($ exportData ) == 0 ) {
1011+ if ($ exportData == null || count ($ exportData ) == 0 ) {
10121012 break ;
10131013 }
10141014 if ($ page == 1 ) {
Original file line number Diff line number Diff line change @@ -343,8 +343,6 @@ public function testExportCountZeroBreakInternalCalls()
343343 $ this ->product ->expects ($ this ->once ())->method ('paginateCollection ' )->with ($ page , $ itemsPerPage );
344344 $ this ->abstractCollection ->expects ($ this ->once ())->method ('setOrder ' )->with ('entity_id ' , 'asc ' );
345345
346- $ this ->abstractCollection ->expects ($ this ->once ())->method ('count ' )->willReturn (0 );
347-
348346 $ this ->abstractCollection ->expects ($ this ->never ())->method ('getCurPage ' );
349347 $ this ->abstractCollection ->expects ($ this ->never ())->method ('getLastPageNumber ' );
350348 $ this ->product ->expects ($ this ->never ())->method ('_getHeaderColumns ' );
You can’t perform that action at this time.
0 commit comments