Changeset 2205

Timestamp:

12/06/07 02:46:59 (13 months ago)

Author:

david

Message:

Fixed an issue where output types of forwards were not honored completely. Closes #629. Also redone the global request data locking during template rendering and fixed global request data serialization in execution containers. Closes #628 and #633.
This change adds an output type member to response. Use that to check for the actual response content type, not the one in the execution container - it's more reliable. See changes done to FPF and ETF in this commit.

Location:

branches/0.11/src

Files:

• controller/AgaviController.class.php (modified) (1 diff)
• controller/AgaviExecutionContainer.class.php (modified) (5 diffs)
• filter/AgaviExecutionFilter.class.php (modified) (4 diffs)
• filter/AgaviExecutionTimeFilter.class.php (modified) (1 diff)
• filter/AgaviFormPopulationFilter.class.php (modified) (1 diff)
• response/AgaviResponse.class.php (modified) (4 diffs)
• response/AgaviWebResponse.class.php (modified) (1 diff)

branches/0.11/src/controller/AgaviController.class.php

@@ -195 +195 @@
       
       if($this->getParameter('send_response')) {
-        $response->send($container->getOutputType());
+        $response->send();
       }
       

branches/0.11/src/controller/AgaviExecutionContainer.class.php

@@ -120 +120 @@
     $this->outputTypeName = $this->outputType->getName();
     $arr = get_object_vars($this);
-    unset($arr['context'], $arr['outputType'], $arr['requestData']);
+    unset($arr['context'], $arr['outputType'], $arr['requestData'], $arr['globalRequestData']);
     return array_keys($arr);
   }
@@ -137 +137 @@
     $this->context = AgaviContext::getInstance($this->contextName);
     $this->outputType = $this->context->getController()->getOutputType($this->outputTypeName);
-    $rq = $this->context->getRequest();
-    if($rq->isLocked()) {
-      $this->requestData = new AgaviRequestDataHolder();
-    } else {
-      $this->requestData = $rq->getRequestData();
+    try {
+      $this->globalRequestData = $this->context->getRequest()->getRequestData();
+    } catch(AgaviException $e) {
+      $this->globalRequestData = new AgaviRequestDataHolder();
     }
     unset($this->contextName, $this->outputTypeName);
@@ -162 +161 @@
 
     $this->parameters = $parameters;
+
+    $rfi = $this->context->getFactoryInfo('response');
+    $this->response = new $rfi['class'];
+    $this->response->initialize($this->context, $rfi['parameters']);
   }
 
@@ -481 +484 @@
   {
     $this->response = $response;
+    // do not set the output type on the response here!
   }
 
@@ -507 +511 @@
   {
     $this->outputType = $outputType;
+    if($this->response) {
+      $this->response->setOutputType($outputType);
+    }
   }
 

branches/0.11/src/filter/AgaviExecutionFilter.class.php

@@ -302 +302 @@
     }
 
-    // create a new response instance for this action
-    $rfi = $this->context->getFactoryInfo('response');
-    $response = new $rfi['class'];
-    $response->initialize($this->context, $rfi['parameters']);
-    $container->setResponse($response);
+    // clear the response
+    $response = $container->getResponse();
+    $response->clear();
 
     // clear any forward set, it's ze view's job
@@ -435 +433 @@
         $attributes =& $viewInstance->getAttributes();
 
-        // lock the request. doing it here for all runs is fine, and quicker too
-        $key = $request->toggleLock();
         // $lm->log('Starting rendering...');
         for($i = 0; $i < count($layers); $i++) {
@@ -469 +465 @@
             'view' => $viewInstance,
           );
+          // lock the request. can't be done outside the loop for the whole run, see #628
+          $key = $request->toggleLock();
           $nextOutput = $layer->getRenderer()->render($layer, $attributes, $output, $moreAssigns);
+          // and unlock the request again
+          $request->toggleLock($key);
 
           $response->setContent($nextOutput);
@@ -480 +480 @@
           $output[$layer->getName()] = $nextOutput;
         }
-        // and unlock the request again
-        $request->toggleLock($key);
       }
 

branches/0.11/src/filter/AgaviExecutionTimeFilter.class.php

@@ -64 +64 @@
     $filterChain->execute($container);
     
-    $outputTypes = (array) $this->getParameter('output_types');
-    if(is_array($outputTypes) && !in_array($container->getOutputType()->getName(), $outputTypes)) {
-      return;
-    }
-    
     $response = $container->getResponse();
     
-    if(!$response->isContentMutable()) {
+    $outputTypes = (array) $this->getParameter('output_types');
+    if(!$response->isContentMutable() || (is_array($outputTypes) && !in_array($response->getOutputType()->getName(), $outputTypes))) {
       return;
     }

branches/0.11/src/filter/AgaviFormPopulationFilter.class.php

@@ -78 +78 @@
     $cfg = $rq->getAttributes('org.agavi.filter.FormPopulationFilter');
 
-    $ot = $container->getOutputType();
+    $ot = $response->getOutputType();
 
     if(is_array($cfg['output_types']) && !in_array($ot->getName(), $cfg['output_types'])) {

branches/0.11/src/response/AgaviResponse.class.php

@@ -41 +41 @@
   
   /**
+   * @var        AgaviOutputType The output type of this response.
+   */
+  protected $outputType = null;
+  
+  /**
    * Pre-serialization callback.
    *
@@ -50 +55 @@
   public function __sleep()
   {
+    $vars = get_object_vars($this);
+    $also = array();
+    
     $this->contextName = $this->context->getName();
+    unset($vars['context']);
+    $also[] = 'contextName';
+    
+    if($this->outputType) {
+      $this->outputTypeName = $this->outputType->getName();
+      unset($vars['outputType']);
+      $also[] = 'outputTypeName';
+    }
+    
     if(is_resource($this->content)) {
       $this->contentStreamMeta = stream_get_meta_data($this->content);
-    }
-    $arr = get_object_vars($this);
-    unset($arr['context']);
-    if(isset($this->contentStreamMeta)) {
-      unset($arr['content']);
-    }
-    return array_keys($arr);
+      unset($vars['content']);
+      $also[] = 'contentStreamMeta';
+    }
+    
+    return array_merge(array_keys($vars), $also);
   }
   
@@ -74 +89 @@
     $this->context = AgaviContext::getInstance($this->contextName);
     unset($this->contextName);
+    
+    if(isset($this->outputTypeName)) {
+      $this->outputType = $this->context->getController()->getOutputType($this->outputTypeName);
+      unset($this->outputTypeName);
+    }
+    
     if(isset($this->contentStreamMeta)) {
       // contrary to what the documentation says, stream_get_meta_data() will not return a list of filters attached to the stream, so we cannot restore these, unfortunately.
@@ -107 +128 @@
     $this->context = $context;
     $this->setParameters($parameters);
+  }
+  
+  /**
+   * Get the Output Type to use with this response.
+   *
+   * @return     AgaviOutputType The Output Type instance associated with.
+   *
+   * @author     David Zülke <dz@bitxtender.com>
+   * @since      0.11.1
+   */
+  public function getOutputType()
+  {
+    return $this->outputType;
+  }
+  
+  /**
+   * Set the Output Type to use with this response.
+   *
+   * @param      AgaviOutputType The Output Type instance to associate with.
+   *
+   * @author     David Zülke <dz@bitxtender.com>
+   * @since      0.11.1
+   */
+  public function setOutputType(AgaviOutputType $outputType)
+  {
+    $this->outputType = $outputType;
+  }
+  
+  /**
+   * Clear the Output Type to use with this response.
+   *
+   * @author     David Zülke <dz@bitxtender.com>
+   * @since      0.11.1
+   */
+  public function clearOutputType()
+  {
+    $this->outputType = null;
   }
   

branches/0.11/src/response/AgaviWebResponse.class.php

@@ -592 +592 @@
   protected function sendHttpResponseHeaders(AgaviOutputType $outputType = null)
   {
+    if($outputType === null) {
+      $outputType = $this->getOutputType();
+    }
+    
     $file = $line = '';
     if(headers_sent($file, $line)) {