Changeset 2981

Show
Ignore:
Timestamp:
10/07/08 10:59:59 (3 months ago)
Author:
felix
Message:

Merged revisions 2974,2978 via svnmerge from
http://svn.agavi.org/branches/1.0

........

r2974 | david | 2008-10-02 20:08:39 +0200 (Thu, 02 Oct 2008) | 1 line


merge [2967:2973/branches/0.11]

........

r2978 | david | 2008-10-06 18:27:18 +0200 (Mon, 06 Oct 2008) | 1 line


refs #870: Configuration files with old-style handlers are never validated

........

Location:
branches/felix-testing-implementation
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • branches/felix-testing-implementation

    • Property svnmerge-integrated changed from /branches/1.0:1-2892,2894-2968 /branches/dominik-validation-argument-sources:1-2979 to /branches/1.0:1-2892,2894-2980 /branches/dominik-validation-argument-sources:1-2979

  • branches/felix-testing-implementation/CHANGELOG

    r2969 r2981  
    55------------------------------- 
    66 
     7FIX: Configuration files with old-style handlers are never validated (#870) (David) 
    78FIX: Per-module config_handlers.xml will cause "unsupported operand types" fatal error with debug mode off (#867) (David) 
    89FIX: AgaviXmlConfigDomElement::hasChild() does not pass on $namespaceUri argument (#865) (David) 
    … …  
    8384ADD: Allow specifying of doctrine template implementations (#864) (David, TANAKA Koichi) 
    8485 
     86FIX: Default autoload.xml is missing AgaviMysqliDatabase entry (#868) (David) 
    8587FIX: SOAP and XMLRPC test scripts in sample app are broken (#866) (David) 
    8688FIX: Certain validator names will cause a fatal error (#863) (David) 

  • branches/felix-testing-implementation/src/config/AgaviConfigCache.class.php

    r2969 r2981  
    116116    } else { 
    117117      $validationFile = null; 
    118       if(isset($handlerInfo['validations'][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0])) { 
    119         $validationFile = $handlerInfo['validations'][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0]; 
     118      if(isset($handlerInfo['validations'][AgaviXmlConfigParser::STAGE_SINGLE][AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0])) { 
     119        $validationFile = $handlerInfo['validations'][AgaviXmlConfigParser::STAGE_SINGLE][AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0]; 
    120120      } 
    121121      $handler->initialize($validationFile, null, $handlerInfo['parameters']); 

  • branches/felix-testing-implementation/src/config/AgaviConfigParser.class.php

    r2648 r2981  
    5959    ); 
    6060    if($validationFile !== null) { 
    61       $validation[AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][] = array($validationFile); 
     61      $validation[AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][] = $validationFile; 
    6262    } 
    6363    $doc = $parser->execute(array(), $validation); 

  • branches/felix-testing-implementation/src/config/defaults/autoload.xml

    r2925 r2981  
    7373      <autoload name="AgaviDoctrineDatabase">%core.agavi_dir%/database/AgaviDoctrineDatabase.class.php</autoload> 
    7474      <autoload name="AgaviMysqlDatabase">%core.agavi_dir%/database/AgaviMysqlDatabase.class.php</autoload> 
     75      <autoload name="AgaviMysqliDatabase">%core.agavi_dir%/database/AgaviMysqliDatabase.class.php</autoload> 
    7576      <autoload name="AgaviPdoDatabase">%core.agavi_dir%/database/AgaviPdoDatabase.class.php</autoload> 
    7677      <autoload name="AgaviPostgresqlDatabase">%core.agavi_dir%/database/AgaviPostgresqlDatabase.class.php</autoload>