mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-31 10:20:14 +02:00
Code Issues Releases Wiki Activity

Removed obsolete var_export(). Made construction argument validation tests simpler and more readable.

Browse Source
This commit is contained in:
kolja
2016-01-15 20:21:02 +01:00
parent 1be08de729
commit f13011e03e
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Monolog/Handler/ProcessHandler.php
View File

@@ -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));
}
}

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

@@ -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,