Changeset 1669
- Timestamp:
- 07/01/08 10:56:19 (2 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/ipo/request/broker/stubRequestBroker.php
r1667 r1669 67 67 foreach ($refClass->getPropertiesByMatcher(self::$methodAndPropertyMatcher) as $refProperty) { 68 68 $filterAnnotation = $refProperty->getAnnotation('Filter'); 69 $fieldName = $ filterAnnotation->getFieldName();69 $fieldName = $prefix . $filterAnnotation->getFieldName(); 70 70 if (isset($overruleFilters[$fieldName]) === true) { 71 71 $filter = $overruleFilters[$fieldName]; … … 74 74 } 75 75 76 $value = $request->getFilteredValue($filter, $ prefix . $fieldName);76 $value = $request->getFilteredValue($filter, $fieldName); 77 77 if ($request->hasValueError($prefix . $filterAnnotation->getFieldName()) === false) { 78 78 $refProperty->setValue($object, $value); … … 82 82 foreach ($refClass->getMethodsByMatcher(self::$methodAndPropertyMatcher) as $refMethod) { 83 83 $filterAnnotation = $refMethod->getAnnotation('Filter'); 84 $fieldName = $ filterAnnotation->getFieldName();84 $fieldName = $prefix . $filterAnnotation->getFieldName(); 85 85 if (isset($overruleFilters[$fieldName]) === true) { 86 86 $filter = $overruleFilters[$fieldName]; … … 89 89 } 90 90 91 $value = $request->getFilteredValue($filter, $ prefix . $fieldName);91 $value = $request->getFilteredValue($filter, $fieldName); 92 92 if ($request->hasValueError($prefix . $filterAnnotation->getFieldName()) === false) { 93 93 $refMethod->invoke($object, $value); trunk/src/test/php/net/stubbles/ipo/request/broker/stubRequestBrokerTestCase.php
r1667 r1669 138 138 public function withClassThatIsInstanceOfStubObjectAndFilterOverruling() 139 139 { 140 $overrules = array(' foo' => $this->getMock('stubFilter'),141 ' bar' => $this->getMock('stubFilter')140 $overrules = array('prefix_foo' => $this->getMock('stubFilter'), 141 'prefix_bar' => $this->getMock('stubFilter') 142 142 ); 143 143 $this->mockRequest->expects($this->at(0)) 144 144 ->method('getFilteredValue') 145 ->with($this->isInstanceOf(get_class($overrules[' foo'])), $this->equalTo('prefix_foo'))145 ->with($this->isInstanceOf(get_class($overrules['prefix_foo'])), $this->equalTo('prefix_foo')) 146 146 ->will($this->returnValue('foo')); 147 147 $this->mockRequest->expects($this->at(2)) 148 148 ->method('getFilteredValue') 149 ->with($this->isInstanceOf(get_class($overrules[' bar'])), $this->equalTo('prefix_bar'))149 ->with($this->isInstanceOf(get_class($overrules['prefix_bar'])), $this->equalTo('prefix_bar')) 150 150 ->will($this->returnValue('bar')); 151 151 $this->mockRequest->expects($this->exactly(2))
