Development

Changeset 6499

You must first sign up to be able to contribute.

Changeset 6499

Show
Ignore:
Timestamp:
12/14/07 09:19:40 (9 months ago)
Author:
fabien
Message:

moved filters configuration loading to the sfFilterChain class

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/controller/sfController.class.php

    r5231 r6499  
    247247      // create a new filter chain 
    248248      $filterChain = new sfFilterChain(); 
    249  
    250       require(sfConfigCache::getInstance()->checkConfig(sfConfig::get('sf_app_module_dir_name').'/'.$moduleName.'/'.sfConfig::get('sf_app_module_config_dir_name').'/filters.yml')); 
     249      $filterChain->loadConfiguration($actionInstance); 
    251250 
    252251      $this->context->getEventDispatcher()->notify(new sfEvent($this, 'controller.change_action', array('module' => $moduleName, 'action' => $actionName))); 

  • trunk/lib/filter/sfFilterChain.class.php

    r4951 r6499  
    2424    $chain = array(), 
    2525    $index = -1; 
     26 
     27  /** 
     28   * Loads filters configuration for a given action instance. 
     29   * 
     30   * @param sfComponent A sfComponent instance 
     31   */ 
     32  public function loadConfiguration($actionInstance) 
     33  { 
     34    require(sfConfigCache::getInstance()->checkConfig(sfConfig::get('sf_app_module_dir_name').'/'.$actionInstance->getModuleName().'/'.sfConfig::get('sf_app_module_config_dir_name').'/filters.yml')); 
     35  } 
    2636 
    2737  /** 

  • trunk/test/unit/config/fixtures/sfFilterConfigHandler/result.php

    r4957 r6499  
    55list($class, $parameters) = (array) sfConfig::get('sf_execution_filter', array('sfExecutionFilter', array ( 
    66))); 
    7 $filter = new $class($this->context, $parameters); 
    8 $filterChain->register($filter); 
     7$filter = new $class(sfContext::getInstance(), $parameters); 
     8$this->register($filter); 
    99 
    1010list($class, $parameters) = (array) sfConfig::get('sf_default_filter', array('defaultFilterClass', null)); 
    11 $filter = new $class($this->context, $parameters); 
    12 $filterChain->register($filter); 
     11$filter = new $class(sfContext::getInstance(), $parameters); 
     12$this->register($filter); 
    1313 
    1414list($class, $parameters) = (array) sfConfig::get('sf_new_filter', array('newFilterClass', array ( 
    1515  'key' => 'value', 
    1616))); 
    17 $filter = new $class($this->context, $parameters); 
    18 $filterChain->register($filter); 
     17$filter = new $class(sfContext::getInstance(), $parameters); 
     18$this->register($filter); 
    1919 
    2020list($class, $parameters) = (array) sfConfig::get('sf_rendering_filter', array('sfRenderingFilter', array ( 
    2121  'key' => 'value', 
    2222))); 
    23 $filter = new $class($this->context, $parameters); 
    24 $filterChain->register($filter); 
     23$filter = new $class(sfContext::getInstance(), $parameters); 
     24$this->register($filter); 
    2525