Givning in and just using Configure directly in Request::createFromGl…

…oabals() This is the simplest and most understandable that does not disrupt the application bootstrap entirely
cakephp · May 19, 2014 · 0cc2c24 · 0cc2c24
1 parent 8e7eef7
commit 0cc2c24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Network/Request.php b/src/Network/Request.php
@@ -164,7 +164,7 @@ public static function createFromGlobals() {
 			'environment' => $_SERVER + $_ENV,
 			'base' => $base,
 			'webroot' => $webroot,
-			'session' => null
+			'session' => Session::create(Configure::read('Session'))
 		);
 		$config['url'] = static::_url($config);
 		return new static($config);

diff --git a/tests/TestCase/Network/RequestTest.php b/tests/TestCase/Network/RequestTest.php
@@ -2260,6 +2260,9 @@ public function testSession() {
 		$session = new Session;
 		$request = new Request(['session' => $session]);
 		$this->assertSame($session, $request->session());
+
+		$request = Request::createFromGlobals();
+		$this->assertEquals($session, $request->session());
 	}
 
 /**

diff --git a/tests/TestCase/Network/SessionTest.php b/tests/TestCase/Network/SessionTest.php
@@ -437,7 +437,7 @@ public function testCookieTimeoutFallback() {
 			'timeout' => 400,
 		];
 
-		$session = new Session($config);
+		new Session($config);
 		$this->assertEquals(400 * 60, ini_get('session.cookie_lifetime'));
 		$this->assertEquals(400 * 60, ini_get('session.gc_maxlifetime'));
 	}