From cdfa5d6cd1dcb69ae0df0d9096053d3087a3a2b0 Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Wed, 2 Dec 2020 09:41:48 -0800 Subject: [PATCH 01/15] Update composer.json --- composer.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f1f8ff0..7010230 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,19 @@ "role": "Original Creator" } ], + "repositories": [ + { + "type": "git", + "url": "git@github.com:mikebronner/chain-provider.git" + }, + { + "type": "git", + "url": "git@github.com:mikebronner/geocoder.git" + } + + ], "require": { - "geocoder-php/chain-provider": "^4.0", + "geocoder-php/chain-provider": "dev-patch-1@dev", "geocoder-php/geo-plugin-provider": "^4.0", "geocoder-php/google-maps-provider": "^4.0", "guzzlehttp/psr7": "*", @@ -32,7 +43,7 @@ "illuminate/support": "^5.0|^6.0|^7.0|^8.0", "php-http/curl-client": "*", "php": ">=7.3", - "willdurand/geocoder": "^4.0" + "willdurand/geocoder": "dev-patch-1@dev" }, "require-dev": { "doctrine/dbal": "*", From 0703c4774465a6090deed6a364881c339de7bb81 Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Wed, 2 Dec 2020 09:47:53 -0800 Subject: [PATCH 02/15] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7010230..f4ed3f5 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ ], "require": { - "geocoder-php/chain-provider": "dev-patch-1@dev", + "geocoder-php/chain-provider": "php8_support@dev", "geocoder-php/geo-plugin-provider": "^4.0", "geocoder-php/google-maps-provider": "^4.0", "guzzlehttp/psr7": "*", From cb9e89de9d5b9ed743bef4f7b745b3c107ca2eed Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Wed, 2 Dec 2020 10:00:16 -0800 Subject: [PATCH 03/15] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f4ed3f5..219ef6b 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "illuminate/cache": "^5.0|^6.0|^7.0|^8.0", "illuminate/support": "^5.0|^6.0|^7.0|^8.0", "php-http/curl-client": "*", - "php": ">=7.3", + "php": "^7.3|^8.0", "willdurand/geocoder": "dev-patch-1@dev" }, "require-dev": { From 55ab04e389a3174f03a9b3eae5168f6413e0ab97 Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Wed, 2 Dec 2020 10:00:51 -0800 Subject: [PATCH 04/15] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 219ef6b..8c1a424 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ ], "require": { - "geocoder-php/chain-provider": "php8_support@dev", + "geocoder-php/chain-provider": "^4.0", "geocoder-php/geo-plugin-provider": "^4.0", "geocoder-php/google-maps-provider": "^4.0", "guzzlehttp/psr7": "*", @@ -43,7 +43,7 @@ "illuminate/support": "^5.0|^6.0|^7.0|^8.0", "php-http/curl-client": "*", "php": "^7.3|^8.0", - "willdurand/geocoder": "dev-patch-1@dev" + "willdurand/geocoder": "^4.0" }, "require-dev": { "doctrine/dbal": "*", From 9d06ba7a643db859ec1831fe2d21801d161a8a0a Mon Sep 17 00:00:00 2001 From: Jiong Ye Date: Fri, 16 Jul 2021 11:12:26 -0400 Subject: [PATCH 05/15] Fixed remove empty cache entry method It didn't actually remove the cache entry because cache store was not specified. --- src/ProviderAndDumperAggregator.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php index a1909c0..a5c07c9 100644 --- a/src/ProviderAndDumperAggregator.php +++ b/src/ProviderAndDumperAggregator.php @@ -320,7 +320,9 @@ protected function preventCacheKeyHashCollision( protected function removeEmptyCacheEntry(Collection $result, string $cacheKey) { if ($result && $result->isEmpty()) { - app('cache')->forget($cacheKey); + app('cache') + ->store(config('geocoder.cache.store')) + ->forget($cacheKey); } } From 1f65d69c00a616f307d37cacc26a0198396a7753 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Mon, 6 Dec 2021 12:19:51 -0600 Subject: [PATCH 06/15] allow updated upstream repositories --- composer.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/composer.json b/composer.json index 8c1a424..e858832 100644 --- a/composer.json +++ b/composer.json @@ -22,17 +22,6 @@ "role": "Original Creator" } ], - "repositories": [ - { - "type": "git", - "url": "git@github.com:mikebronner/chain-provider.git" - }, - { - "type": "git", - "url": "git@github.com:mikebronner/geocoder.git" - } - - ], "require": { "geocoder-php/chain-provider": "^4.0", "geocoder-php/geo-plugin-provider": "^4.0", From e81506d22c3b452346140d7979e609d5936e8ebd Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Mon, 6 Dec 2021 12:37:29 -0600 Subject: [PATCH 07/15] update dev dependencies to allow PHP 8 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e858832..028f0c5 100644 --- a/composer.json +++ b/composer.json @@ -44,8 +44,8 @@ "orchestra/testbench-browser-kit": "^6.0", "orchestra/testbench-dusk": "^6.0", "php-coveralls/php-coveralls": "*", - "phpunit/phpunit": "8.5", - "sebastian/phpcpd": "^5.0" + "phpunit/phpunit": "8.5|^9.0", + "sebastian/phpcpd": "^5.0|^6.0" }, "autoload": { "psr-4": { From 92ca30ef3b347d5e32f9cf33a5692ab955b7fca3 Mon Sep 17 00:00:00 2001 From: Nabil EL Mahiri Date: Thu, 10 Feb 2022 04:55:31 +0100 Subject: [PATCH 08/15] Update composer.json --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 028f0c5..be27372 100644 --- a/composer.json +++ b/composer.json @@ -28,10 +28,10 @@ "geocoder-php/google-maps-provider": "^4.0", "guzzlehttp/psr7": "*", "http-interop/http-factory-guzzle": "^1.0", - "illuminate/cache": "^5.0|^6.0|^7.0|^8.0", - "illuminate/support": "^5.0|^6.0|^7.0|^8.0", + "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0", "php-http/curl-client": "*", - "php": "^7.3|^8.0", + "php": "^8.0", "willdurand/geocoder": "^4.0" }, "require-dev": { @@ -40,9 +40,9 @@ "geocoder-php/geoip2-provider": "^4.0", "geocoder-php/maxmind-binary-provider": "^4.0", "laravel/legacy-factories": "^1.0", - "orchestra/testbench": "^6.0", - "orchestra/testbench-browser-kit": "^6.0", - "orchestra/testbench-dusk": "^6.0", + "orchestra/testbench": "^7.0", + "orchestra/testbench-browser-kit": "^7.0", + "orchestra/testbench-dusk": "^7.0", "php-coveralls/php-coveralls": "*", "phpunit/phpunit": "8.5|^9.0", "sebastian/phpcpd": "^5.0|^6.0" From 55c61bd655b6a2f0b171589057fdb41a69acb31c Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Thu, 10 Feb 2022 12:31:29 +0000 Subject: [PATCH 09/15] Updated tests. --- phpunit.xml | 64 +++++++++---------- tests/BrowserTestCase.php | 18 ------ .../Feature/Providers/GeocoderServiceTest.php | 57 ++++++++--------- tests/UnitTestCase.php | 8 --- 4 files changed, 57 insertions(+), 90 deletions(-) delete mode 100644 tests/BrowserTestCase.php delete mode 100644 tests/UnitTestCase.php diff --git a/phpunit.xml b/phpunit.xml index fa0e22b..648dc54 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,41 +1,35 @@ - - - ./tests/Browser - - + + + ./src + + + - ./tests/Feature - - - - ./tests/Unit + ./tests/Feature - - - - ./src - - - - - - - - - - - - + + + + + + + + + + + diff --git a/tests/BrowserTestCase.php b/tests/BrowserTestCase.php deleted file mode 100644 index 8b191b6..0000000 --- a/tests/BrowserTestCase.php +++ /dev/null @@ -1,18 +0,0 @@ -reverse(38.897957, -77.036560) - ->get() - ->filter(function (GoogleAddress $address) { - return Str::contains($address->getStreetName() ?? '', 'Northwest'); - }) - ->first(); - - $this->assertNotNull($result); - $this->assertEquals('1600', $result->getStreetNumber()); - $this->assertEquals('Pennsylvania Avenue Northwest', $result->getStreetName()); - $this->assertEquals('Washington', $result->getLocality()); - $this->assertEquals('20500', $result->getPostalCode()); - } + // public function testItReverseGeocodesCoordinates() + // { + // $result = app('geocoder') + // ->reverse(38.897957, -77.036560) + // ->get() + // ->filter(function (GoogleAddress $address) { + // return Str::contains($address->getStreetName() ?? '', 'Northwest'); + // }) + // ->first(); + + // $this->assertNotNull($result); + // $this->assertEquals('1600', $result->getStreetNumber()); + // $this->assertEquals('Pennsylvania Avenue Northwest', $result->getStreetName()); + // $this->assertEquals('Washington', $result->getLocality()); + // $this->assertEquals('20500', $result->getPostalCode()); + // } public function testItResolvesAGivenAddress() { diff --git a/tests/UnitTestCase.php b/tests/UnitTestCase.php deleted file mode 100644 index 12c041f..0000000 --- a/tests/UnitTestCase.php +++ /dev/null @@ -1,8 +0,0 @@ - Date: Thu, 10 Feb 2022 05:48:16 -0700 Subject: [PATCH 10/15] Update phpunit.xml --- phpunit.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index 648dc54..1524cdf 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -30,6 +30,5 @@ - From cc2ef41076de605e84ca4fa05c0c9ce47621b5c3 Mon Sep 17 00:00:00 2001 From: Devin Norgarb Date: Sat, 17 Dec 2022 23:21:15 +0200 Subject: [PATCH 11/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb3af79..268684c 100644 --- a/README.md +++ b/README.md @@ -274,7 +274,7 @@ The one change to keep in mind here is that the results returned from instead of returning an instance of `AddressCollection`. This should provide greater versatility in manipulation of the results, and be inline with expectations for working with Laravel. The existing `AddressCollection` - methods should map strait over to Laravel's `Collection` methods. But be sure + methods should map straight over to Laravel's `Collection` methods. But be sure to double-check your results, if you have been using `count()`, `first()`, `isEmpty()`, `slice()`, `has()`, `get()`, or `all()` on your results. From 75fb5a450772c4c406331e5d2c3a0ab7f026eedf Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 2 Feb 2023 21:50:32 +0000 Subject: [PATCH 12/15] Bump dependencies for Laravel 10 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index be27372..f06aa36 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "geocoder-php/google-maps-provider": "^4.0", "guzzlehttp/psr7": "*", "http-interop/http-factory-guzzle": "^1.0", - "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", "php-http/curl-client": "*", "php": "^8.0", "willdurand/geocoder": "^4.0" @@ -40,7 +40,7 @@ "geocoder-php/geoip2-provider": "^4.0", "geocoder-php/maxmind-binary-provider": "^4.0", "laravel/legacy-factories": "^1.0", - "orchestra/testbench": "^7.0", + "orchestra/testbench": "^7.0|^8.0", "orchestra/testbench-browser-kit": "^7.0", "orchestra/testbench-dusk": "^7.0", "php-coveralls/php-coveralls": "*", From c9d1ccd83e5d1050ec30cc999ff4edb458e4932c Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 27 Feb 2024 18:14:05 +0000 Subject: [PATCH 13/15] Bump dependencies for Laravel 11 --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index f06aa36..42a92b2 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "geocoder-php/google-maps-provider": "^4.0", "guzzlehttp/psr7": "*", "http-interop/http-factory-guzzle": "^1.0", - "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "php-http/curl-client": "*", "php": "^8.0", "willdurand/geocoder": "^4.0" @@ -40,11 +40,11 @@ "geocoder-php/geoip2-provider": "^4.0", "geocoder-php/maxmind-binary-provider": "^4.0", "laravel/legacy-factories": "^1.0", - "orchestra/testbench": "^7.0|^8.0", - "orchestra/testbench-browser-kit": "^7.0", - "orchestra/testbench-dusk": "^7.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", + "orchestra/testbench-browser-kit": "^7.0|^8.5", + "orchestra/testbench-dusk": "^7.0|^8.22", "php-coveralls/php-coveralls": "*", - "phpunit/phpunit": "8.5|^9.0", + "phpunit/phpunit": "8.5|^9.0|^10.5", "sebastian/phpcpd": "^5.0|^6.0" }, "autoload": { From 573b4ce17b8bd0678d93c779989f0daeb7623480 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 18 Feb 2025 17:53:40 +0000 Subject: [PATCH 14/15] Bump dependencies for Laravel 12 --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 42a92b2..5b4677e 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,11 @@ "geocoder-php/google-maps-provider": "^4.0", "guzzlehttp/psr7": "*", "http-interop/http-factory-guzzle": "^1.0", - "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "php-http/curl-client": "*", "php": "^8.0", - "willdurand/geocoder": "^4.0" + "willdurand/geocoder": "^4.0|^5.0" }, "require-dev": { "doctrine/dbal": "*", @@ -40,11 +40,11 @@ "geocoder-php/geoip2-provider": "^4.0", "geocoder-php/maxmind-binary-provider": "^4.0", "laravel/legacy-factories": "^1.0", - "orchestra/testbench": "^7.0|^8.0|^9.0", - "orchestra/testbench-browser-kit": "^7.0|^8.5", - "orchestra/testbench-dusk": "^7.0|^8.22", + "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", + "orchestra/testbench-browser-kit": "^7.0|^8.5|^10.0", + "orchestra/testbench-dusk": "^7.0|^8.22|^10.0", "php-coveralls/php-coveralls": "*", - "phpunit/phpunit": "8.5|^9.0|^10.5", + "phpunit/phpunit": "8.5|^9.0|^10.5|^11.5.3", "sebastian/phpcpd": "^5.0|^6.0" }, "autoload": { From 34d8ea717953718e836b192eeb0ba833cf97728a Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Wed, 5 Mar 2025 18:09:07 -0700 Subject: [PATCH 15/15] WIP --- composer.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 5b4677e..21cd476 100644 --- a/composer.json +++ b/composer.json @@ -23,9 +23,9 @@ } ], "require": { - "geocoder-php/chain-provider": "^4.0", - "geocoder-php/geo-plugin-provider": "^4.0", - "geocoder-php/google-maps-provider": "^4.0", + "geocoder-php/chain-provider": "^4.0|^5.0", + "geocoder-php/geo-plugin-provider": "^4.0|^5.0", + "geocoder-php/google-maps-provider": "^4.0|^5.0", "guzzlehttp/psr7": "*", "http-interop/http-factory-guzzle": "^1.0", "illuminate/cache": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", @@ -44,8 +44,7 @@ "orchestra/testbench-browser-kit": "^7.0|^8.5|^10.0", "orchestra/testbench-dusk": "^7.0|^8.22|^10.0", "php-coveralls/php-coveralls": "*", - "phpunit/phpunit": "8.5|^9.0|^10.5|^11.5.3", - "sebastian/phpcpd": "^5.0|^6.0" + "phpunit/phpunit": "8.5|^9.0|^10.5|^11.5.3" }, "autoload": { "psr-4": { @@ -69,6 +68,9 @@ "prefer-stable": true, "config": { "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "php-http/discovery": true + } } }