Skip to content

Commit

Permalink
Revert back to old method name (#1292)
Browse files Browse the repository at this point in the history
  • Loading branch information
dwsupplee authored Sep 13, 2018
1 parent efd32e2 commit 9418fa4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions Core/src/Iterator/PageIteratorTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public function __construct(
*/
public function nextResultToken()
{
return $this->getNestedResource($this->resultTokenPath, $this->callOptions);
return $this->get($this->resultTokenPath, $this->callOptions);
}

/**
Expand Down Expand Up @@ -175,7 +175,7 @@ public function current()
$this->page = $this->executeCall();
}

$page = $this->getNestedResource($this->itemsPath, $this->page);
$page = $this->get($this->itemsPath, $this->page);

if ($this->nextResultToken()) {
return $page ?: [];
Expand Down Expand Up @@ -248,7 +248,7 @@ private function executeCall()
*/
private function mapResults(array $results)
{
$items = $this->getNestedResource($this->itemsPath, $results);
$items = $this->get($this->itemsPath, $results);
$resultMapper = $this->resultMapper;
$shouldContinue = true;

Expand Down Expand Up @@ -278,7 +278,7 @@ private function mapResults(array $results)
private function determineNextResultToken(array $results, $shouldContinue = true)
{
return $shouldContinue && $this->config['setNextResultTokenCondition']($results)
? $this->getNestedResource($this->nextResultTokenPath, $results)
? $this->get($this->nextResultTokenPath, $results)
: null;
}

Expand All @@ -287,7 +287,7 @@ private function determineNextResultToken(array $results, $shouldContinue = true
* @param array $array
* @return mixed
*/
private function getNestedResource(array $path, array $array)
private function get(array $path, array $array)
{
$result = $array;

Expand Down
2 changes: 1 addition & 1 deletion Datastore/src/EntityPageIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ public function current()
? $this->page['batch']['moreResults']
: null;

return $this->getNestedResource($this->itemsPath, $this->page);
return $this->get($this->itemsPath, $this->page);
}
}
2 changes: 1 addition & 1 deletion Storage/src/ObjectPageIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function current()
$this->updatePrefixes();
}

return $this->getNestedResource($this->itemsPath, $this->page);
return $this->get($this->itemsPath, $this->page);
}

/**
Expand Down

0 comments on commit 9418fa4

Please sign in to comment.