diff --git a/src/Monolog/Handler/LogEntriesHandler.php b/src/Monolog/Handler/LogEntriesHandler.php index c1b59800..ce69edee 100644 --- a/src/Monolog/Handler/LogEntriesHandler.php +++ b/src/Monolog/Handler/LogEntriesHandler.php @@ -27,14 +27,13 @@ class LogEntriesHandler extends SocketHandler /** * @param string $token Log token supplied by LogEntries + * @param boolean $useSSL Whether or not SSL encryption should be used. * @param int $level The minimum logging level to trigger this handler * @param boolean $bubble Whether or not messages that are handled should bubble up the stack. - * @param boolean $useSSL Whether or not SSL encryption should be used. - * @param string $format Message format. See Monolog usage documents. * * @throws MissingExtensionExcpetion If SSL encryption is set to true and OpenSSL is missing */ - public function __construct($token, $level = Logger::DEBUG, $bubble = true, $useSSL = true) + public function __construct($token, $useSSL = true, $level = Logger::DEBUG, $bubble = true) { if ($useSSL && !extension_loaded('openssl')) { throw new MissingExtensionException('The OpenSSL PHP plugin is required to use SSL encrypted connection for LogEntriesHandler'); diff --git a/tests/Monolog/Handler/LogEntriesHandlerTest.php b/tests/Monolog/Handler/LogEntriesHandlerTest.php index c6ec8602..5a3f9755 100644 --- a/tests/Monolog/Handler/LogEntriesHandlerTest.php +++ b/tests/Monolog/Handler/LogEntriesHandlerTest.php @@ -57,9 +57,10 @@ class LogEntriesHandlerTest extends TestCase $this->assertRegexp('/(testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] .* \[\] \[\]\n){3}/', $content); } - private function createHandler($logToken = 'testToken', $useSSL = true) + private function createHandler() { - $args = array($logToken, Logger::DEBUG, true, $useSSL = true); + $useSSL = extension_loaded('openssl'); + $args = array('testToken', $useSSL, Logger::DEBUG, true); $this->res = fopen('php://memory', 'a'); $this->handler = $this->getMock( '\Monolog\Handler\LogEntriesHandler',