Fix failing tests from 2.x merge.

cakephp · Jan 30, 2014 · b0a9e0d · b0a9e0d
1 parent fc1ffd6
commit b0a9e0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Network/Response.php b/src/Network/Response.php
@@ -1261,13 +1261,13 @@ public function cookie($options = null) {
  * ### Whitelist of URIs
  * e.g `cors($request, array('http://www.cakephp.org', '*.google.com', 'https://myproject.github.io'));`
  *
- * @param CakeRequest $request Request object
+ * @param Cake\Network\Request $request Request object
  * @param string|array $allowedDomains List of allowed domains, see method description for more details
  * @param string|array $allowedMethods List of HTTP verbs allowed
  * @param string|array $allowedHeaders List of HTTP headers allowed
  * @return void
  */
-	public function cors(CakeRequest $request, $allowedDomains, $allowedMethods = array(), $allowedHeaders = array()) {
+	public function cors(Request $request, $allowedDomains, $allowedMethods = array(), $allowedHeaders = array()) {
 		$origin = $request->header('Origin');
 		if (!$origin) {
 			return;

diff --git a/tests/TestCase/Network/ResponseTest.php b/tests/TestCase/Network/ResponseTest.php
@@ -1065,7 +1065,7 @@ public function testCookieSettings() {
  * Test CORS
  *
  * @dataProvider corsData
- * @param CakeRequest $request
+ * @param Request $request
  * @param string $origin
  * @param string|array $domains
  * @param string|array $methods
@@ -1076,9 +1076,9 @@ public function testCookieSettings() {
  * @return void
  */
 	public function testCors($request, $origin, $domains, $methods, $headers, $expectedOrigin, $expectedMethods = false, $expectedHeaders = false) {
-		$_SERVER['HTTP_ORIGIN'] = $origin;
+		$request->env('HTTP_ORIGIN', $origin);
 
-		$response = $this->getMock('CakeResponse', array('header'));
+		$response = $this->getMock('Cake\Network\Response', array('header'));
 
 		$method = $response->expects(!$expectedOrigin ? $this->never() : $this->at(0))->method('header');
 		$expectedOrigin && $method->with('Access-Control-Allow-Origin', $expectedOrigin ? $expectedOrigin : $this->anything());
@@ -1105,9 +1105,9 @@ public function testCors($request, $origin, $domains, $methods, $headers, $expec
  * @return array
  */
 	public function corsData() {
-		$fooRequest = new CakeRequest();
+		$fooRequest = new Request();
 
-		$secureRequest = $this->getMock('CakeRequest', array('is'));
+		$secureRequest = $this->getMock('Cake\Network\Request', array('is'));
 		$secureRequest->expects($this->any())
 			->method('is')
 			->with('ssl')