mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-03 19:57:41 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1536 from pryazhnikov/tests_fix_usage_of_deprecated_methods

Browse Source 
Stop using deprecated MockBuilder::setMethods in unit tests
This commit is contained in:
Jordi Boggiano
2021-04-18 22:27:02 +02:00
committed by GitHub
parent 0dc10f86b8 812d63b171
commit bac1ddd019
22 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/Monolog/Handler/AmqpHandlerTest.php
View File

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

2
tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
View File

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

29
tests/Monolog/Handler/DynamoDbHandlerTest.php
View File

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

2
tests/Monolog/Handler/ElasticaHandlerTest.php
View File

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

2
tests/Monolog/Handler/ElasticsearchHandlerTest.php
View File

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

2
tests/Monolog/Handler/FlowdockHandlerTest.php
View File

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

2
tests/Monolog/Handler/GelfHandlerTest.php
View File

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

2
tests/Monolog/Handler/InsightOpsHandlerTest.php
View File

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

2
tests/Monolog/Handler/LogEntriesHandlerTest.php
View File

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

2
tests/Monolog/Handler/LogmaticHandlerTest.php
View File

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

6
tests/Monolog/Handler/PHPConsoleHandlerTest.php
View File

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

6
tests/Monolog/Handler/ProcessHandlerTest.php
View File

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

2
tests/Monolog/Handler/PushoverHandlerTest.php
View File

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

5
tests/Monolog/Handler/RedisHandlerTest.php
View File

@@ -109,7 +109,10 @@ class RedisHandlerTest extends TestCase
{ {
$redis = $this->createPartialMock('Predis\Client', ['transaction']); $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()) $redisTransaction->expects($this->once())
->method('rPush') ->method('rPush')

2
tests/Monolog/Handler/RollbarHandlerTest.php
View File

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

2
tests/Monolog/Handler/SlackHandlerTest.php
View File

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

2
tests/Monolog/Handler/SocketHandlerTest.php
View File

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

11
tests/Monolog/Handler/SyslogUdpHandlerTest.php
View File

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

2
tests/Monolog/Handler/TelegramBotHandlerTest.php
View File

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

4
tests/Monolog/Handler/UdpSocketTest.php
View File

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

2
tests/Monolog/Handler/ZendMonitorHandlerTest.php
View File

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

2
tests/Monolog/LoggerTest.php
View File

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