Merge remote-tracking branch 'apfelbox/hipchat-config'

Conflicts:
	Resources/config/schema/monolog-1.0.xsd

Author: Seldaek

DependencyInjection/Configuration.php

@@ -179,6 +179,8 @@
  *   - [bubble]: bool, defaults to true
  *   - [use_ssl]: bool, defaults to true
  *   - [message_format]: text or html, defaults to text
+ *   - [host]: defaults to "api.hipchat.com"
+ *   - [api_version]: defaults to "v1"
  *
  * - slack:
  *   - token: slack api token
@@ -330,6 +332,7 @@ public function getConfigTreeBuilder()
                             ->scalarNode('exchange_name')->defaultValue('log')->end() // amqp
                             ->scalarNode('room')->end() // hipchat
                             ->scalarNode('message_format')->defaultValue('text')->end() // hipchat
+                            ->scalarNode('api_version')->defaultNull()->end() // hipchat
                             ->scalarNode('channel')->end() // slack
                             ->scalarNode('bot_name')->defaultValue('Monolog')->end() // slack
                             ->scalarNode('use_attachment')->defaultTrue()->end() // slack
@@ -350,7 +353,7 @@ public function getConfigTreeBuilder()
                                 ->end()
                             ->end()
                             ->scalarNode('title')->defaultNull()->end() // pushover
-                            ->scalarNode('host')->end() // syslogudp
+                            ->scalarNode('host')->defaultNull()->end() // syslogudp & hipchat
                             ->scalarNode('port')->defaultValue(514)->end() // syslogudp
                             ->arrayNode('publisher')
                                 ->canBeUnset()
@@ -654,6 +657,10 @@ public function getConfigTreeBuilder()
                             ->ifTrue(function ($v) { return 'hipchat' === $v['type'] && !in_array($v['message_format'], array('text', 'html')); })
                             ->thenInvalid('The message_format has to be "text" or "html" in a HipChatHandler')
                         ->end()
+                        ->validate()
+                            ->ifTrue(function ($v) { return 'hipchat' === $v['type'] && null !== $v['api_version'] && !in_array($v['api_version'], array('v1', 'v2'), true); })
+                            ->thenInvalid('The api_version has to be "v1" or "v2" in a HipChatHandler')
+                        ->end()
                         ->validate()
                             ->ifTrue(function ($v) { return 'slack' === $v['type'] && (empty($v['token']) || empty($v['channel'])); })
                             ->thenInvalid('The token and channel have to be specified to use a SlackHandler')

DependencyInjection/MonologExtension.php

@@ -469,6 +469,8 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['bubble'],
                 $handler['use_ssl'],
                 $handler['message_format'],
+                !empty($handler['host']) ? $handler['host'] : 'api.hipchat.com',
+                !empty($handler['api_version']) ? $handler['api_version'] : 'v1',
             ));
             break;
 

Resources/config/schema/monolog-1.0.xsd

@@ -70,6 +70,7 @@
         <xsd:attribute name="document_type" type="xsd:string" />
         <xsd:attribute name="document-type" type="xsd:string" />
         <xsd:attribute name="ignore-error" type="xsd:string" />
+        <xsd:attribute name="api_version" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:simpleType name="level">