Changeset 1531

Show
Ignore:
Timestamp:
04/10/08 22:58:24 (1 month ago)
Author:
mikey
Message:

implemented refactoring #142: refactor session so it has access to the response

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/ipo/session/stubAbstractSession.php

    r1530 r1531  
    77 * @subpackage  ipo_session 
    88 */ 
    9 stubClassLoader::load('net::stubbles::ipo::session::stubSession', 
    10                       'net::stubbles::ipo::request::stubRequest', 
     9stubClassLoader::load('net::stubbles::ipo::request::stubRequest', 
     10                      'net::stubbles::ipo::response::stubResponse', 
     11                      'net::stubbles::ipo::session::stubSession', 
    1112                      'net::stubbles::lang::exceptions::stubIllegalStateException', 
    1213                      'net::stubbles::lang::exceptions::stubRuntimeException' 
    …… 
    5556     *  
    5657     * @param  stubRequest  $request      request instance 
     58     * @param  stubResponse $response     response instance 
    5759     * @param  string       $sessionName  name of the session 
    5860     */ 
    59     public final function __construct(stubRequest $request, $sessionName) 
     61    public final function __construct(stubRequest $request, stubResponse $response, $sessionName) 
    6062    { 
    6163        $this->sessionName = $sessionName; 
    62         $this->doConstruct($request, $sessionName); 
     64        $this->doConstruct($request, $response, $sessionName); 
    6365        if ($this->hasValue(stubSession::START_TIME) == false || $this->doGetValue(stubSession::FINGERPRINT) != $this->getFingerprint()) { 
    6466            if ($this->hasValue(stubSession::START_TIME) == false) { 
    …… 
    8587     *  
    8688     * @param  stubRequest  $request      request instance 
     89     * @param  stubResponse $response     response instance 
    8790     * @param  string       $sessionName  name of the session 
    8891     */ 
    89     protected abstract function doConstruct(stubRequest $request, $sessionName); 
     92    protected abstract function doConstruct(stubRequest $request, stubResponse $response, $sessionName); 
    9093 
    9194    /** 

  • trunk/src/main/php/net/stubbles/ipo/session/stubNoneDurableSession.php

    r1223 r1531  
    3333     *  
    3434     * @param  stubRequest  $request      request instance 
     35     * @param  stubResponse $response     response instance 
    3536     * @param  string       $sessionName  name of the session 
    3637     */ 
    37     protected function doConstruct(stubRequest $request, $sessionName) 
     38    protected function doConstruct(stubRequest $request, stubResponse $response, $sessionName) 
    3839    { 
    3940        // intentionally empty 

  • trunk/src/main/php/net/stubbles/ipo/session/stubPHPSession.php

    r1322 r1531  
    3535     * 
    3636     * @param  stubRequest  $request      request instance 
     37     * @param  stubResponse $response     response instance 
    3738     * @param  string       $sessionName  name of the session 
    3839     */ 
    39     protected function doConstruct(stubRequest $request, $sessionName) 
     40    protected function doConstruct(stubRequest $request, stubResponse $response, $sessionName) 
    4041    { 
    4142        $this->request = $request; 

  • trunk/src/main/php/net/stubbles/websites/stubFrontController.php

    r1464 r1531  
    8888        } 
    8989 
    90         $fqClassName = stubRegistry::getConfig(stubSession::CLASS_REGISTRY_KEY, 'net::stubbles::ipo::session::stubPHPSession'); 
    91         $className   = stubClassLoader::getNonQualifiedClassName($fqClassName); 
     90        $this->response = new stubBaseResponse(); 
     91        $fqClassName    = stubRegistry::getConfig(stubSession::CLASS_REGISTRY_KEY, 'net::stubbles::ipo::session::stubPHPSession'); 
     92        $className      = stubClassLoader::getNonQualifiedClassName($fqClassName); 
    9293        if (class_exists($className, false) === false) { 
    9394            stubClassLoader::load($fqClassName); 
    9495        } 
    9596         
    96         $this->session = new $className($this->request, stubRegistry::getConfig(stubSession::NAME_REGISTRY_KEY, stubSession::DEFAULT_SESSION_NAME)); 
     97        $this->session = new $className($this->request, $this->response, stubRegistry::getConfig(stubSession::NAME_REGISTRY_KEY, stubSession::DEFAULT_SESSION_NAME)); 
    9798        if (($this->session instanceof stubSession) === false) { 
    9899            throw new stubRuntimeException('Configured session class is not an instance of net::stubbles::ipo::session::stubSession.'); 
    99100        } 
    100          
    101         $this->response = new stubBaseResponse(); 
    102101    } 
    103102 

  • trunk/src/test/php/net/stubbles/ioc/stubInjectorSessionTestCase.php

    r1390 r1531  
    5858    { 
    5959        $this->binder            = new stubBinder(); 
    60         $this->nonDurableSession = new stubNoneDurableSession($this->getMock('stubRequest'), 'sessionName'); 
     60        $this->nonDurableSession = new stubNoneDurableSession($this->getMock('stubRequest'), $this->getMock('stubResponse'), 'sessionName'); 
    6161        $this->binder->bind('stubSession')->toInstance($this->nonDurableSession); 
    6262        stubRegistry::set(stubBinder::REGISTRY_KEY, $this->binder); 

  • trunk/src/test/php/net/stubbles/ipo/session/stubAbstractSessionTestCase.php

    r1530 r1531  
    1313    protected $data = array(); 
    1414     
    15     protected function doConstruct(stubRequest $request, $sessionName) 
     15    protected function doConstruct(stubRequest $request, stubResponse $response, $sessionName) 
    1616    { 
    1717        if (strlen($sessionName) > 1 && 'foo' != $sessionName) { 
    …… 
    6969    public function setUp() 
    7070    { 
    71         $this->session = new stubTestSession($this->getMock('stubRequest'), 'foo'); 
     71        $this->session = new stubTestSession($this->getMock('stubRequest'), $this->getMock('stubResponse'), 'foo'); 
    7272    } 
    7373 
    …… 
    8888        $nextToken = $this->session->getNextToken(); 
    8989         
    90         $this->session = new stubTestSession($this->getMock('stubRequest'), $startTime . '|foobarbaz|' . $nextToken); 
     90        $this->session = new stubTestSession($this->getMock('stubRequest'), $this->getMock('stubResponse'), $startTime . '|foobarbaz|' . $nextToken); 
    9191        $this->assertEquals($startTime, $this->session->getStartTime()); 
    9292        $this->assertFalse($this->session->isNew()); 
    …… 
    195195    { 
    196196        // original session started at 50 with fingerprint blub 
    197         $this->session = new stubTestSession($this->getMock('stubRequest'), '50|blub|dummy'); 
     197        $this->session = new stubTestSession($this->getMock('stubRequest'), $this->getMock('stubResponse'), '50|blub|dummy'); 
    198198        $this->assertTrue($this->session->isNew()); 
    199199        $this->assertNotEquals(50, $this->session->getStartTime()); 

  • trunk/src/test/php/net/stubbles/ipo/session/stubNoneDurableSessionTestCase.php

    r1272 r1531  
    2828    public function setUp() 
    2929    { 
    30         $this->session = new stubNoneDurableSession($this->getMock('stubRequest'), 'test'); 
     30        $this->session = new stubNoneDurableSession($this->getMock('stubRequest'), $this->getMock('stubResponse'), 'test'); 
    3131    } 
    3232 

  • trunk/src/test/php/net/stubbles/ipo/session/stubPHPSessionTestCase.php

    r1364 r1531  
    3737        $this->mockRequest->expects($this->atLeastOnce())->method('getValidatedValue')->will($this->returnValue('foobarbaz')); 
    3838        $_SESSION      = array(); 
    39         $this->session = new stubPHPSession($this->mockRequest, 'test'); 
     39        $this->session = new stubPHPSession($this->mockRequest, $this->getMock('stubResponse'), 'test'); 
    4040    } 
    4141