Changed return value from null to empty string in UriParser::setQueryUri method, if query params were not pass. It needs, so that Paginator::setQueryUri str_replace get empty string instead of null and does not crash.
Added additional step for identification current page before processing pagination query in the QueryBuilder::basePaginate method. It needs, because the QueryBuilder::basePaginate is private and is called only once and only in this class. The method calls without $page parameter passing, so that the $page will always be 1 and the Paginator::items will have incorrect items.
UriParser::setQueryUrimethod, if query params were not pass. It needs, so thatPaginator::setQueryUristr_replace get empty string instead ofnulland does not crash.QueryBuilder::basePaginatemethod. It needs, because theQueryBuilder::basePaginateis private and is called only once and only in this class. The method calls without$pageparameter passing, so that the$pagewill always be1and thePaginator::itemswill have incorrect items.