Changeset 1494

Timestamp:

01/13/07 19:32:37 (2 years ago)

Author:

david

Message:

more execution flow refactoring: removed merge/export/import/lock nonsense from responses. execution containers can now be created with an output type, forwards done now by returning an array from the view instead of an exec container (not sure if we'll keep that). slots and global response stuff todo. refs #373

Location:

branches/david-execution_flow/src

Files:

• controller/AgaviController.class.php (modified) (3 diffs)
• controller/AgaviExecutionContainer.class.php (modified) (1 diff)
• filter/AgaviExecutionFilter.class.php (modified) (1 diff)
• response/AgaviResponse.class.php (modified) (3 diffs)
• response/AgaviWebResponse.class.php (modified) (1 diff)
• response/AgaviXmlrpcepiphpResponse.class.php (modified) (2 diffs)

branches/david-execution_flow/src/controller/AgaviController.class.php

@@ -119 +119 @@
    * @param      string The name of the action.
    * @param      array  Optional additional parameters.
+   * @param      string The name of the initial output type to set.
    *
    * @return     AgaviExecutionContainer A new execution container instance,
@@ -126 +127 @@
    * @since      0.11.0
    */
-  public function createExecutionContainer($moduleName = null, $actionName = null, array $parameters = array())
+  public function createExecutionContainer($moduleName = null, $actionName = null, array $parameters = array(), AgaviOutputType $outputType = null)
   {
     // create a new filter chain
@@ -135 +136 @@
     $container->setActionName($actionName);
     $container->setParameters($parameters);
+    $container->setOutputType($outputType === null ? $this->context->getController()->getOutputType() : $outputType);
     return $container;
   }

branches/david-execution_flow/src/controller/AgaviExecutionContainer.class.php

@@ -98 +98 @@
     $this->response = new $rfi['class'];
     $this->response->initialize($this->context, $rfi['parameters']);
-    
-    $this->outputType = $context->getController()->getOutputType();
   }
   

branches/david-execution_flow/src/filter/AgaviExecutionFilter.class.php

@@ -366 +366 @@
         $request->toggleLock($key);
         
-        if($next instanceof AgaviExecutionContainer) {
-          $container->setNext($next);
+        if(is_array($next) && count($next) >= 2) {
+          $container->setNext($controller->createExecutionContainer($next[0], $next[1], isset($next[2]) ? $next[2] : array(), isset($next[3]) ? ($next[3] instanceof AgaviOutputType ? $next[3] : $controller->getOutputType($next[3])) : $container->getOutputType()));
         } else {
           $attributes =& $viewInstance->getAttributes();

branches/david-execution_flow/src/response/AgaviResponse.class.php

@@ -72 +72 @@
   
   /**
-   * Export the contents of this response.
-   *
-   * @return     array An array of data.
-   *
-   * @author     David Zuelke <du@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function export()
-  {
-    return array('content' => $this->getContent(), 'locked' => $this->isLocked());
-  }
-  
-  /**
-   * Export the information data (e.g. HTTP Headers, Cookies) for this response.
-   *
-   * @return     array An array of data.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function exportInfo()
-  {
-    return array('locked' => $this->isLocked());
-  }
-  
-  /**
-   * Import data for this response.
-   *
-   * @param      array An array of data.
-   *
-   * @return     bool Whether or not the operation was successful.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function import(array $data)
-  {
-    $retval = true;
-    if(isset($data['content'])) {
-      $retval = $this->setContent($data['content']);
-    }
-    if(isset($data['locked']) && $data['locked']) {
-      $this->lock();
-    }
-    return $retval;
-  }
-  
-  /**
-   * Merge in data for this response.
-   *
-   * @param      array An array of data.
-   *
-   * @return     bool Whether or not the operation was successful.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function merge(array $data)
-  {
-    // do not lock the response even if $data has locked=true!
-    
-    if(isset($data['content'])) {
-      return $this->appendContent($data['content']);
-    }
-    return true;
-  }
-  
-  /**
-   * Append data to this response.
-   *
-   * @param      array An array of data.
-   *
-   * @return     bool Whether or not the operation was successful.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function append(array $data)
-  {
-    // do not lock the response even if $data has locked=true!
-    
-    if(isset($data['content'])) {
-      return $this->appendContent($data['content']);
-    }
-    return true;
-  }
-  
-  /**
-   * Check if this Response is locked, i.e. whether or not new content and other
-   * output information can be set.
-   *
-   * @return     bool Whether the response is locked.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function isLocked()
-  {
-    return $this->locked;
-  }
-  
-  /**
-   * Lock this Response so that it does not accept any modifications.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function lock()
-  {
-    $this->locked = true;
-  }
-  
-  /**
    * Retrieve the content set for this Response
    *
@@ -209 +96 @@
   public function setContent($content)
   {
-    if(!$this->locked) {
-      $this->content = $content;
-      return true;
-    }
-    return false;
+    $this->content = $content;
+    return true;
   }
   
@@ -256 +140 @@
   public function clearContent()
   {
-    if(!$this->locked) {
-      $this->content = '';
-      return true;
-    }
-    return false;
+    $this->content = '';
+    return true;
   }
   

branches/david-execution_flow/src/response/AgaviWebResponse.class.php

@@ -136 +136 @@
   public function clear()
   {
-    if(!$this->locked) {
-      $this->clearContent();
-      $this->httpHeaders = array();
-      $this->cookies = array();
-    }
-  }
-  
-  /**
-   * Export the contents of this response.
-   *
-   * @return     array An array of data.
-   *
-   * @author     David Zuelke <du@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function export()
-  {
-    return array_merge(parent::export(), array('httpStatusCode' => $this->getHttpStatusCode(), 'httpHeaders' => $this->getHttpHeaders(), 'cookies' => $this->cookies));
-  }
-  
-  /**
-   * Export the information data (e.g. HTTP Headers, Cookies) for this response.
-   *
-   * @return     array An array of data.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function exportInfo()
-  {
-    return array_merge(parent::exportInfo(), array('httpStatusCode' => $this->getHttpStatusCode(), 'httpHeaders' => $this->getHttpHeaders(), 'cookies' => $this->cookies));
-  }
-  
-  /**
-   * Import data for this response.
-   *
-   * @param      array An array of data.
-   *
-   * @return     bool Whether or not the operation was successful.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function import(array $data)
-  {
-    if(!$this->locked) {
-      if(isset($data['httpStatusCode'])) {
-        $this->httpStatusCode = $data['httpStatusCode'];
-      }
-      if(isset($data['httpHeaders'])) {
-        $this->httpHeaders = $data['httpHeaders'];
-      }
-      if(isset($data['cookies'])) {
-        $this->cookies = $data['cookies'];
-      }
-      return parent::import($data) && true;
-    }
-    parent::import($data);
-    return false;
-  }
-  
-  /**
-   * Merge in data for this response.
-   *
-   * @param      array An array of data.
-   *
-   * @return     bool Whether or not the operation was successful.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function merge(array $data)
-  {
-    $retval = parent::merge($data);
-    if(!$this->locked) {
-      if(isset($data['cookies'])) {
-        $this->cookies = array_merge($data['cookies'], $this->cookies);
-      }
-      return $retval && true;
-    }
-    return $retval && false;
-  }
-  
-  /**
-   * Append data to this response.
-   *
-   * @param      array An array of data.
-   *
-   * @return     bool Whether or not the operation was successful.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function append(array $data)
-  {
-    $retval = parent::append($data);
-    if(!$this->locked) {
-      if(isset($data['httpStatusCode'])) {
-        $this->httpStatusCode = $data['httpStatusCode'];
-      }
-      if(isset($data['httpHeaders'])) {
-        $this->httpHeaders = array_merge($this->httpHeaders, $data['httpHeaders']);
-      }
-      if(isset($data['cookies'])) {
-        $this->cookies = array_merge($this->cookies, $data['cookies']);
-      }
-      return $retval && true;
-    }
-    return $retval && false;
+    $this->clearContent();
+    $this->httpHeaders = array();
+    $this->cookies = array();
   }
   

branches/david-execution_flow/src/response/AgaviXmlrpcepiphpResponse.class.php

@@ -91 +91 @@
   public function clearContent()
   {
-    if(!$this->locked) {
-      $this->content = array();
-      return true;
-    }
-    return false;
+    $this->content = array();
+    return true;
   }
   
@@ -126 +123 @@
   public function clear()
   {
-    if(!$this->locked) {
-      $this->clearContent();
-      $this->httpHeaders = array();
-      $this->cookies = array();
-    }
+    $this->clearContent();
+    $this->httpHeaders = array();
+    $this->cookies = array();
   }
 }