Merge pull request #6 from Nexylan/request-timeout

Thanks to contributions from @soullivaneuh, the request_timeout option from the hipchat/hipchat-php library is now supported through configuration.

Information about the option is added to the README.

DependencyInjection/Configuration.php

@@ -25,6 +25,10 @@ public function getConfigTreeBuilder()
                     ->defaultNull()
                     ->info('If needed you can specify a proxy that is used when connecting to HipChat.')
                 ->end()
+                ->scalarNode('request_timeout')
+                    ->defaultValue(15)
+                    ->info('In seconds. To change the default timeout of a HipChat API request.')
+                ->end()
             ->end();
 
         return $treeBuilder;

DependencyInjection/MannewHipchatExtension.php

@@ -39,5 +39,9 @@ public function load(array $configs, ContainerBuilder $container)
             'mannew_hipchat.proxy_address',
             $config['proxy_address']
         );
+        $container->setParameter(
+            'mannew_hipchat.request_timeout',
+            $config['request_timeout']
+        );
     }
 }

README.md

@@ -42,8 +42,9 @@ Update your config.yml to contain the a section for this bundle.
 ```yaml
 mannew_hipchat:
 	auth_token: YOUR_HIPCHAT_AUTH_TOKEN_HERE
-	verify_ssl: true  # optional
-	proxy_address: ~  # optional
+	verify_ssl: true    # optional
+	proxy_address: ~    # optional
+	request_timeout: 15 # in seconds, optional
 ```
 
 ## Usage

Resources/config/hipchat.xml

@@ -15,6 +15,9 @@
             <call method="set_proxy">
                 <argument>%mannew_hipchat.proxy_address%</argument>
             </call>
+            <call method="set_request_timeout">
+                <argument>%mannew_hipchat.request_timeout%</argument>
+            </call>
         </service>
     </services>
 </container>

Tests/DependencyInjection/MannewHipchatExtensionTest.php

@@ -82,6 +82,30 @@ public function testLoadConfigWithoutProxyAddressOption()
         $this->assertContainerParameterEquals($container, 'proxy_address', null);
     }
 
+    public function testLoadConfigWithRequestTimeoutOption()
+    {
+        $timeout = 60;
+        $config = array(
+            'request_timeout'   => $timeout,
+            'auth_token'        => uniqid(),
+        );
+        $container = $this->getEmptyTestContainer();
+        $this->loadConfigIntoContainer($config, $container);
+
+        $this->assertContainerParameterEquals($container, 'request_timeout', $timeout);
+    }
+
+    public function testLoadConfigWithoutRequestTimeoutOption()
+    {
+        $config = array(
+            'auth_token'        => uniqid(),
+        );
+        $container = $this->getEmptyTestContainer();
+        $this->loadConfigIntoContainer($config, $container);
+
+        $this->assertContainerParameterEquals($container, 'request_timeout', 15);
+    }
+
     /**
      * @param ContainerBuilder $container
      * @param string $parameterName

composer.json

@@ -3,7 +3,7 @@
     "description": "Bundle to integrate the HipChat PHP library for their REST API.",
     "require": {
         "symfony/framework-bundle": "~2.1",
-        "hipchat/hipchat-php": ">=1.0.0"
+        "hipchat/hipchat-php": "~1.4"
     },
     "license": "MIT",
     "authors": [