Changeset 1245

Show
Ignore:
Timestamp:
01/16/08 15:32:28 (7 months ago)
Author:
mikey
Message:

replaced some overall used registry keys by class constants

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/auth/storage/stubAuthSessionStorage.php

    r1243 r1245  
    3232     * session key for result storage time 
    3333     */ 
    34     const SESSION_KEY_STORE_TIME = 'net.stubbles.auth.storeTime' 
     34    const SESSION_KEY_STORE_TIME = 'net.stubbles.auth.storeTime'; 
    3535 
    3636    /** 

  • trunk/src/main/php/net/stubbles/util/log/stubLogData.php

    r562 r1245  
    1717interface stubLogData extends stubObject 
    1818{ 
     19    /** 
     20     * registry key for request class to be used 
     21     */ 
     22    const CLASS_REGISTRY_KEY = 'net.stubbles.util.log.class'; 
    1923    /** 
    2024     * default seperator to be used to seperate the log fields 

  • trunk/src/main/php/net/stubbles/util/log/stubLogDataFactory.php

    r1230 r1245  
    5252    public static function create($target, $level = stubLogger::LEVEL_INFO) 
    5353    { 
    54         $fqClassName = stubRegistry::getConfig('net.stubbles.util.log.class', 'net::stubbles::util::log::stubBaseLogData'); 
     54        $fqClassName = stubRegistry::getConfig(stubLogData::CLASS_REGISTRY_KEY, 'net::stubbles::util::log::stubBaseLogData'); 
    5555        $nqClassName = stubClassLoader::getNonQualifiedClassName($fqClassName); 
    5656        if (class_exists($nqClassName, false) === false) { 
    …… 
    6060        $logData = new $nqClassName($target, $level); 
    6161        if (($logData instanceof stubLogData) === false) { 
    62             throw new stubRuntimeException('Configured net.stubbles.util.log.class is not an instance of net::stubbles::util::log::stubLogData.'); 
     62            throw new stubRuntimeException('Configured ' . stubLogData::CLASS_REGISTRY_KEY . ' is not an instance of net::stubbles::util::log::stubLogData.'); 
    6363        } 
    6464         

  • trunk/src/test/php/net/stubbles/integration/RegistryTestCase.php

    r1242 r1245  
    99stubClassLoader::load('net::stubbles::util::stubRegistryXJConfInitializer', 
    1010                      'net::stubbles::ipo::request::stubRequest', 
    11                       'net::stubbles::ipo::session::stubSession' 
     11                      'net::stubbles::ipo::session::stubSession', 
     12                      'net::stubbles::util::log::stubLogData' 
    1213); 
    1314/** 
    …… 
    2829        $this->assertEqual(stubRegistry::getConfig('net.stubbles.language'), 'en_EN'); 
    2930        $this->assertEqual(stubRegistry::getConfig('net.stubbles.number.decimals'), 4); 
    30         $this->assertEqual(stubRegistry::getConfig('net.stubbles.util.log.class'), 'net::stubbles::util::log::stubBaseLogData'); 
     31        $this->assertEqual(stubRegistry::getConfig(stubLogData::CLASS_REGISTRY_KEY), 'net::stubbles::util::log::stubBaseLogData'); 
    3132        $this->assertEqual(stubRegistry::getConfig(stubRequest::CLASS_REGISTRY_KEY), 'net::stubbles::ipo::request::stubWebRequest'); 
    3233        $this->assertEqual(stubRegistry::getConfig(stubSession::CLASS_REGISTRY_KEY), 'net::stubbles::ipo::session::stubPHPSession'); 

  • trunk/src/test/php/net/stubbles/lang/errorhandler/stubAbstractExceptionHandlerTestCase.php

    r1236 r1245  
    5050    { 
    5151        $this->abstractExceptionHandler = $this->getMock('stubAbstractExceptionHandler', array('fillResponse')); 
    52         stubRegistry::setConfig('net.stubbles.util.log.class', 'net::stubbles::util::log::stubBaseLogData'); 
     52        stubRegistry::setConfig(stubLogData::CLASS_REGISTRY_KEY, 'net::stubbles::util::log::stubBaseLogData'); 
    5353        $binder = new stubBinder(); 
    5454        stubRegistry::set(stubBinder::REGISTRY_KEY, $binder); 
    …… 
    6666         
    6767        stubRegistry::remove(stubBinder::REGISTRY_KEY); 
    68         stubRegistry::removeConfig('net.stubbles.util.log.class'); 
     68        stubRegistry::removeConfig(stubLogData::CLASS_REGISTRY_KEY); 
    6969    } 
    7070 

  • trunk/src/test/php/net/stubbles/util/log/stubLogDataFactoryTestCase.php

    r1230 r1245  
    4040    public function testWithoutLoading() 
    4141    { 
    42         stubRegistry::setConfig('net.stubbles.util.log.class', 'MockstubLogData'); 
     42        stubRegistry::setConfig(stubLogData::CLASS_REGISTRY_KEY, 'MockstubLogData'); 
    4343        $logData = stubLogDataFactory::create('foo'); 
    4444        $this->assertIsA($logData, 'MockstubLogData'); 
    …… 
    5050    public function testWithLoading() 
    5151    { 
    52         stubRegistry::setConfig('net.stubbles.util.log.class', 'org::stubbles::test::TestLogData'); 
     52        stubRegistry::setConfig(stubLogData::CLASS_REGISTRY_KEY, 'org::stubbles::test::TestLogData'); 
    5353        $logData = stubLogDataFactory::create('foo'); 
    5454        $this->assertIsA($logData, 'TestLogData'); 
    …… 
    6060    public function testWrongInstance() 
    6161    { 
    62         stubRegistry::setConfig('net.stubbles.util.log.class', 'stdClass'); 
     62        stubRegistry::setConfig(stubLogData::CLASS_REGISTRY_KEY, 'stdClass'); 
    6363        $this->expectException('stubRuntimeException'); 
    6464        stubLogDataFactory::create('foo');