Avoid unnecessary Hash::merge() call.

cakephp · Aug 17, 2014 · df3148a · df3148a
1 parent bc68b86
commit df3148a
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/Network/Request.php b/src/Network/Request.php
@@ -156,13 +156,11 @@ class Request implements \ArrayAccess {
  */
 	public static function createFromGlobals() {
 		list($base, $webroot) = static::_base();
-		$sessionConfig = Hash::merge(
-			[
-				'defaults' => 'php',
-				'cookiePath' => $base ?: '/'
-			],
-			(array)Configure::read('Session')
-		);
+		$sessionConfig = (array)Configure::read('Session') + [
+			'defaults' => 'php',
+			'cookiePath' => $base ?: '/'
+		];
+
 		$config = array(
 			'query' => $_GET,
 			'post' => $_POST,