فهرست منبع

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

kolja 10 سال پیش
والد
کامیت
f13011e03e
2فایلهای تغییر یافته به همراه4 افزوده شده و 15 حذف شده
  1. 1 1
      src/Monolog/Handler/ProcessHandler.php
  2. 3 14
      tests/Monolog/Handler/ProcessHandlerTest.php

+ 1 - 1
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));
 		}
 	}
 

+ 3 - 14
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,