From 5d77229acad46946f1415611fb3a61f6ef2a638a Mon Sep 17 00:00:00 2001 From: tirnanog06 Date: Tue, 4 May 2010 12:35:42 -0400 Subject: [PATCH] [WebBundle] second argument in array_merge must be an array --- src/Symfony/Framework/WebBundle/Session/NativeSession.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Framework/WebBundle/Session/NativeSession.php b/src/Symfony/Framework/WebBundle/Session/NativeSession.php index d01dceff38..5ab0f9f409 100644 --- a/src/Symfony/Framework/WebBundle/Session/NativeSession.php +++ b/src/Symfony/Framework/WebBundle/Session/NativeSession.php @@ -42,7 +42,7 @@ class NativeSession implements SessionInterface * @param array $options An associative array of options * */ - public function __construct($options = null) + public function __construct(array $options = array()) { $cookieDefaults = session_get_cookie_params();