Browse Source

Added test case for param with options detector.

Fix coding standards errors.
Calin 12 years ago
parent
commit
075bf37030

+ 1 - 1
lib/Cake/Network/CakeRequest.php

@@ -521,7 +521,7 @@ class CakeRequest implements ArrayAccess {
 				return isset($this->params[$key]) ? $this->params[$key] == $value : false;
 			}
 			if (isset($detect['options'])) {
-				return isset($this->params[$key]) ? in_array($this->params[$key],$detect['options']) : false;
+				return isset($this->params[$key]) ? in_array($this->params[$key], $detect['options']) : false;
 			}
 		}
 		if (isset($detect['callback']) && is_callable($detect['callback'])) {

+ 7 - 0
lib/Cake/Test/Case/Network/CakeRequestTest.php

@@ -1050,6 +1050,13 @@ class CakeRequestTest extends CakeTestCase {
 
 		$request->return = false;
 		$this->assertFalse($request->isCallMe());
+
+		$request->addDetector('extension', array('param' => 'ext', 'options' => array('pdf', 'png', 'txt')));
+		$request->params['ext'] = 'pdf';
+		$this->assertTrue($request->is('extension'));
+
+		$request->params['ext'] = 'exe';
+		$this->assertFalse($request->isExtension());
 	}
 
 /**