Resolve some deprecations and remove igorw/get-in dependency (#1257)

* Remove `igorw/get-in` dependency to simplify code

* Fix phpunit deprecation

* Simplify phpunit's `->will($this->returnValue())` with `->willReturn()`

* Simplify phpunit's `->will($this->returnCallback())` with `->willReturnCallback()`

* Fix deprecated mock builder `setMethds` with `createPartialMock`

* Remove deprecated phpstan `checkGenericClassInNonGenericObjectType` option

* Bump phpunit to 9.6

---------

Co-authored-by: Jonathan Beliën <jbelien@users.noreply.github.com>

Author: norkunas

Tests/GeoIP2AdapterTest.php

@@ -86,9 +86,7 @@ public function testIpAddressIsPassedCorrectToReader(string $geoIp2Model): void
             ->expects($this->once())
             ->method($geoIp2Model)
             ->with('127.0.0.1')
-            ->will($this->returnValue(
-                $this->getGeoIP2ModelMock($geoIp2Model)
-            ));
+            ->willReturn($this->getGeoIP2ModelMock($geoIp2Model));
 
         $adapter = new GeoIP2Adapter($geoIp2Provider, $geoIp2Model);
         $adapter->getContent('file://geoip?127.0.0.1');
@@ -110,15 +108,15 @@ public function testReaderResponseIsJsonEncoded(): void
         $geoIp2Provider
             ->expects($this->any())
             ->method('city')
-            ->will($this->returnValue($cityModel));
+            ->willReturn($cityModel);
 
         $adapter = new GeoIP2Adapter($geoIp2Provider);
 
         $result = $adapter->getContent('file://database?127.0.0.1');
         $this->assertJson($result);
 
         $decodedResult = json_decode($result);
-        $this->assertObjectHasAttribute('city', $decodedResult);
+        $this->assertObjectHasProperty('city', $decodedResult);
     }
 
     /**
@@ -145,23 +143,21 @@ protected function getGeoIP2ModelMock($geoIP2Model)
         $mock
             ->expects($this->any())
             ->method('jsonSerialize')
-            ->will($this->returnValue(
-                [
-                    'city' => [
-                        'geoname_id' => 2911298,
-                        'names' => [
-                            'de' => 'Hamburg',
-                            'en' => 'Hamburg',
-                            'es' => 'Hamburgo',
-                            'fr' => 'Hambourg',
-                            'ja' => 'ハンブルク',
-                            'pt-BR' => 'Hamburgo',
-                            'ru' => 'Гамбург',
-                            'zh-CN' => '汉堡市',
-                        ],
+            ->willReturn([
+                'city' => [
+                    'geoname_id' => 2911298,
+                    'names' => [
+                        'de' => 'Hamburg',
+                        'en' => 'Hamburg',
+                        'es' => 'Hamburgo',
+                        'fr' => 'Hambourg',
+                        'ja' => 'ハンブルク',
+                        'pt-BR' => 'Hamburgo',
+                        'ru' => 'Гамбург',
+                        'zh-CN' => '汉堡市',
                     ],
-                ]
-            ));
+                ],
+            ]);
 
         return $mock;
     }

Tests/GeoIP2Test.php

@@ -264,10 +264,7 @@ public static function provideDataForTestingExceptions(): array
      */
     private function getGeoIP2AdapterMock($returnValue = '')
     {
-        $mock = $this->getMockBuilder(GeoIP2Adapter::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getContent'])
-            ->getMock();
+        $mock = $this->createPartialMock(GeoIP2Adapter::class, ['getContent']);
 
         if ($returnValue instanceof \Exception) {
             $returnValue = $this->throwException($returnValue);

composer.json

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