mirror of
https://github.com/Seldaek/monolog.git
synced 2025-08-08 06:06:40 +02:00
Remove setVersion() method
Removed per request
This commit is contained in:
@@ -97,6 +97,10 @@ class HipChatHandler extends SocketHandler
|
|||||||
*/
|
*/
|
||||||
public function __construct($token, $room, $name = 'Monolog', $notify = false, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $format = 'text', $host = 'api.hipchat.com', $version = self::API_V1)
|
public function __construct($token, $room, $name = 'Monolog', $notify = false, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $format = 'text', $host = 'api.hipchat.com', $version = self::API_V1)
|
||||||
{
|
{
|
||||||
|
if ($version == self::API_V1 && !$this->validateStringLength($name, static::MAXIMUM_NAME_LENGTH)) {
|
||||||
|
throw new \InvalidArgumentException('The supplied name is too long. HipChat\'s v1 API supports names up to 15 UTF-8 characters.');
|
||||||
|
}
|
||||||
|
|
||||||
$connectionString = $useSSL ? 'ssl://'.$host.':443' : $host.':80';
|
$connectionString = $useSSL ? 'ssl://'.$host.':443' : $host.':80';
|
||||||
parent::__construct($connectionString, $level, $bubble);
|
parent::__construct($connectionString, $level, $bubble);
|
||||||
|
|
||||||
@@ -106,21 +110,6 @@ class HipChatHandler extends SocketHandler
|
|||||||
$this->room = $room;
|
$this->room = $room;
|
||||||
$this->format = $format;
|
$this->format = $format;
|
||||||
$this->host = $host;
|
$this->host = $host;
|
||||||
|
|
||||||
$this->setVersion($version);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convenience method for setting the API version. Valid values are
|
|
||||||
* - HipChatHandler::API_V1
|
|
||||||
* - HipChatHandler::API_V2
|
|
||||||
* @param $version string the API version to use
|
|
||||||
*/
|
|
||||||
public function setVersion($version) {
|
|
||||||
if ($version == self::API_V1 && !$this->validateStringLength($this->name, static::MAXIMUM_NAME_LENGTH)) {
|
|
||||||
throw new \InvalidArgumentException('The supplied name is too long. HipChat\'s v1 API supports names up to 15 UTF-8 characters.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->version = $version;
|
$this->version = $version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -35,18 +35,6 @@ class HipChatHandlerTest extends TestCase
|
|||||||
return $content;
|
return $content;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testCanSetVersionAfterCreate() {
|
|
||||||
$this->createHandler();
|
|
||||||
$this->handler->setVersion('v2');
|
|
||||||
$this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
|
|
||||||
fseek($this->res, 0);
|
|
||||||
$content = fread($this->res, 1024);
|
|
||||||
|
|
||||||
$this->assertRegexp('/POST \/v2\/room\/room1\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: api.hipchat.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
|
|
||||||
|
|
||||||
return $content;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testWriteCustomHostHeader()
|
public function testWriteCustomHostHeader()
|
||||||
{
|
{
|
||||||
$this->createHandler('myToken', 'room1', 'Monolog', false, 'hipchat.foo.bar');
|
$this->createHandler('myToken', 'room1', 'Monolog', false, 'hipchat.foo.bar');
|
||||||
@@ -97,14 +85,6 @@ class HipChatHandlerTest extends TestCase
|
|||||||
$this->assertRegexp('/notify=0&message=test1&message_format=text&color=red$/', $content);
|
$this->assertRegexp('/notify=0&message=test1&message_format=text&color=red$/', $content);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @depends testCanSetVersionAfterCreate
|
|
||||||
*/
|
|
||||||
public function testWriteContentV2AfterCreate($content)
|
|
||||||
{
|
|
||||||
$this->assertRegexp('/notify=0&message=test1&message_format=text&color=red$/', $content);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testWriteWithComplexMessage()
|
public function testWriteWithComplexMessage()
|
||||||
{
|
{
|
||||||
$this->createHandler();
|
$this->createHandler();
|
||||||
|
Reference in New Issue
Block a user