Development

Changeset 2967

You must first sign up to be able to contribute.

Changeset 2967

Show
Ignore:
Timestamp:
12/08/06 10:10:26 (2 years ago)
Author:
fabien
Message:

refactored sfDefineEnvironmentConfigHandler to be more flexible when extending it

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/config/sfDefineEnvironmentConfigHandler.class.php

    r1749 r2967  
    4040 
    4141    // parse the yaml 
    42     $myConfig = $this->parseYamls($configFiles); 
    43  
    44     $myConfig = sfToolkit::arrayDeepMerge( 
    45       isset($myConfig['default']) && is_array($myConfig['default']) ? $myConfig['default'] : array(), 
    46       isset($myConfig['all']) && is_array($myConfig['all']) ? $myConfig['all'] : array(), 
    47       isset($myConfig[sfConfig::get('sf_environment')]) && is_array($myConfig[sfConfig::get('sf_environment')]) ? $myConfig[sfConfig::get('sf_environment')] : array() 
    48     ); 
     42    $myConfig = $this->mergeEnvironment($this->parseYamls($configFiles)); 
    4943 
    5044    $values = array(); 
    …… 
    121115    return $category; 
    122116  } 
     117 
     118  protected function mergeEnvironment($config) 
     119  { 
     120    return sfToolkit::arrayDeepMerge( 
     121      isset($config['default']) && is_array($config['default']) ? $config['default'] : array(), 
     122      isset($config['all']) && is_array($config['all']) ? $config['all'] : array(), 
     123      isset($config[sfConfig::get('sf_environment')]) && is_array($config[sfConfig::get('sf_environment')]) ? $config[sfConfig::get('sf_environment')] : array() 
     124    ); 
     125  } 
    123126}