From 075bf370307e78f762883d2fa49acb5cea3ade6c Mon Sep 17 00:00:00 2001 From: Calin Date: Tue, 27 Aug 2013 11:20:07 +0300 Subject: [PATCH] Added test case for param with options detector. Fix coding standards errors. --- lib/Cake/Network/CakeRequest.php | 2 +- lib/Cake/Test/Case/Network/CakeRequestTest.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php index 12ac338535c..a4989d770b4 100644 --- a/lib/Cake/Network/CakeRequest.php +++ b/lib/Cake/Network/CakeRequest.php @@ -521,7 +521,7 @@ public function is($type) { 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'])) { diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php index 06e4f815156..a49fbf9e76b 100644 --- a/lib/Cake/Test/Case/Network/CakeRequestTest.php +++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php @@ -1050,6 +1050,13 @@ public function testAddDetector() { $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()); } /**