Merge pull request #1536 from pryazhnikov/tests_fix_usage_of_deprecated_methods

Stop using deprecated MockBuilder::setMethods in unit tests

tests/Monolog/Handler/AmqpHandlerTest.php

@@ -33,7 +33,7 @@ class AmqpHandlerTest extends TestCase
         $messages = [];
 
         $exchange = $this->getMockBuilder('AMQPExchange')
-            ->setMethods(['publish', 'setName'])
+            ->onlyMethods(['publish', 'setName'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -84,8 +84,13 @@ class AmqpHandlerTest extends TestCase
 
         $messages = [];
 
+        $methodsToMock = ['basic_publish'];
+        if (method_exists('PhpAmqpLib\Channel\AMQPChannel', '__destruct')) {
+            $methodsToMock[] = '__destruct';
+        }
+
         $exchange = $this->getMockBuilder('PhpAmqpLib\Channel\AMQPChannel')
-            ->setMethods(['basic_publish', '__destruct'])
+            ->onlyMethods($methodsToMock)
             ->disableOriginalConstructor()
             ->getMock();
 

tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php

@@ -26,7 +26,7 @@ class DoctrineCouchDBHandlerTest extends TestCase
     public function testHandle()
     {
         $client = $this->getMockBuilder('Doctrine\\CouchDB\\CouchDBClient')
-            ->setMethods(['postDocument'])
+            ->onlyMethods(['postDocument'])
             ->disableOriginalConstructor()
             ->getMock();
 

tests/Monolog/Handler/DynamoDbHandlerTest.php

@@ -17,16 +17,32 @@ class DynamoDbHandlerTest extends TestCase
 {
     private $client;
 
+    private $isV3;
+
     public function setUp(): void
     {
         if (!class_exists('Aws\DynamoDb\DynamoDbClient')) {
             $this->markTestSkipped('aws/aws-sdk-php not installed');
         }
 
-        $this->client = $this->getMockBuilder('Aws\DynamoDb\DynamoDbClient')
-            ->setMethods(['formatAttributes', '__call'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->isV3 = defined('Aws\Sdk::VERSION') && version_compare(\Aws\Sdk::VERSION, '3.0', '>=');
+
+        $implementedMethods = ['__call'];
+        $absentMethods = [];
+        if (method_exists('Aws\DynamoDb\DynamoDbClient', 'formatAttributes')) {
+            $implementedMethods[] = 'formatAttributes';
+        } else {
+            $absentMethods[] = 'formatAttributes';
+        }
+
+        $clientMockBuilder = $this->getMockBuilder('Aws\DynamoDb\DynamoDbClient')
+            ->onlyMethods($implementedMethods)
+            ->disableOriginalConstructor();
+        if ($absentMethods) {
+            $clientMockBuilder->addMethods($absentMethods);
+        }
+
+        $this->client = $clientMockBuilder->getMock();
     }
 
     public function testConstruct()
@@ -53,8 +69,7 @@ class DynamoDbHandlerTest extends TestCase
         $handler = new DynamoDbHandler($this->client, 'foo');
         $handler->setFormatter($formatter);
 
-        $isV3 = defined('Aws\Sdk::VERSION') && version_compare(\Aws\Sdk::VERSION, '3.0', '>=');
-        if ($isV3) {
+        if ($this->isV3) {
             $expFormatted = array('foo' => array('N' => 1), 'bar' => array('N' => 2));
         } else {
             $expFormatted = $formatted;
@@ -66,7 +81,7 @@ class DynamoDbHandlerTest extends TestCase
              ->with($record)
              ->will($this->returnValue($formatted));
         $this->client
-             ->expects($isV3 ? $this->never() : $this->once())
+             ->expects($this->isV3 ? $this->never() : $this->once())
              ->method('formatAttributes')
              ->with($this->isType('array'))
              ->will($this->returnValue($formatted));

tests/Monolog/Handler/ElasticaHandlerTest.php

@@ -43,7 +43,7 @@ class ElasticaHandlerTest extends TestCase
 
         // base mock Elastica Client object
         $this->client = $this->getMockBuilder('Elastica\Client')
-            ->setMethods(['addDocuments'])
+            ->onlyMethods(['addDocuments'])
             ->disableOriginalConstructor()
             ->getMock();
     }

tests/Monolog/Handler/ElasticsearchHandlerTest.php

@@ -42,7 +42,7 @@ class ElasticsearchHandlerTest extends TestCase
 
         // base mock Elasticsearch Client object
         $this->client = $this->getMockBuilder('Elasticsearch\Client')
-            ->setMethods(['bulk'])
+            ->onlyMethods(['bulk'])
             ->disableOriginalConstructor()
             ->getMock();
     }

tests/Monolog/Handler/FlowdockHandlerTest.php

@@ -65,7 +65,7 @@ class FlowdockHandlerTest extends TestCase
         $this->res = fopen('php://memory', 'a');
         $this->handler = $this->getMockBuilder('Monolog\Handler\FlowdockHandler')
             ->setConstructorArgs($constructorArgs)
-            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->onlyMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
             ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');

tests/Monolog/Handler/GelfHandlerTest.php

@@ -44,7 +44,7 @@ class GelfHandlerTest extends TestCase
     protected function getMessagePublisher()
     {
         return $this->getMockBuilder('Gelf\Publisher')
-            ->setMethods(['publish'])
+            ->onlyMethods(['publish'])
             ->disableOriginalConstructor()
             ->getMock();
     }

tests/Monolog/Handler/InsightOpsHandlerTest.php

@@ -58,7 +58,7 @@ class InsightOpsHandlerTest extends TestCase
         $args = array('testToken', 'us', $useSSL, Logger::DEBUG, true);
         $this->resource = fopen('php://memory', 'a');
         $this->handler = $this->getMockBuilder(InsightOpsHandler::class)
-            ->setMethods(array('fsockopen', 'streamSetTimeout', 'closeSocket'))
+            ->onlyMethods(array('fsockopen', 'streamSetTimeout', 'closeSocket'))
             ->setConstructorArgs($args)
             ->getMock();
 

tests/Monolog/Handler/LogEntriesHandlerTest.php

@@ -63,7 +63,7 @@ class LogEntriesHandlerTest extends TestCase
         $this->res = fopen('php://memory', 'a');
         $this->handler = $this->getMockBuilder('Monolog\Handler\LogEntriesHandler')
             ->setConstructorArgs($args)
-            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->onlyMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
             ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');

tests/Monolog/Handler/LogmaticHandlerTest.php

@@ -63,7 +63,7 @@ class LogmaticHandlerTest extends TestCase
         $this->res = fopen('php://memory', 'a');
         $this->handler = $this->getMockBuilder('Monolog\Handler\LogmaticHandler')
             ->setConstructorArgs($args)
-            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->onlyMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
             ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');

tests/Monolog/Handler/PHPConsoleHandlerTest.php

@@ -60,7 +60,7 @@ class PHPConsoleHandlerTest extends TestCase
     {
         return $this->getMockBuilder('PhpConsole\Dispatcher\Debug')
             ->disableOriginalConstructor()
-            ->setMethods(['dispatchDebug'])
+            ->onlyMethods(['dispatchDebug'])
             ->setConstructorArgs([$connector, $connector->getDumper()])
             ->getMock();
     }
@@ -69,7 +69,7 @@ class PHPConsoleHandlerTest extends TestCase
     {
         return $this->getMockBuilder('PhpConsole\Dispatcher\Errors')
             ->disableOriginalConstructor()
-            ->setMethods(['dispatchError', 'dispatchException'])
+            ->onlyMethods(['dispatchError', 'dispatchException'])
             ->setConstructorArgs([$connector, $connector->getDumper()])
             ->getMock();
     }
@@ -78,7 +78,7 @@ class PHPConsoleHandlerTest extends TestCase
     {
         $connector = $this->getMockBuilder('PhpConsole\Connector')
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'sendMessage',
                 'onShutDown',
                 'isActiveClient',

tests/Monolog/Handler/ProcessHandlerTest.php

@@ -40,7 +40,7 @@ class ProcessHandlerTest extends TestCase
         ];
 
         $mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler');
-        $mockBuilder->setMethods(['writeProcessInput']);
+        $mockBuilder->onlyMethods(['writeProcessInput']);
         // using echo as command, as it is most probably available
         $mockBuilder->setConstructorArgs([self::DUMMY_COMMAND]);
 
@@ -126,7 +126,7 @@ class ProcessHandlerTest extends TestCase
     public function testStartupWithFailingToSelectErrorStreamThrowsUnexpectedValueException()
     {
         $mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler');
-        $mockBuilder->setMethods(['selectErrorStream']);
+        $mockBuilder->onlyMethods(['selectErrorStream']);
         $mockBuilder->setConstructorArgs([self::DUMMY_COMMAND]);
 
         $handler = $mockBuilder->getMock();
@@ -159,7 +159,7 @@ class ProcessHandlerTest extends TestCase
     public function testWritingWithErrorsOnStdOutOfProcessThrowsInvalidArgumentException()
     {
         $mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler');
-        $mockBuilder->setMethods(['readProcessErrors']);
+        $mockBuilder->onlyMethods(['readProcessErrors']);
         // using echo as command, as it is most probably available
         $mockBuilder->setConstructorArgs([self::DUMMY_COMMAND]);
 

tests/Monolog/Handler/PushoverHandlerTest.php

@@ -118,7 +118,7 @@ class PushoverHandlerTest extends TestCase
         $this->res = fopen('php://memory', 'a');
         $this->handler = $this->getMockBuilder('Monolog\Handler\PushoverHandler')
             ->setConstructorArgs($constructorArgs)
-            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->onlyMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
             ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');

tests/Monolog/Handler/RedisHandlerTest.php

@@ -109,7 +109,10 @@ class RedisHandlerTest extends TestCase
     {
         $redis = $this->createPartialMock('Predis\Client', ['transaction']);
 
-        $redisTransaction = $this->createPartialMock('Predis\Client', ['rPush', 'lTrim']);
+        $redisTransaction = $this->getMockBuilder('Predis\Client')
+            ->disableOriginalConstructor()
+            ->addMethods(['rPush', 'lTrim'])
+            ->getMock();
 
         $redisTransaction->expects($this->once())
             ->method('rPush')

tests/Monolog/Handler/RollbarHandlerTest.php

@@ -64,7 +64,7 @@ class RollbarHandlerTest extends TestCase
 
         $this->rollbarLogger = $this->getMockBuilder(RollbarLogger::class)
             ->setConstructorArgs(array($config))
-            ->setMethods(array('log'))
+            ->onlyMethods(array('log'))
             ->getMock();
 
         $this->rollbarLogger

tests/Monolog/Handler/SlackHandlerTest.php

@@ -132,7 +132,7 @@ class SlackHandlerTest extends TestCase
         $this->res = fopen('php://memory', 'a');
         $this->handler = $this->getMockBuilder('Monolog\Handler\SlackHandler')
             ->setConstructorArgs($constructorArgs)
-            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->onlyMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
             ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');

tests/Monolog/Handler/SocketHandlerTest.php

@@ -298,7 +298,7 @@ class SocketHandlerTest extends TestCase
         $finalMethods = array_merge($defaultMethods, $newMethods);
 
         $this->handler = $this->getMockBuilder('Monolog\Handler\SocketHandler')
-            ->setMethods($finalMethods)
+            ->onlyMethods($finalMethods)
             ->setConstructorArgs(['localhost:1234'])
             ->getMock();
 

tests/Monolog/Handler/SyslogUdpHandlerTest.php

@@ -35,7 +35,7 @@ class SyslogUdpHandlerTest extends TestCase
 
         $time = '2014-01-07T12:34:56+00:00';
         $socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
-            ->setMethods(['write'])
+            ->onlyMethods(['write'])
             ->setConstructorArgs(['lol'])
             ->getMock();
         $socket->expects($this->at(0))
@@ -56,7 +56,7 @@ class SyslogUdpHandlerTest extends TestCase
         $handler->setFormatter($this->getIdentityFormatter());
 
         $socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
-            ->setMethods(['write'])
+            ->onlyMethods(['write'])
             ->setConstructorArgs(['lol'])
             ->getMock();
         $socket->expects($this->never())
@@ -75,17 +75,14 @@ class SyslogUdpHandlerTest extends TestCase
 
         $handler = $this->getMockBuilder('\Monolog\Handler\SyslogUdpHandler')
             ->setConstructorArgs(array("127.0.0.1", 514, "authpriv", 'debug', true, "php", \Monolog\Handler\SyslogUdpHandler::RFC3164))
-            ->setMethods(array('getDateTime'))
+            ->onlyMethods([])
             ->getMock();
 
-        $handler->method('getDateTime')
-            ->willReturn($time);
-
         $handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
 
         $socket = $this->getMockBuilder('\Monolog\Handler\SyslogUdp\UdpSocket')
             ->setConstructorArgs(array('lol', 999))
-            ->setMethods(array('write'))
+            ->onlyMethods(array('write'))
             ->getMock();
         $socket->expects($this->at(0))
             ->method('write')

tests/Monolog/Handler/TelegramBotHandlerTest.php

@@ -47,7 +47,7 @@ class TelegramBotHandlerTest extends TestCase
 
         $this->handler = $this->getMockBuilder(TelegramBotHandler::class)
             ->setConstructorArgs($constructorArgs)
-            ->setMethods(['send'])
+            ->onlyMethods(['send'])
             ->getMock();
 
         $this->handler->expects($this->atLeast(1))

tests/Monolog/Handler/UdpSocketTest.php

@@ -22,7 +22,7 @@ class UdpSocketTest extends TestCase
     public function testWeDoNotTruncateShortMessages()
     {
         $socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
-            ->setMethods(['send'])
+            ->onlyMethods(['send'])
             ->setConstructorArgs(['lol'])
             ->getMock();
 
@@ -36,7 +36,7 @@ class UdpSocketTest extends TestCase
     public function testLongMessagesAreTruncated()
     {
         $socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
-            ->setMethods(['send'])
+            ->onlyMethods(['send'])
             ->setConstructorArgs(['lol'])
             ->getMock();
 

tests/Monolog/Handler/ZendMonitorHandlerTest.php

@@ -36,7 +36,7 @@ class ZendMonitorHandlerTest extends TestCase
         ];
 
         $zendMonitor = $this->getMockBuilder('Monolog\Handler\ZendMonitorHandler')
-            ->setMethods(['writeZendMonitorCustomEvent', 'getDefaultFormatter'])
+            ->onlyMethods(['writeZendMonitorCustomEvent', 'getDefaultFormatter'])
             ->getMock();
 
         $formatterMock = $this->getMockBuilder('Monolog\Formatter\NormalizerFormatter')

tests/Monolog/LoggerTest.php

@@ -239,7 +239,7 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
 
         $processor = $this->getMockBuilder('Monolog\Processor\WebProcessor')
             ->disableOriginalConstructor()
-            ->setMethods(['__invoke'])
+            ->onlyMethods(['__invoke'])
             ->getMock()
         ;
         $processor->expects($this->once())