Changeset 1041

Show
Ignore:
Timestamp:
11/15/07 17:00:37 (1 year ago)
Author:
mikey
Message:

use comparisons without type juggling, fixed test case

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/ipo/request/broker/stubRequestBroker.php

    r777 r1041  
    4545         
    4646        foreach ($refClass->getProperties() as $refProperty) { 
    47             if ($this->isAvailable($refProperty) == false) { 
     47            if ($this->isAvailable($refProperty) === false) { 
    4848                continue; 
    4949            } 
    …… 
    5151            $filterAnnotation = $refProperty->getAnnotation('Filter'); 
    5252            $value = $request->getFilteredValue($filterAnnotation->getFilter(), $prefix . $filterAnnotation->getFieldName()); 
    53             if ($request->hasValueError($prefix . $filterAnnotation->getFieldName()) == false) { 
     53            if ($request->hasValueError($prefix . $filterAnnotation->getFieldName()) === false) { 
    5454                $refProperty->setValue($object, $value); 
    5555            } 
    …… 
    5757         
    5858        foreach ($refClass->getMethods() as $refMethod) { 
    59             if ($this->isAvailable($refMethod) == false) { 
     59            if ($this->isAvailable($refMethod) === false) { 
    6060                continue; 
    6161            } 
    …… 
    6363            $filterAnnotation = $refMethod->getAnnotation('Filter'); 
    6464            $value = $request->getFilteredValue($filterAnnotation->getFilter(), $prefix . $filterAnnotation->getFieldName()); 
    65             if ($request->hasValueError($prefix . $filterAnnotation->getFieldName()) == false) { 
     65            if ($request->hasValueError($prefix . $filterAnnotation->getFieldName()) === false) { 
    6666                $refMethod->invoke($object, $value); 
    6767            } 
    …… 
    7777    protected function isAvailable($refInstance) 
    7878    { 
    79         if ($refInstance->isPublic() == false || $refInstance->isStatic() == true) { 
     79        if ($refInstance->isPublic() === false || $refInstance->isStatic() === true) { 
    8080            return false; 
    8181        } 
    8282         
    83         if ($refInstance->hasAnnotation('Filter') == true) { 
     83        if ($refInstance->hasAnnotation('Filter') === true) { 
    8484            return true; 
    8585        } 

  • trunk/src/test/php/net/stubbles/ipo/request/broker/stubRequestBrokerTestCase.php

    r777 r1041  
    5858        $this->mockRequest->setReturnValueAt(0, 'getFilteredValue', 'foo'); 
    5959        $this->mockRequest->setReturnValueAt(1, 'getFilteredValue', 'bar'); 
     60        $this->mockRequest->setReturnValueAt(0, 'hasValueError', false); 
     61        $this->mockRequest->setReturnValueAt(1, 'hasValueError', false); 
    6062        $this->mockRequest->expectCallCount('getFilteredValue', 2); 
    6163        $testClass = new TestBrokerClass(); 
    …… 
    7678        $this->mockRequest->setReturnValueAt(0, 'getFilteredValue', 'foo'); 
    7779        $this->mockRequest->setReturnValueAt(1, 'getFilteredValue', 'bar'); 
     80        $this->mockRequest->setReturnValueAt(0, 'hasValueError', false); 
     81        $this->mockRequest->setReturnValueAt(1, 'hasValueError', false); 
    7882        $this->mockRequest->expectCallCount('getFilteredValue', 2); 
    7983        $testClass = new TestBrokerObject();