From 7ed4193a74cf063b04d74f3bc352a188bed66a25 Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <sullivan@nexylan.com>
Date: Mon, 18 May 2015 10:26:30 +0200
Subject: [PATCH] Request timeout option default to 15 instead of null

---
 DependencyInjection/Configuration.php                    | 2 +-
 README.md                                                | 2 +-
 Tests/DependencyInjection/MannewHipchatExtensionTest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 7d33fa3..aab56c1 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -26,7 +26,7 @@ public function getConfigTreeBuilder()
                     ->info('If needed you can specify a proxy that is used when connecting to HipChat.')
                 ->end()
                 ->scalarNode('request_timeout')
-                    ->defaultNull()
+                    ->defaultValue(15)
                     ->info('In seconds. To change the default timeout of a HipChat API request.')
                 ->end()
             ->end();
diff --git a/README.md b/README.md
index 9168466..8924aba 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ mannew_hipchat:
 	auth_token: YOUR_HIPCHAT_AUTH_TOKEN_HERE
 	verify_ssl: true    # optional
 	proxy_address: ~    # optional
-	request_timeout: ~  # in seconds, optional
+	request_timeout: 15 # in seconds, optional
 ```
 
 ## Usage
diff --git a/Tests/DependencyInjection/MannewHipchatExtensionTest.php b/Tests/DependencyInjection/MannewHipchatExtensionTest.php
index 50465d1..5b7c64d 100644
--- a/Tests/DependencyInjection/MannewHipchatExtensionTest.php
+++ b/Tests/DependencyInjection/MannewHipchatExtensionTest.php
@@ -103,7 +103,7 @@ public function testLoadConfigWithoutRequestTimeoutOption()
         $container = $this->getEmptyTestContainer();
         $this->loadConfigIntoContainer($config, $container);
 
-        $this->assertContainerParameterEquals($container, 'request_timeout', null);
+        $this->assertContainerParameterEquals($container, 'request_timeout', 15);
     }
 
     /**