From f13011e03ef0c9672c86f7169d11c903fd666276 Mon Sep 17 00:00:00 2001 From: kolja Date: Fri, 15 Jan 2016 20:21:02 +0100 Subject: [PATCH] Removed obsolete var_export(). Made construction argument validation tests simpler and more readable. --- src/Monolog/Handler/ProcessHandler.php | 2 +- tests/Monolog/Handler/ProcessHandlerTest.php | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Monolog/Handler/ProcessHandler.php b/src/Monolog/Handler/ProcessHandler.php index 6ae3fb41..ccb60af0 100644 --- a/src/Monolog/Handler/ProcessHandler.php +++ b/src/Monolog/Handler/ProcessHandler.php @@ -115,7 +115,7 @@ class ProcessHandler extends AbstractProcessingHandler $errors = $this->readProcessErrors(); if (empty($errors) === false) { - throw new \UnexpectedValueException('Errors while writing to process: ' . var_export($errors, true)); + throw new \UnexpectedValueException(sprintf('Errors while writing to process: %s', $errors)); } } diff --git a/tests/Monolog/Handler/ProcessHandlerTest.php b/tests/Monolog/Handler/ProcessHandlerTest.php index 2aea583d..66f3692b 100644 --- a/tests/Monolog/Handler/ProcessHandlerTest.php +++ b/tests/Monolog/Handler/ProcessHandlerTest.php @@ -71,20 +71,14 @@ class ProcessHandlerTest extends TestCase } /** - * * @dataProvider invalidCommandProvider * @param mixed $invalidCommand * @covers Monolog\Handler\ProcessHandler::guardAgainstInvalidCommand */ public function testConstructWithInvalidCommandThrowsInvalidArgumentException($invalidCommand) { - $mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler'); - $mockBuilder->disableOriginalConstructor(); - $handler = $mockBuilder->getMock(); - $this->setExpectedException('\InvalidArgumentException'); - /** @var ProcessHandler $handler */ - $handler->__construct($invalidCommand); + new ProcessHandler($invalidCommand, Logger::DEBUG); } /** @@ -108,13 +102,8 @@ class ProcessHandlerTest extends TestCase */ public function testConstructWithInvalidCwdThrowsInvalidArgumentException($invalidCwd) { - $mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler'); - $mockBuilder->disableOriginalConstructor(); - $handler = $mockBuilder->getMock(); - $this->setExpectedException('\InvalidArgumentException'); - /** @var ProcessHandler $handler */ - $handler->__construct('fake command', Logger::DEBUG, true, $invalidCwd); + new ProcessHandler(self::DUMMY_COMMAND, Logger::DEBUG, true, $invalidCwd); } /** @@ -123,7 +112,7 @@ class ProcessHandlerTest extends TestCase */ public function testConstructWithValidCwdWorks() { - $handler = new ProcessHandler('echo', Logger::DEBUG, true, sys_get_temp_dir()); + $handler = new ProcessHandler(self::DUMMY_COMMAND, Logger::DEBUG, true, sys_get_temp_dir()); $this->assertInstanceOf( 'Monolog\Handler\ProcessHandler', $handler,