Changed getProvider() method to no longer be deprecated, and instead return the currently set provider, or if none set, the first configured provider.

mikebronner · mikebronner · commit 2cd8813f3922 · 2020-06-21T09:01:41.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.3.4] - 2020-06-21
+### Fixed
+- non-caching declaration to only apply to current query.
+
+### Changed
+- `getProvider()` method to no longer be deprecated, and instead return the
+    currently set provider, or if none set, the first configured provider.
+
 ## [4.3.3] - 2020-06-20
 ### Added
 - functionality to not cache requests by using `doNotCache()`.
diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php
@@ -130,12 +130,14 @@ public function limit(int $limit) : self
         return $this;
     }
 
-    /**
-     * @deprecated Use `getProviders()` instead.
-     */
     public function getProvider()
     {
-        return $this->getProviders()->first();
+        $reflectedClass = new ReflectionClass(ProviderAggregator::class);
+        $reflectedProperty = $reflectedClass->getProperty('provider');
+        $reflectedProperty->setAccessible(true);
+
+        return $reflectedProperty->getValue($this->aggregator)
+            ?? $this->getProviders()->first();
     }
 
     public function getProviders() : Collection
@@ -190,6 +192,8 @@ public function using(string $name) : self
     protected function cacheRequest(string $cacheKey, array $queryElements, string $queryType)
     {
         if (! $this->isCaching) {
+            $this->isCaching = true;
+
             return collect($this->aggregator->{$queryType}(...$queryElements));
         }
 
diff --git a/tests/Feature/Providers/GeocoderServiceTest.php b/tests/Feature/Providers/GeocoderServiceTest.php
@@ -326,4 +326,13 @@ public function testCachingCanBeDisabled()
             $results->first()->getFormattedAddress()
         );
     }
+
+    public function testGetProviderReturnsCurrentProvider()
+    {
+        $provider = app("geocoder")
+            ->using("google_maps")
+            ->getProvider();
+
+        $this->assertEquals("google_maps", $provider->getName());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -130,12 +130,14 @@ public function limit(int $limit) : self`
`130`	`130`	`return $this;`
`131`	`131`	`}`
`132`	`132`
`133`		`- /**`
`134`		- * @deprecated Use `getProviders()` instead.
`135`		`- */`
`136`	`133`	`public function getProvider()`
`137`	`134`	`{`
`138`		`- return $this->getProviders()->first();`
	`135`	`+ $reflectedClass = new ReflectionClass(ProviderAggregator::class);`
	`136`	`+ $reflectedProperty = $reflectedClass->getProperty('provider');`
	`137`	`+ $reflectedProperty->setAccessible(true);`
	`138`	`+`
	`139`	`+ return $reflectedProperty->getValue($this->aggregator)`
	`140`	`+ ?? $this->getProviders()->first();`
`139`	`141`	`}`
`140`	`142`
`141`	`143`	`public function getProviders() : Collection`
`@@ -190,6 +192,8 @@ public function using(string $name) : self`
`190`	`192`	`protected function cacheRequest(string $cacheKey, array $queryElements, string $queryType)`
`191`	`193`	`{`
`192`	`194`	`if (! $this->isCaching) {`
	`195`	`+ $this->isCaching = true;`
	`196`	`+`
`193`	`197`	`return collect($this->aggregator->{$queryType}(...$queryElements));`
`194`	`198`	`}`
`195`	`199`
Original file line number	Diff line number	Diff line change
`@@ -326,4 +326,13 @@ public function testCachingCanBeDisabled()`
`326`	`326`	`$results->first()->getFormattedAddress()`
`327`	`327`	`);`
`328`	`328`	`}`
	`329`	`+`
	`330`	`+ public function testGetProviderReturnsCurrentProvider()`
	`331`	`+ {`
	`332`	`+ $provider = app("geocoder")`
	`333`	`+ ->using("google_maps")`
	`334`	`+ ->getProvider();`
	`335`	`+`
	`336`	`+ $this->assertEquals("google_maps", $provider->getName());`
	`337`	`+ }`
`329`	`338`	`}`