Changeset 2550

Timestamp:

07/01/08 09:53:34 (6 months ago)

Author:

david

Message:

merge [2519:2549/branches/0.11]

Location:

trunk

Files:

• CHANGELOG (modified) (4 diffs)
• RELEASE_NOTES (modified) (1 diff)
• etc/phing/AgaviPackageTask.php (modified) (1 diff)
• etc/propel (deleted)
• src/config/AgaviCachingConfigHandler.class.php (modified) (2 diffs)
• src/config/defaults/autoload.xml (modified) (1 diff)
• src/controller/AgaviController.class.php (modified) (2 diffs)
• src/core/AgaviContext.class.php (modified) (6 diffs)
• src/database/AgaviDoctrineDatabase.class.php (modified) (1 diff)
• src/exception/templates/plaintext.php (modified) (1 diff)
• src/exception/templates/shiny.php (modified) (3 diffs)
• src/filter/AgaviExecutionFilter.class.php (modified) (2 diffs)
• src/filter/AgaviFormPopulationFilter.class.php (modified) (10 diffs)
• src/logging/AgaviFileLoggerAppender.class.php (modified) (4 diffs)
• src/logging/AgaviLoggerAppender.class.php (modified) (4 diffs)
• src/logging/AgaviStderrLoggerAppender.class.php (modified) (2 diffs)
• src/logging/AgaviStdoutLoggerAppender.class.php (modified) (2 diffs)
• src/logging/AgaviStreamLoggerAppender.class.php (copied) (copied from branches/0.11/src/logging/AgaviStreamLoggerAppender.class.php)
• src/routing/AgaviRouting.class.php (modified) (5 diffs)
• src/user/AgaviSecurityUser.class.php (modified) (2 diffs)
• src/validator/AgaviStringValidator.class.php (modified) (1 diff)
• src/validator/AgaviValidationManager.class.php (modified) (2 diffs)
• tests2/routing/RoutingTest.php (modified) (1 diff)
• tests2/routing/WebRoutingTest.php (modified) (1 diff)

trunk/CHANGELOG

@@ -17 +17 @@
 
 
-0.11.2 RC1 (June ??, 2008)
+0.11.2 RC2 (July ?, 2008)
 --------------------------
 
+FIX: Exception templates incorrectly fix information about exception origin (#790) (David)
+FIX: Markup is escaped by accident in shiny exception template (#791) (David)
+FIX: Using '#' in a routing pattern triggers a warning (#789) (Dominik)
+
+
+0.11.2 RC1 (June 27, 2008)
+--------------------------
+
+ADD: Support trimming of input string in AgaviStringValidator (#745) (David)
+ADD: Add support for native doctrine model autoloading (#759) (David)
+ADD: Add support for doctrine manager attributes (#783) (David)
+ADD: Add SecurityUser::hasCredential and SecurityUser::getCredentials for convenience (Noah) (#772)
 ADD: Add convenience methods to AgaviUploadedFile (#607) (David)
 ADD: Allow arrays as values for web request sources. (#675) (David)
@@ -26 +38 @@
 ADD: Allow nested routing structures with concatenated name or action attributes in ancestors other than immediate parents (Dominik) (#764)
 
+CHG: AgaviController::dispatch() should accept module and action names in the request data argument with routing disabled (#776) (David)
+CHG: Routing should not just bail out of execute() if routing is enabled, but no routes are defined (#779) (David)
+CHG: Refactor AgaviContext::initialize() and the passing of "profile" (#778) (David)
+CHG: Arguments passed to AgaviController::dispatch() should have precedence over routing results (#777) (David)
+CHG: Introduce generic AgaviStreamLoggerAppender (#773) (David)
+CHG: Make AgaviLoggerAppender an AgaviParameterHolder (#774) (David)
 CHG: Change error class handling in FPF to set classes on elements returned by the respective XPath expressions, not the original elements (#768) (David)
 CHG: Use file locking everywhere files are written (Dominik) (#766)
 
+FIX: AgaviValidationManager::hasError() is inconsistent with AgaviValidationManager::getError() regarding severity (#784) (David)
+FIX: Routing tests do not reset core.use_routing in tearDown() (#781) (David)
+FIX: stdout/stderror log appenders are broken (#751) (David)
+FIX: Caching configuration blocks might be merged incorrectly (#755) (David)
+FIX: Caching and validation configurations cannot be per-context (#754) (David)
 FIX: Form Population Filter incorrectly inserts XML prolog into HTML documents (#771) (David)
 FIX: Calling move() twice on the same uploaded file will cause a bogus exception (#770) (David)
@@ -227 +250 @@
 FIX: WebRouting::gen() ignores 'separator' option when generating existing routes (#545) (David)
 FIX: <route action=".Something" /> confuses template location code (#540) (David)
-FIX: AgaviPropelDatabase returns null in getConnection when used with Propel 1.2 (#538) (Dominik) 
+FIX: AgaviPropelDatabase returns null in getConnection when used with Propel 1.2 (#538) (Dominik)
 FIX: "shiny" exception template may generate invalid markup if HTML is at first line of code snippet (#537) (David)
 FIX: AgaviToolkit::expandVariables() skips null arguments (#536) (David)
@@ -644 +667 @@
 
 - Initial Release
-

trunk/RELEASE_NOTES

@@ -33 +33 @@
 
 - Validation severity "none" is now called "silent".
+
+
+Version 0.11.2 - July ??, 2008
+==============================
+
+This maintenance release fixes a number of bugs, comes with several changes to improve consistency, and also features a couple of new features. Some of these include:
+
+- AgaviStringValidator can now trim an input string.
+- AgaviDoctrineDatabase has been improved.
+- <setting> elements in settings.xml can now be arrays by using <parameter>s.
+- Data returned from a View is now available through $inner in the first template.
+- File locking is now used anywhere files are being written (config compilation, caching).
+- AgaviValidationManager::hasError() behavior was fixed to be consistent with getError().
+
+As always, the CHANGELOG has a comprehensive list of changes.
 
 

trunk/etc/phing/AgaviPackageTask.php

@@ -102 +102 @@
     $p2->setPackageType('php');
     $p2->setPackage('agavi');
-    $p2->addMaintainer('lead', 'david', 'David Zülke', 'dz@bitxtender.com');
-    $p2->addMaintainer('developer', 'dominik', 'Dominik del Bondio', 'ddb@bitxtender.com');
+    $p2->addMaintainer('lead', 'david', 'David Zülke', 'david.zuelke@bitextender.com');
+    $p2->addMaintainer('developer', 'dominik', 'Dominik del Bondio', 'dominik.del.bondio@bitextender.com');
+    $p2->addMaintainer('developer', 'impl', 'Noah Fontes', 'impl@cynigram.com');
     $p2->addMaintainer('developer', 'v-dogg', 'Veikko Mäkinen', 'mail@veikkomakinen.com');
     $p2->setChannel('pear.agavi.org');

trunk/src/config/AgaviCachingConfigHandler.class.php

@@ -57 +57 @@
     foreach($configurations as $cfg) {
       foreach($cfg->cachings as $caching) {
-        if(!AgaviToolkit::literalize($caching->getAttribute('enabled', true))) {
-          continue;
-        }
-        
         $groups = array();
         if(isset($caching->groups)) {
@@ -144 +140 @@
         $methods = array_map('trim', explode(' ', $caching->getAttribute('method', '*')));
         foreach($methods as $method) {
-          $cachings[$method] = array(
-            'lifetime' => $caching->getAttribute('lifetime'),
-            'groups' => $groups,
-            'views' => $views,
-            'action_attributes' => $actionAttributes,
-            'output_types' => $outputTypes,
-          );
+          if(!AgaviToolkit::literalize($caching->getAttribute('enabled', true))) {
+            unset($cachings[$method]);
+          } else {
+            $values = array(
+              'lifetime' => $caching->getAttribute('lifetime'),
+              'groups' => $groups,
+              'views' => $views,
+              'action_attributes' => $actionAttributes,
+              'output_types' => $outputTypes,
+            );
+            $cachings[$method] = $values;
+          }
         }
       }

trunk/src/config/defaults/autoload.xml

@@ -116 +116 @@
       <autoload name="AgaviStderrLoggerAppender">%core.agavi_dir%/logging/AgaviStderrLoggerAppender.class.php</autoload>
       <autoload name="AgaviStdoutLoggerAppender">%core.agavi_dir%/logging/AgaviStdoutLoggerAppender.class.php</autoload>
+      <autoload name="AgaviStreamLoggerAppender">%core.agavi_dir%/logging/AgaviStreamLoggerAppender.class.php</autoload>
       <autoload name="AgaviTimestampLoggerLayout">%core.agavi_dir%/logging/AgaviTimestampLoggerLayout.class.php</autoload>
 

trunk/src/controller/AgaviController.class.php

@@ -165 +165 @@
   public function dispatch(AgaviRequestDataHolder $arguments = null)
   {
+    $container = null;
+    
     try {
       
-      $requestData = $this->context->getRequest()->getRequestData();
-      if($arguments !== null) {
-        $requestData->merge($arguments);
-      }
+      $rq = $this->context->getRequest();
+      $rd = $rq->getRequestData();
       
       // match routes and assign returned initial execution container
       $container = $this->context->getRouting()->execute();
       
+      // merge in any arguments given. they need to have precedence over what the routing found
+      if($arguments !== null) {
+        $rd->merge($arguments);
+      }
+      
+      // next, we have to see if the routing did anything useful, i.e. whether or not it was enabled.
       $moduleName = $container->getModuleName();
       $actionName = $container->getActionName();
-      
-      if($moduleName == null) {
-        // no module has been specified
-        $container->setModuleName(AgaviConfig::get('actions.default_module'));
-        $container->setActionName(AgaviConfig::get('actions.default_action'));
+      if(!$moduleName) {
+        // no module has been specified; that means the routing did not run, as it would otherwise have the 404 action's module name
+        
+        // lets see if our request data has values for module and action
+        $ma = $rq->getParameter('module_accessor');
+        $aa = $rq->getParameter('action_accessor');
+        if($rd->hasParameter($ma) && $rd->hasParameter($aa)) {
+          // yup. grab those
+          $moduleName = $rd->getParameter($ma);
+          $actionName = $rd->getParameter($aa);
+        } else {
+          // nope. then its time for the default action
+          $moduleName = AgaviConfig::get('actions.default_module');
+          $actionName = AgaviConfig::get('actions.default_action');
+        }
+        
+        // so by now we hopefully have something reasonable for module and action names - let's set them on the container
+        $container->setModuleName($moduleName);
+        $container->setActionName($actionName);
       }
       
@@ -207 +227 @@
       
     } catch(Exception $e) {
-      if(isset($container) && $container instanceof AgaviExecutionContainer) {
-        AgaviException::printStackTrace($e, $this->context, $container);
-      } else {
-        AgaviException::printStackTrace($e, $this->context);
-      }
+      AgaviException::printStackTrace($e, $this->context, $container);
     }
   }

trunk/src/core/AgaviContext.class.php

@@ -87 +87 @@
   /**
    * @var        AgaviTranslationManager A TranslationManager instance.
-   * @since      0.11.0
    */
   protected $translationManager = null;
@@ -112 +111 @@
 
   /**
-   * Clone method, overridden to prevent cloning, there can be only one. 
-   *
-   * @author     Mike Vincent <mike@agavi.org>  
+   * Clone method, overridden to prevent cloning, there can be only one.
+   *
+   * @author     Mike Vincent <mike@agavi.org>
    * @since      0.9.0
    */
@@ -120 +119 @@
   {
     trigger_error('Cloning an AgaviContext instance is not allowed.', E_USER_ERROR);
-  } 
-
-  /**
-   * Constuctor method, intentionally made private so the context cannot be 
+  }
+
+  /**
+   * Constuctor method, intentionally made private so the context cannot be
    * created directly.
    *
-   * @author     Mike Vincent <mike@agavi.org>  
-   * @since      0.9.0
-   */
-  private function __construct() 
-  {
-    // Singleton, setting up the class happens in initialize()
+   * @param      string The name of this context.
+   *
+   * @author     David Zülke <dz@bitxtender.com>
+   * @author     Mike Vincent <mike@agavi.org>
+   * @since      0.9.0
+   */
+  private function __construct($name)
+  {
+    $this->name = $name;
   }
 
@@ -245 +247 @@
       if(!isset(self::$instances[$profile])) {
         $class = __CLASS__;
-        self::$instances[$profile] = new $class;
-        self::$instances[$profile]->initialize($profile);
+        self::$instances[$profile] = new $class($profile);
+        self::$instances[$profile]->initialize();
       }
       return self::$instances[$profile];
@@ -271 +273 @@
    * (re)Initialize the AgaviContext instance.
    *
-   * @param      string A name corresponding to a section of the config
-   *
    * @author     Dominik del Bondio <ddb@bitxtender.com>
    * @author     David Zülke <dz@bitxtender.com>
@@ -278 +278 @@
    * @since      0.10.0
    */
-  public function initialize($profile = null)
-  {
-    if($profile === null) {
-      $profile = AgaviConfig::get('core.default_context', 'stdctx');
-    }
-    
-    $profile = strtolower($profile);
-    
-    $this->name = $profile;
-    
+  public function initialize()
+  {
     try {
-      include(AgaviConfigCache::checkConfig(AgaviConfig::get('core.config_dir') . '/factories.xml', $profile));
+      include(AgaviConfigCache::checkConfig(AgaviConfig::get('core.config_dir') . '/factories.xml', $this->name));
     } catch(Exception $e) {
       AgaviException::printStackTrace($e, $this);

trunk/src/database/AgaviDoctrineDatabase.class.php

@@ -116 +116 @@
       }
       
+      foreach((array)$this->getParameter('manager_attributes', array()) as $attributeName => $attributeValue) {
+        $this->doctrineManager->setAttribute($attributeName, $attributeValue);
+      }
+      
+      Doctrine::loadModels($this->getParameter('load_models')); 
+      
       foreach((array)$this->getParameter('bind_components', array()) as $componentName) {
         $this->doctrineManager->bindComponent($componentName, $name);

trunk/src/exception/templates/plaintext.php

@@ -33 +33 @@
 // fix stack trace in case it doesn't contain the exception origin as the first entry
 $fixedTrace = $e->getTrace();
-if(isset($fixedTrace[0]['file']) && $fixedTrace[0]['file'] != $e->getFile() && $fixedTrace[0]['line'] != $e->getLine()) {
+if(isset($fixedTrace[0]['file']) && !($fixedTrace[0]['file'] == $e->getFile() && $fixedTrace[0]['line'] == $e->getLine())) {
   $fixedTrace = array_merge(array(array('file' => $e->getFile(), 'line' => $e->getLine())), $fixedTrace);
 }

trunk/src/exception/templates/shiny.php

@@ -102 +102 @@
 // fix stack trace in case it doesn't contain the exception origin as the first entry
 $fixedTrace = $e->getTrace();
-if(isset($fixedTrace[0]['file']) && $fixedTrace[0]['file'] != $e->getFile() && $fixedTrace[0]['line'] != $e->getLine()) {
+if(isset($fixedTrace[0]['file']) && !($fixedTrace[0]['file'] == $e->getFile() && $fixedTrace[0]['line'] == $e->getLine())) {
   $fixedTrace = array_merge(array(array('file' => $e->getFile(), 'line' => $e->getLine())), $fixedTrace);
 }
@@ -579 +579 @@
   }
 ?>
-      <li id="frame<?php echo $i; ?>"<?php if($i > 1): ?> class="hidecode"<?php endif; ?>>at <?php if($i > 1): ?><strong><?php if(isset($trace['class'])): ?><?php echo $trace['class'], htmlspecialchars($trace['type']); ?><?php endif; ?><?php echo $trace['function']; ?><?php if(isset($trace['args'])): ?>(<?php echo buildParamList($trace['args']); ?>)<?php endif; ?></strong><?php else: ?><em>exception origin</em><?php endif; ?><br />in <?php if(isset($trace['file'])): echo htmlspecialchars(str_replace(
+      <li id="frame<?php echo $i; ?>"<?php if($i != 2): ?> class="hidecode"<?php endif; ?>>at <?php if($i > 1): ?><strong><?php if(isset($trace['class'])): ?><?php echo $trace['class'], htmlspecialchars($trace['type']); ?><?php endif; ?><?php echo $trace['function']; ?><?php if(isset($trace['args'])): ?>(<?php echo buildParamList($trace['args']); ?>)<?php endif; ?></strong><?php else: ?><em>exception origin</em><?php endif; ?><br />in <?php if(isset($trace['file'])): echo str_replace(
       array(
         '_' . AgaviConfig::get('core.module_dir', 'something totally random'),
@@ -598 +598 @@
         '<abbr title="' . AgaviConfig::get('core.agavi_dir') . '">core.agavi_dir</abbr>',
       ),
-'_' . $trace['file'])); ?> <a href="#frame<?php echo $i; ?>" class="toggle" title="Toggle source code snippet" onclick="this.parentNode.className = this.parentNode.className == 'hidecode' ? '' : 'hidecode'; return false;">line <?php echo $trace['line']; ?></a><ol start="<?php echo $start = $trace['line'] < 4 ? 1 : $trace['line'] - 3; ?>" style="padding-left:<?php echo strlen($start+6)*0.6+2; ?>em"><?php
+'_' . $trace['file']); ?> <a href="#frame<?php echo $i; ?>" class="toggle" title="Toggle source code snippet" onclick="this.parentNode.className = this.parentNode.className == 'hidecode' ? '' : 'hidecode'; return false;">line <?php echo $trace['line']; ?></a><ol start="<?php echo $start = $trace['line'] < 4 ? 1 : $trace['line'] - 3; ?>" style="padding-left:<?php echo strlen($start+6)*0.6+2; ?>em"><?php
 $lines = array_slice($highlights[$trace['file']], $start - 1, 7, true);
 foreach($lines as $key => &$line) {

trunk/src/filter/AgaviExecutionFilter.class.php

@@ -272 +272 @@
       // $lm->log('Caching enabled, configuration file found, loading...');
       // no _once please!
-      include(AgaviConfigCache::checkConfig($cachingDotXml));
+      include(AgaviConfigCache::checkConfig($cachingDotXml, $this->context->getName()));
     }
 
@@ -639 +639 @@
         // load validation configuration
         // do NOT use require_once
-        require(AgaviConfigCache::checkConfig($validationConfig));
+        require(AgaviConfigCache::checkConfig($validationConfig, $this->context->getName()));
       }
 

trunk/src/filter/AgaviFormPopulationFilter.class.php

@@ -47 +47 @@
   const ENCODING_ISO_8859_1 = 'iso-8859-1';
 
+  /**
+   * @var        DOMDocument Our (X)HTML document.
+   */
   protected $doc;
+
+  /**
+   * @var        DOMXPath Our XPath instance for the document.
+   */
   protected $xpath;
-  protected $ns;
+
+  /**
+   * @var        string The XML NS prefix we're working on with XPath, including
+   *                    a colon (or empty string if document has no NS).
+   */
+  protected $xmlnsPrefix = '';
 
   /**
@@ -151 +163 @@
       if($this->doc->documentElement && $this->doc->documentElement->namespaceURI) {
         $this->xpath->registerNamespace('html', $this->doc->documentElement->namespaceURI);
-        $this->ns = 'html:';
+        $this->xmlnsPrefix = 'html:';
       } else {
-        $this->ns = '';
+        $this->xmlnsPrefix = '';
       }
     } else {
       $this->doc->loadHTML($output);
       $this->xpath = new DomXPath($this->doc);
-      $this->ns = '';
+      $this->xmlnsPrefix = '';
     }
 
@@ -187 +199 @@
 
     $properXhtml = false;
-    foreach($this->xpath->query('//' . $this->ns . 'head/' . $this->ns . 'meta') as $meta) {
+    foreach($this->xpath->query(sprintf('//%1$shead/%1$smeta', $this->xmlnsPrefix)) as $meta) {
       if(strtolower($meta->getAttribute('http-equiv')) == 'content-type') {
         if($this->doc->encoding === null) {
@@ -221 +233 @@
     }
 
-    $base = $this->xpath->query('/' . $this->ns . 'html/' . $this->ns . 'head/' . $this->ns . 'base[@href]');
+    $base = $this->xpath->query(sprintf('/%1$shtml/%1$shead/%1$sbase[@href]', $this->xmlnsPrefix));
     if($base->length) {
       $baseHref = $base->item(0)->getAttribute('href');
@@ -234 +246 @@
       foreach(array_keys($populate) as $id) {
         if(is_string($id)) {
-          $query[] = '@id="' . $id . '"';
+          $query[] = sprintf('@id="%s"', $id);
         }
       }
       if($query) {
-        $forms = $this->xpath->query('//' . $this->ns . 'form[' . implode(' or ', $query) . ']');
+        $forms = $this->xpath->query(sprintf('//%1$sform[%2$s]', $this->xmlnsPrefix, implode(' or ', $query)));
       }
     } else {
-      $forms = $this->xpath->query('//' . $this->ns . 'form[@action]');
+      $forms = $this->xpath->query(sprintf('//%1$sform[@action]', $this->xmlnsPrefix));
     }
 
@@ -276 +288 @@
 
       // build the XPath query
-      $query = 'descendant::' . $this->ns . 'textarea[@name] | descendant::' . $this->ns . 'select[@name] | descendant::' . $this->ns . 'input[@name and (not(@type) or @type="text" or (@type="checkbox" and not(contains(@name, "[]"))) or (@type="checkbox" and contains(@name, "[]") and @value) or @type="radio" or @type="password" or @type="file"';
+      $query = sprintf('descendant::%1$stextarea[@name] | descendant::%1$sselect[@name] | descendant::%1$sinput[@name and (not(@type) or @type="text" or (@type="checkbox" and not(contains(@name, "[]"))) or (@type="checkbox" and contains(@name, "[]") and @value) or @type="radio" or @type="password" or @type="file"', $this->xmlnsPrefix);
       if($cfg['include_hidden_inputs']) {
         $query .= ' or @type="hidden"';
@@ -345 +357 @@
           $errorClassElements[] = $element;
           // all implicit labels
-          foreach($this->xpath->query('ancestor::' . $this->ns . 'label[not(@for)]', $element) as $label) {
+          foreach($this->xpath->query(sprintf('ancestor::%1$slabel[not(@for)]', $this->xmlnsPrefix), $element) as $label) {
             $errorClassElements[] = $label;
           }
           // and all explicit labels
           if(($id = $element->getAttribute('id')) != '') {
-            foreach($this->xpath->query('descendant::' . $this->ns . 'label[@for="' . $id . '"]', $form) as $label) {
+            foreach($this->xpath->query(sprintf('descendant::%1$slabel[@for="%2$s"]', $this->xmlnsPrefix, $id), $form) as $label) {
               $errorClassElements[] = $label;
             }
@@ -360 +372 @@
             foreach($cfg['error_class_map'] as $xpathExpression => $errorClassName) {
               // evaluate each xpath expression
-              $errorClassResults = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->ns)), $errorClassElement);
+              $errorClassResults = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $errorClassElement);
               if($errorClassResults && $errorClassResults->length) {
                 // we have results. the xpath expressions are used to locale the actual elements we set the error class on - doesn't necessarily have to be the erroneous element or the label!
@@ -457 +469 @@
           // select elements
           // yes, we still use XPath because there could be OPTGROUPs
-          foreach($this->xpath->query('descendant::' . $this->ns . 'option', $element) as $option) {
+          foreach($this->xpath->query(sprintf('descendant::%1$soption', $this->xmlnsPrefix), $element) as $option) {
             $option->removeAttribute('selected');
             if($p->hasParameter($pname) && ($option->getAttribute('value') === $value || ($multiple && is_array($value) && in_array($option->getAttribute('value'), $value)))) {
@@ -633 +645 @@
     $insertSuccessful = false;
     foreach($rules as $xpathExpression => $errorMessageInfo) {
-      $targets = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->ns)), $element);
+      $targets = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $element);
 
       if(!$targets || !$targets->length) {

trunk/src/logging/AgaviFileLoggerAppender.class.php

@@ -20 +20 @@
  * @subpackage logging
  *
+ * @author     David Zülke <dz@bitxtender.com>
  * @author     Bob Zoller <bob@agavi.org>
  * @copyright  Authors
@@ -28 +29 @@
  * @version    $Id$
  */
-class AgaviFileLoggerAppender extends AgaviLoggerAppender
+class AgaviFileLoggerAppender extends AgaviStreamLoggerAppender
 {
-  /**
-   * @var        The resource of the file this appender is writing to.
-   */
-  protected $handle = null;
-
-  /**
-   * @var        The name of the file this appender is writing to.
-   */
-  protected $filename = '';
-
   /**
    * Initialize the object.
@@ -51 +42 @@
   public function initialize(AgaviContext $context, array $parameters = array())
   {
+    // for < 0.11.2 BC
+    if(isset($parameters['file'])) {
+      $parameters['destination'] = $parameters['file'];
+      unset($parameters['file']);
+    }
+    
     parent::initialize($context, $parameters);
 
-    if(isset($parameters['file'])) {
-      $this->filename = $parameters['file'];
-    }
   }
 
@@ -71 +65 @@
   protected function getHandle()
   {
-    if(is_null($this->handle)) {
-      if(!is_writable(dirname($this->filename)) || (file_exists($this->filename) && !is_writable($this->filename)) || !$this->handle = fopen($this->filename, 'a')) {
-        throw new AgaviLoggingException('Cannot open file "' . $this->filename . '", please check permissions on file or directory.');
-      }
+    $destination = $this->getParameter('destination');
+    if(is_null($this->handle) && (!is_writable(dirname($destination)) || (file_exists($destination) && !is_writable($destination)))) {
+      throw new AgaviLoggingException('Cannot open file "' . $destination . '", please check permissions on file or directory.');
     }
-    return $this->handle;
-  }
-
-  /**
-   * Execute the shutdown procedure.
-   *
-   * If open, close the filehandle.