From 9418fa4d64f36cfb40f5e880c644db9764c80955 Mon Sep 17 00:00:00 2001 From: David Supplee Date: Thu, 13 Sep 2018 16:19:39 -0400 Subject: [PATCH] Revert back to old method name (#1292) --- Core/src/Iterator/PageIteratorTrait.php | 10 +++++----- Datastore/src/EntityPageIterator.php | 2 +- Storage/src/ObjectPageIterator.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Core/src/Iterator/PageIteratorTrait.php b/Core/src/Iterator/PageIteratorTrait.php index 9fb2c2b23364..dd0de60356ef 100644 --- a/Core/src/Iterator/PageIteratorTrait.php +++ b/Core/src/Iterator/PageIteratorTrait.php @@ -138,7 +138,7 @@ public function __construct( */ public function nextResultToken() { - return $this->getNestedResource($this->resultTokenPath, $this->callOptions); + return $this->get($this->resultTokenPath, $this->callOptions); } /** @@ -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 ?: []; @@ -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; @@ -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; } @@ -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; diff --git a/Datastore/src/EntityPageIterator.php b/Datastore/src/EntityPageIterator.php index 27d5e9358e02..ea590ed3b574 100644 --- a/Datastore/src/EntityPageIterator.php +++ b/Datastore/src/EntityPageIterator.php @@ -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); } } diff --git a/Storage/src/ObjectPageIterator.php b/Storage/src/ObjectPageIterator.php index 5ac61e90e83b..ecf1b3685f72 100644 --- a/Storage/src/ObjectPageIterator.php +++ b/Storage/src/ObjectPageIterator.php @@ -58,7 +58,7 @@ public function current() $this->updatePrefixes(); } - return $this->getNestedResource($this->itemsPath, $this->page); + return $this->get($this->itemsPath, $this->page); } /**