Changeset 300
- Timestamp:
- 02/26/07 17:49:15 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php
r286 r300 8 8 */ 9 9 stubClassLoader::load('net.stubbles.websites.processors.stubAbstractProcessor', 10 'net.stubbles.ipo.request.stubRequestPrefixDecorator', 10 11 'net.stubbles.ipo.response.stubBaseResponse' 11 12 ); … … 54 55 } 55 56 56 $elements = $page->getElements(); 57 $elements = $page->getElements(); 58 $prefixRequest = new stubRequestPrefixDecorator($this->request, ''); 57 59 foreach ($elements as $name => $element) { 58 $element->process($this->request, $this->session, $this->response); 60 $prefixRequest->setPrefix($name); 61 $element->process($prefixRequest, $this->session, $this->response); 59 62 } 60 63 } trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php
r296 r300 9 9 stubClassLoader::load('net.stubbles.websites.processors.stubAbstractProcessor', 10 10 'net.stubbles.websites.xml.stubXMLResponse', 11 'net.stubbles.ipo.request.stubRequestPrefixDecorator', 11 12 'net.stubbles.ipo.response.stubBaseResponse', 12 13 'net.stubbles.util.validators.stubRegexValidator', … … 59 60 $xmlStreamWriter->writeStartElement('document'); 60 61 $this->writeSessionValues($xmlStreamWriter); 62 $prefixRequest = new stubRequestPrefixDecorator($this->request, ''); 61 63 foreach ($elements as $name => $element) { 62 $data = $element->process($this->request, $this->session, $this->response); 64 $prefixRequest->setPrefix($name); 65 $data = $element->process($prefixRequest, $this->session, $this->response); 63 66 $xmlSerializer->serialize($data, $xmlStreamWriter, array(stubXMLSerializer::OPT_ROOT_TAG => $name)); 64 67 } trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php
r286 r300 90 90 $pageElement1 = new MockstubPageElement(); 91 91 $response = $this->memphisProcessor->getResponse(); 92 $pageElement1->expectOnce('process' , array($this->mockRequest, $this->mockSession, $response));92 $pageElement1->expectOnce('process'); 93 93 $pageElement2 = new MockstubPageElement(); 94 $pageElement2->expectOnce('process' , array($this->mockRequest, $this->mockSession, $response));94 $pageElement2->expectOnce('process'); 95 95 $this->mockPage->setReturnValue('getElements', array('foo' => $pageElement1, 'bar' => $pageElement2)); 96 96 $return = $this->memphisProcessor->process();
