Resolve some deprecations and remove igorw/get-in dependency

composer.json

@@ -18,7 +18,6 @@
     "homepage": "http://geocoder-php.org",
     "require": {
         "php": ">=8.2",
-        "igorw/get-in": "^1.0",
         "php-http/discovery": "^1.17",
         "php-http/promise": "^1.0",
         "psr/http-client-implementation": "^1.0",
@@ -41,7 +40,7 @@
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^9.6.11",
         "symfony/http-client": "^5.4.45 || ^6.4 || ^7.0",
         "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
     },

phpstan.neon

@@ -7,4 +7,3 @@ parameters:
     excludePaths:
         - **/vendor/**
     treatPhpDocTypesAsCertain: false
-    checkGenericClassInNonGenericObjectType: false

src/Common/Tests/TimedGeocoderTest.php

@@ -47,7 +47,7 @@ public function testGeocode(): void
     {
         $this->delegate->expects($this->once())
              ->method('geocodeQuery')
-             ->will($this->returnValue(new AddressCollection([])));
+             ->willReturn(new AddressCollection([]));
 
         $this->geocoder->geocode('foo');
 
@@ -74,7 +74,7 @@ public function testReverse(): void
     {
         $this->delegate->expects($this->once())
              ->method('reverseQuery')
-             ->will($this->returnValue(new AddressCollection([])));
+             ->willReturn(new AddressCollection([]));
 
         $this->geocoder->reverse(0, 0);
 

src/Common/composer.json

@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "nyholm/nsa": "^1.1",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6.11",
         "symfony/stopwatch": "~2.5 || ~5.0 || ~7.0"
     },
     "suggest": {

src/Http/composer.json

@@ -24,7 +24,7 @@
         "nyholm/psr7": "^1.0",
         "php-http/message": "^1.0",
         "php-http/mock-client": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6.11",
         "symfony/stopwatch": "~2.5 || ~5.0"
     },
     "extra": {

src/Plugin/Tests/Plugin/CachePluginTest.php

@@ -27,10 +27,7 @@ public function testPluginMiss(): void
         $ttl = 4711;
         $query = GeocodeQuery::create('foo');
         $queryString = sha1($query->__toString());
-        $cache = $this->getMockBuilder(VoidCachePool::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['get', 'set'])
-            ->getMock();
+        $cache = $this->createPartialMock(VoidCachePool::class, ['get', 'set']);
 
         $cache->expects($this->once())
             ->method('get')
@@ -69,10 +66,7 @@ public function getQueryProvider(): \Generator
      */
     public function testPluginHit(Query $query, string $key): void
     {
-        $cache = $this->getMockBuilder(VoidCachePool::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['get', 'set'])
-            ->getMock();
+        $cache = $this->createPartialMock(VoidCachePool::class, ['get', 'set']);
 
         $cache->expects($this->once())
             ->method('get')

src/Plugin/Tests/Plugin/LoggerPluginTest.php

@@ -25,10 +25,7 @@ class LoggerPluginTest extends TestCase
 {
     public function testPlugin(): void
     {
-        $logger = $this->getMockBuilder(AbstractLogger::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['log'])
-            ->getMock();
+        $logger = $this->createPartialMock(AbstractLogger::class, ['log']);
         $logger->expects($this->once())
             ->method('log')
             ->with('info', $this->callback(function ($message) {
@@ -38,10 +35,7 @@ public function testPlugin(): void
         $geocodeQuery = GeocodeQuery::create('foo');
         $collection = new AddressCollection([]);
 
-        $provider = $this->getMockBuilder(Provider::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['geocodeQuery', 'reverseQuery', 'getName'])
-            ->getMock();
+        $provider = $this->createPartialMock(Provider::class, ['geocodeQuery', 'reverseQuery', 'getName']);
         $provider->expects($this->once())
             ->method('geocodeQuery')
             ->with($geocodeQuery)
@@ -56,21 +50,15 @@ public function testPlugin(): void
     public function testPluginException(): void
     {
         $this->expectException(QuotaExceeded::class);
-        $logger = $this->getMockBuilder(AbstractLogger::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['log'])
-            ->getMock();
+        $logger = $this->createPartialMock(AbstractLogger::class, ['log']);
         $logger->expects($this->once())
             ->method('log')
             ->with('error', $this->callback(function ($message) {
                 return false !== strstr($message, 'QuotaExceeded');
             }));
 
         $geocodeQuery = GeocodeQuery::create('foo');
-        $provider = $this->getMockBuilder(Provider::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['geocodeQuery', 'reverseQuery', 'getName'])
-            ->getMock();
+        $provider = $this->createPartialMock(Provider::class, ['geocodeQuery', 'reverseQuery', 'getName']);
         $provider->expects($this->once())
             ->method('geocodeQuery')
             ->willThrowException(new QuotaExceeded());

src/Plugin/Tests/PluginProviderTest.php

@@ -30,10 +30,7 @@ public function testDispatchQueries(): void
         $reverseQuery = ReverseQuery::fromCoordinates(47, 11);
         $collection = new AddressCollection([]);
 
-        $provider = $this->getMockBuilder(Provider::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['geocodeQuery', 'reverseQuery', 'getName'])
-            ->getMock();
+        $provider = $this->createPartialMock(Provider::class, ['geocodeQuery', 'reverseQuery', 'getName']);
         $provider->expects($this->once())
             ->method('geocodeQuery')
             ->with($geocodeQuery)
@@ -54,21 +51,15 @@ public function testPluginsIsBeingUsedWhenGeocoding(): void
         $geocodeQuery = GeocodeQuery::create('foo');
         $collection = new AddressCollection([]);
 
-        $provider = $this->getMockBuilder(Provider::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['geocodeQuery', 'reverseQuery', 'getName'])
-            ->getMock();
+        $provider = $this->createPartialMock(Provider::class, ['geocodeQuery', 'reverseQuery', 'getName']);
         $provider->expects($this->once())
             ->method('geocodeQuery')
             ->with($geocodeQuery)
             ->willReturn($collection);
         $provider->expects($this->never())->method('reverseQuery');
         $provider->expects($this->never())->method('getName');
 
-        $pluginA = $this->getMockBuilder(Plugin::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['handleQuery'])
-            ->getMock();
+        $pluginA = $this->createPartialMock(Plugin::class, ['handleQuery']);
         $pluginA->expects($this->once())
             ->method('handleQuery')
             ->with($geocodeQuery, $this->isType('callable'), $this->isType('callable'))
@@ -85,21 +76,15 @@ public function testPluginsIsBeingUsedWhenReverse(): void
         $reverseQuery = ReverseQuery::fromCoordinates(47, 11);
         $collection = new AddressCollection([]);
 
-        $provider = $this->getMockBuilder(Provider::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['geocodeQuery', 'reverseQuery', 'getName'])
-            ->getMock();
+        $provider = $this->createPartialMock(Provider::class, ['geocodeQuery', 'reverseQuery', 'getName']);
         $provider->expects($this->never())->method('geocodeQuery');
         $provider->expects($this->never())->method('getName');
         $provider->expects($this->once())
             ->method('reverseQuery')
             ->with($reverseQuery)
             ->willReturn($collection);
 
-        $pluginA = $this->getMockBuilder(Plugin::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['handleQuery'])
-            ->getMock();
+        $pluginA = $this->createPartialMock(Plugin::class, ['handleQuery']);
         $pluginA->expects($this->once())
             ->method('handleQuery')
             ->with($reverseQuery, $this->isType('callable'), $this->isType('callable'))
@@ -116,28 +101,19 @@ public function testLoopException(): void
         $this->expectException(LoopException::class);
         $geocodeQuery = GeocodeQuery::create('foo');
 
-        $provider = $this->getMockBuilder(Provider::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['geocodeQuery', 'reverseQuery', 'getName'])
-            ->getMock();
+        $provider = $this->createPartialMock(Provider::class, ['geocodeQuery', 'reverseQuery', 'getName']);
         $provider->expects($this->never())->method('geocodeQuery');
         $provider->expects($this->never())->method('reverseQuery');
         $provider->expects($this->never())->method('getName');
 
-        $pluginA = $this->getMockBuilder(Plugin::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['handleQuery'])
-            ->getMock();
+        $pluginA = $this->createPartialMock(Plugin::class, ['handleQuery']);
         $pluginA->expects($this->any())
             ->method('handleQuery')
             ->with($geocodeQuery, $this->isType('callable'), $this->isType('callable'))
             ->willReturnCallback(function (Query $query, callable $next, callable $first) {
                 return $next($query);
             });
-        $pluginB = $this->getMockBuilder(Plugin::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['handleQuery'])
-            ->getMock();
+        $pluginB = $this->createPartialMock(Plugin::class, ['handleQuery']);
         $pluginB->expects($this->any())
             ->method('handleQuery')
             ->with($geocodeQuery, $this->isType('callable'), $this->isType('callable'))

src/Plugin/composer.json

@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "cache/void-adapter": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {

src/Provider/AlgoliaPlaces/composer.json

@@ -23,7 +23,7 @@
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.6.3",
         "php-http/message": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {

src/Provider/ArcGISOnline/composer.json

@@ -22,7 +22,7 @@
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.6.3",
         "php-http/message": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {

src/Provider/AzureMaps/composer.json

@@ -21,7 +21,7 @@
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.6.3",
         "php-http/message": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {

src/Provider/BingMaps/composer.json

@@ -22,7 +22,7 @@
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.6.3",
         "php-http/message": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {

src/Provider/Cache/Tests/ProviderCacheTest.php

@@ -41,14 +41,9 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
-            ->setMethods(['get', 'set', 'delete', 'clear', 'setMultiple', 'getMultiple', 'deleteMultiple', 'has'])
+        $this->cacheMock = $this->createPartialMock(CacheInterface::class, ['get', 'set', 'delete', 'clear', 'setMultiple', 'getMultiple', 'deleteMultiple', 'has']);
 
-            ->getMock();
-
-        $this->providerMock = $this->getMockBuilder(Provider::class)
-            ->setMethods(['getFoo', 'getName', 'geocodeQuery', 'reverseQuery'])
-            ->getMock();
+        $this->providerMock = $this->createPartialMock(Provider::class, ['getName', 'geocodeQuery', 'reverseQuery']);
     }
 
     public function testName(): void

src/Provider/Cache/composer.json

@@ -20,7 +20,7 @@
         "geocoder-php/provider-implementation": "1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {

src/Provider/Chain/Tests/ChainTest.php

@@ -45,15 +45,15 @@ public function testReverse(): void
         $mockOne = $this->getMockBuilder(Provider::class)->getMock();
         $mockOne->expects($this->once())
             ->method('reverseQuery')
-            ->will($this->returnCallback(function () {
+            ->willReturnCallback(function () {
                 throw new \Exception();
-            }));
+            });
 
         $mockTwo = $this->getMockBuilder(Provider::class)->getMock();
         $result = new AddressCollection(['foo' => 'bar']);
         $mockTwo->expects($this->once())
             ->method('reverseQuery')
-            ->will($this->returnValue($result));
+            ->willReturn($result);
 
         $chain = new Chain([$mockOne, $mockTwo]);
 
@@ -66,16 +66,16 @@ public function testGeocode(): void
         $mockOne = $this->getMockBuilder(Provider::class)->getMock();
         $mockOne->expects($this->once())
             ->method('geocodeQuery')
-            ->will($this->returnCallback(function () {
+            ->willReturnCallback(function () {
                 throw new \Exception();
-            }));
+            });
 
         $mockTwo = $this->getMockBuilder(Provider::class)->getMock();
         $result = new AddressCollection(['foo' => 'bar']);
         $mockTwo->expects($this->once())
             ->method('geocodeQuery')
             ->with($query)
-            ->will($this->returnValue($result));
+            ->willReturn($result);
 
         $chain = new Chain([$mockOne, $mockTwo]);
 

src/Provider/Chain/composer.json

@@ -23,7 +23,7 @@
         "nyholm/nsa": "^1.1",
         "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {

src/Provider/FreeGeoIp/composer.json

@@ -22,7 +22,7 @@
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.6.3",
         "php-http/message": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6.11"
     },
     "extra": {
         "branch-alias": {