Changeset 139

Show
Ignore:
Timestamp:
01/23/07 15:52:21 (2 years ago)
Author:
mikey
Message:

added hasValueErrors($source = self::SOURCE_PARAM)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/main/php/net/stubbles/ipo/request/stubBaseRequest.php

    r134 r139  
    154154     
    155155    /** 
     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    /** 
    156167     * returns a list of all request value names with their errors 
    157168     * 
  • trunk/src/main/php/net/stubbles/ipo/request/stubRequest.php

    r133 r139  
    6464     
    6565    /** 
     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    /** 
    6674     * returns a list of all request value names with their errors 
    6775     * 
  • trunk/src/main/php/net/stubbles/ipo/request/stubRequestPrefixDecorator.php

    r133 r139  
    100100 
    101101    /** 
     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    /** 
    102113     * returns a list of all request value names with their errors 
    103114     * 
     
    108119    { 
    109120        $valueErrors   = $this->request->getValueErrors($source); 
    110         if ($this->applyPrefix($source) == false) { 
     121        if ($this->applyPrefix($source) == false || count($valueErrors) == 0) { 
    111122            return $valueErrors; 
    112123        } 
  • trunk/src/test/php/net/stubbles/ipo/request/stubBaseRequestTestCase.php

    r134 r139  
    240240        $this->assertFalse($this->request->hasValueError('foo')); 
    241241        $this->assertEqual($this->request->getValueError('foo'), array()); 
     242        $this->assertFalse($this->request->hasValueErrors()); 
    242243        $this->assertEqual($this->request->getValueErrors('foo'), array()); 
    243244         
     
    254255        $this->assertTrue($this->request->hasValueError('foo')); 
    255256        $this->assertEqual($this->request->getValueError('foo'), array($errorValue)); 
     257        $this->assertTrue($this->request->hasValueErrors()); 
    256258        $this->assertEqual($this->request->getValueErrors('foo'), array('foo' => array($errorValue))); 
    257259         
    258260        $this->assertTrue($this->request->hasValueError('foo', stubRequest::SOURCE_PARAM)); 
    259261        $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_PARAM), array($errorValue)); 
     262        $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_PARAM)); 
    260263        $this->assertEqual($this->request->getValueErrors('foo', stubRequest::SOURCE_PARAM), array('foo' => array($errorValue))); 
    261264         
    262265        $this->assertTrue($this->request->hasValueError('foo', 'dummy')); 
    263266        $this->assertEqual($this->request->getValueError('foo', 'dummy'), array($errorValue)); 
     267        $this->assertTrue($this->request->hasValueErrors('dummy')); 
    264268        $this->assertEqual($this->request->getValueErrors('foo', 'dummy'), array('foo' => array($errorValue))); 
    265269    } 
     
    272276        $this->assertFalse($this->request->hasValueError('foo', stubRequest::SOURCE_HEADER)); 
    273277        $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_HEADER), array()); 
     278        $this->assertFalse($this->request->hasValueErrors(stubRequest::SOURCE_HEADER)); 
    274279        $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_HEADER), array()); 
    275280         
    276281        $errorValue = new stubRequestValueError('bar', array()); 
    277282        $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)); 
    279284        $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_HEADER), array($errorValue)); 
     285        $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_HEADER)); 
    280286        $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_HEADER), array('foo' => array($errorValue))); 
    281287    } 
     
    288294        $this->assertFalse($this->request->hasValueError('foo', stubRequest::SOURCE_COOKIE)); 
    289295        $this->assertEqual($this->request->getValueError('baz', stubRequest::SOURCE_COOKIE), array()); 
     296        $this->assertFalse($this->request->hasValueErrors(stubRequest::SOURCE_COOKIE)); 
    290297        $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_COOKIE), array()); 
    291298         
    292299        $errorValue = new stubRequestValueError('bar', array()); 
    293300        $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)); 
    295302        $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_COOKIE), array($errorValue)); 
     303        $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_COOKIE)); 
    296304        $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_COOKIE), array('foo' => array($errorValue))); 
    297305    } 
  • trunk/src/test/php/net/stubbles/ipo/request/stubRequestPrefixDecoratorTestCase.php

    r133 r139  
    112112        $this->request->getValueError('foo'); 
    113113         
     114        $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_PARAM)); 
     115        $this->request->hasValueErrors(); 
     116         
    114117        $this->mockRequest->setReturnValue('getValueErrors', array('test_foo' => array(), 'bar' => array())); 
    115118        $this->assertEqual($this->request->getValueErrors(), array('foo' => array())); 
     
    126129        $this->mockRequest->expect('getValueError', array('foo', stubRequest::SOURCE_HEADER)); 
    127130        $this->request->getValueError('foo', stubRequest::SOURCE_HEADER); 
     131         
     132        $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_HEADER)); 
     133        $this->request->hasValueErrors(); 
    128134         
    129135        $this->mockRequest->expect('getValueErrors', array(stubRequest::SOURCE_HEADER)); 
     
    143149        $this->request->getValueError('foo', stubRequest::SOURCE_COOKIE); 
    144150         
     151        $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_COOKIE)); 
     152        $this->request->hasValueErrors(); 
     153         
    145154        $this->mockRequest->expect('getValueErrors', array(stubRequest::SOURCE_COOKIE)); 
    146155        $this->mockRequest->setReturnValue('getValueErrors', array('test_foo' => array(), 'bar' => array()));