Skip to content

Commit

Permalink
Merge branch 'release/2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
airmoi committed Apr 1, 2020
2 parents 8821e0b + 09abc56 commit d79dd02
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Command/CompoundFind.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function execute()

ksort($this->requests);
$totalRequestCount = count($this->requests);

foreach ($this->requests as $precedence => $request) {
$findCriterias = $request->findCriteria;
$critCount = count($findCriterias);
Expand Down Expand Up @@ -227,7 +227,7 @@ public function setRangeParams(&$params)
if ($this->skip) {
$params['-skip'] = $this->skip;
}
if ($this->max) {
if ($this->max !== null) {
$params['-max'] = $this->max;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Find.php
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ protected function setRangeParams(&$params)
if ($this->skip) {
$params['-skip'] = $this->skip;
}
if ($this->max) {
if ($this->max !== null) {
$params['-max'] = $this->max;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/Parser/FMResultSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public function parse($xml)
);
}
xml_parser_free($this->xmlParser);
unset($this->xmlParser);
if (!empty($this->errorCode)) {
return $this->fm->returnOrThrowException(null, $this->errorCode);
}
Expand Down

0 comments on commit d79dd02

Please sign in to comment.