Changeset 139
- Timestamp:
- 01/23/07 15:52:21 (2 years ago)
- Files:
-
- trunk/src/main/php/net/stubbles/ipo/request/stubBaseRequest.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/ipo/request/stubRequest.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/ipo/request/stubRequestPrefixDecorator.php (modified) (2 diffs)
- trunk/src/test/php/net/stubbles/ipo/request/stubBaseRequestTestCase.php (modified) (4 diffs)
- trunk/src/test/php/net/stubbles/ipo/request/stubRequestPrefixDecoratorTestCase.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/ipo/request/stubBaseRequest.php
r134 r139 154 154 155 155 /** 156 * checks whether there are any value errors 157 * 158 * @param int $source optional source type: cookie, header, param 159 * @return bool 160 */ 161 public function hasValueErrors($source = self::SOURCE_PARAM) 162 { 163 return (count($this->getErrors($source)) > 0); 164 } 165 166 /** 156 167 * returns a list of all request value names with their errors 157 168 * trunk/src/main/php/net/stubbles/ipo/request/stubRequest.php
r133 r139 64 64 65 65 /** 66 * checks whether there are any value errors 67 * 68 * @param int $source optional source type: cookie, header, param 69 * @return bool 70 */ 71 public function hasValueErrors($source = self::SOURCE_PARAM); 72 73 /** 66 74 * returns a list of all request value names with their errors 67 75 * trunk/src/main/php/net/stubbles/ipo/request/stubRequestPrefixDecorator.php
r133 r139 100 100 101 101 /** 102 * checks whether there are any value errors 103 * 104 * @param int $source optional source type: cookie, header, param 105 * @return bool 106 */ 107 public function hasValueErrors($source = self::SOURCE_PARAM) 108 { 109 return (count($this->getValueErrors($source)) > 0); 110 } 111 112 /** 102 113 * returns a list of all request value names with their errors 103 114 * … … 108 119 { 109 120 $valueErrors = $this->request->getValueErrors($source); 110 if ($this->applyPrefix($source) == false ) {121 if ($this->applyPrefix($source) == false || count($valueErrors) == 0) { 111 122 return $valueErrors; 112 123 } trunk/src/test/php/net/stubbles/ipo/request/stubBaseRequestTestCase.php
r134 r139 240 240 $this->assertFalse($this->request->hasValueError('foo')); 241 241 $this->assertEqual($this->request->getValueError('foo'), array()); 242 $this->assertFalse($this->request->hasValueErrors()); 242 243 $this->assertEqual($this->request->getValueErrors('foo'), array()); 243 244 … … 254 255 $this->assertTrue($this->request->hasValueError('foo')); 255 256 $this->assertEqual($this->request->getValueError('foo'), array($errorValue)); 257 $this->assertTrue($this->request->hasValueErrors()); 256 258 $this->assertEqual($this->request->getValueErrors('foo'), array('foo' => array($errorValue))); 257 259 258 260 $this->assertTrue($this->request->hasValueError('foo', stubRequest::SOURCE_PARAM)); 259 261 $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_PARAM), array($errorValue)); 262 $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_PARAM)); 260 263 $this->assertEqual($this->request->getValueErrors('foo', stubRequest::SOURCE_PARAM), array('foo' => array($errorValue))); 261 264 262 265 $this->assertTrue($this->request->hasValueError('foo', 'dummy')); 263 266 $this->assertEqual($this->request->getValueError('foo', 'dummy'), array($errorValue)); 267 $this->assertTrue($this->request->hasValueErrors('dummy')); 264 268 $this->assertEqual($this->request->getValueErrors('foo', 'dummy'), array('foo' => array($errorValue))); 265 269 } … … 272 276 $this->assertFalse($this->request->hasValueError('foo', stubRequest::SOURCE_HEADER)); 273 277 $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_HEADER), array()); 278 $this->assertFalse($this->request->hasValueErrors(stubRequest::SOURCE_HEADER)); 274 279 $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_HEADER), array()); 275 280 276 281 $errorValue = new stubRequestValueError('bar', array()); 277 282 $this->request->setHeaderError('foo', $errorValue); 278 $this->assertTrue($this->request-> getValueError('foo', stubRequest::SOURCE_HEADER));283 $this->assertTrue($this->request->hasValueError('foo', stubRequest::SOURCE_HEADER)); 279 284 $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_HEADER), array($errorValue)); 285 $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_HEADER)); 280 286 $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_HEADER), array('foo' => array($errorValue))); 281 287 } … … 288 294 $this->assertFalse($this->request->hasValueError('foo', stubRequest::SOURCE_COOKIE)); 289 295 $this->assertEqual($this->request->getValueError('baz', stubRequest::SOURCE_COOKIE), array()); 296 $this->assertFalse($this->request->hasValueErrors(stubRequest::SOURCE_COOKIE)); 290 297 $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_COOKIE), array()); 291 298 292 299 $errorValue = new stubRequestValueError('bar', array()); 293 300 $this->request->setCookieError('foo', $errorValue); 294 $this->assertTrue($this->request-> getValueError('foo', stubRequest::SOURCE_COOKIE));301 $this->assertTrue($this->request->hasValueError('foo', stubRequest::SOURCE_COOKIE)); 295 302 $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_COOKIE), array($errorValue)); 303 $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_COOKIE)); 296 304 $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_COOKIE), array('foo' => array($errorValue))); 297 305 } trunk/src/test/php/net/stubbles/ipo/request/stubRequestPrefixDecoratorTestCase.php
r133 r139 112 112 $this->request->getValueError('foo'); 113 113 114 $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_PARAM)); 115 $this->request->hasValueErrors(); 116 114 117 $this->mockRequest->setReturnValue('getValueErrors', array('test_foo' => array(), 'bar' => array())); 115 118 $this->assertEqual($this->request->getValueErrors(), array('foo' => array())); … … 126 129 $this->mockRequest->expect('getValueError', array('foo', stubRequest::SOURCE_HEADER)); 127 130 $this->request->getValueError('foo', stubRequest::SOURCE_HEADER); 131 132 $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_HEADER)); 133 $this->request->hasValueErrors(); 128 134 129 135 $this->mockRequest->expect('getValueErrors', array(stubRequest::SOURCE_HEADER)); … … 143 149 $this->request->getValueError('foo', stubRequest::SOURCE_COOKIE); 144 150 151 $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_COOKIE)); 152 $this->request->hasValueErrors(); 153 145 154 $this->mockRequest->expect('getValueErrors', array(stubRequest::SOURCE_COOKIE)); 146 155 $this->mockRequest->setReturnValue('getValueErrors', array('test_foo' => array(), 'bar' => array()));
