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

Author: norkunas

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/Provider/Chain/Tests/ChainTest.php

@@ -53,7 +53,7 @@ public function testReverse(): void
         $result = new AddressCollection(['foo' => 'bar']);
         $mockTwo->expects($this->once())
             ->method('reverseQuery')
-            ->will($this->returnValue($result));
+            ->willReturn($result);
 
         $chain = new Chain([$mockOne, $mockTwo]);
 
@@ -75,7 +75,7 @@ public function testGeocode(): void
         $mockTwo->expects($this->once())
             ->method('geocodeQuery')
             ->with($query)
-            ->will($this->returnValue($result));
+            ->willReturn($result);
 
         $chain = new Chain([$mockOne, $mockTwo]);
 

src/Provider/GeoIP2/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,7 +108,7 @@ public function testReaderResponseIsJsonEncoded(): void
         $geoIp2Provider
             ->expects($this->any())
             ->method('city')
-            ->will($this->returnValue($cityModel));
+            ->willReturn($cityModel);
 
         $adapter = new GeoIP2Adapter($geoIp2Provider);
 
@@ -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;
     }