Changeset 3048

Timestamp:

10/18/08 18:59:29 (3 months ago)

Author:

david

Message:

moved flagging of matching <configuration> blocks so it is performed before single-config transforms, but after pre-transform validations (mainly a BC thing), refs #519

Location:

branches/1.0

Files:

• src/config/AgaviXmlConfigParser.class.php (modified) (1 diff)
• src/config/xsl/config_handlers.xsl (modified) (1 diff)
• tests2/config/ConfigHandlersConfigHandlerTest.php (modified) (1 diff)

branches/1.0/src/config/AgaviXmlConfigParser.class.php

@@ -411 +411 @@
     self::validateXsi($this->doc);
     
+    // validate pre-transformation
+    self::validate($this->doc, $this->environment, $this->context, $validationInfo[AgaviXmlConfigParser::STEP_TRANSFORMATIONS_BEFORE]);
+    
     // mark document for merging
     self::match($this->doc, $this->environment, $this->context);
-    
-    // validate pre-transformation
-    self::validate($this->doc, $this->environment, $this->context, $validationInfo[AgaviXmlConfigParser::STEP_TRANSFORMATIONS_BEFORE]);
     
     if(!AgaviConfig::get('core.skip_config_transformations', false)) {

branches/1.0/src/config/xsl/config_handlers.xsl

@@ -24 +24 @@
     <xsl:element name="{local-name()}" namespace="{$config_handlers_1_0}">
       <xsl:copy-of select="@*[local-name() != 'validate']" />
-      <config_handlers_1_0:validation>
+      <config_handlers_1_0:validation for="single" step="transformations_before">
         <xsl:value-of select="@validate" />
       </config_handlers_1_0:validation>

branches/1.0/tests2/config/ConfigHandlersConfigHandlerTest.php

@@ -62 +62 @@
     $this->assertTrue(isset($handlers[$hf]));
     $this->assertSame('CHCHTestHandler', $handlers[$hf]['class']);
-    $this->assertSame(AgaviConfig::get('core.agavi_dir') . '/config/xsd/routing.xsd', $handlers[$hf]['validations']['single']['transformations_after']['xml_schema'][0]);
+    $this->assertSame(AgaviConfig::get('core.agavi_dir') . '/config/xsd/routing.xsd', $handlers[$hf]['validations']['single']['transformations_before']['xml_schema'][0]);
     $this->assertSame(array('foo' => 'bar', 'dir' => AgaviConfig::get('core.agavi_dir')) , $handlers[$hf]['parameters']);
   }