Fix deprecated mock builder setMethds with createPartialMock

Author: norkunas

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/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/GeoIP2/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);