From a77f444bbc8059c0bededc47a50f8fd9c05a1549 Mon Sep 17 00:00:00 2001 From: javalizard <> Date: Sun, 18 Apr 2010 01:36:04 +0000 Subject: TComponent- adds a blank __construct function to unify the constructor call path for all objects. TApplication- Adds final attribute to the parameters in the config so folder config.xml cannot override if set to true. Adds a mergeParameter function to unify parameter setting. Fixed a bug where loadParametersPhp wasn't getting the properties correctly. TControl- calls the parent::__construct, Adds render blocking. (the PRADO class using this will be added in a week or two) TParameterModule- Adds final attribute to the parameter option so folder configs cannot override if set to true. Uses the application mergeParameter function. Adds final to the php parameter loader --- framework/TApplication.php | 93 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 70 insertions(+), 23 deletions(-) (limited to 'framework/TApplication.php') diff --git a/framework/TApplication.php b/framework/TApplication.php index 2eba65fb..0a028141 100644 --- a/framework/TApplication.php +++ b/framework/TApplication.php @@ -218,6 +218,10 @@ class TApplication extends TComponent * @var TMap list of application parameters */ private $_parameters; + /** + * @var TMap list of final application parameters + */ + private $_parametersfinal; /** * @var string configuration file */ @@ -320,6 +324,7 @@ class TApplication extends TComponent * will be looked for. If found, the file is considered as the application * configuration file. * @param boolean whether to cache application configuration. Defaults to true. + * @param string The type of configuration te app should have. Defaults to {@link CONFIG_TYPE_XML}. * @throws TConfigurationException if configuration file cannot be read or the runtime path is invalid. */ public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML) @@ -335,9 +340,12 @@ class TApplication extends TComponent // generates unique ID by hashing the runtime path $this->_uniqueID=md5($this->_runtimePath); $this->_parameters=new TMap; + $this->_parametersfinal=new TMap; $this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null)); Prado::setPathOfAlias('Application',$this->_basePath); + + parent::__construct(); } /** @@ -982,20 +990,8 @@ class TApplication extends TComponent if(empty($this->_services)) $this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null)); - - // load parameters - foreach($config->getParameters() as $id=>$parameter) - { - if(is_array($parameter)) - { - $component=Prado::createComponent($parameter[0]); - foreach($parameter[1] as $name=>$value) - $component->setSubProperty($name,$value); - $this->_parameters->add($id,$component); - } - else - $this->_parameters->add($id,$parameter); - } + + $this->mergeParameters($config->getParameters()); // load and init modules specified in app config $modules=array(); @@ -1036,6 +1032,47 @@ class TApplication extends TComponent } } } + + /** + * This will merge the parameters into the application + * The parameter looks like this: + * + * $params = array( + * // type = 0 is a class + * 'paramname1' => array('type'=>0, 'class' => $type, 'properties' => $properties->toArray(), + * 'final' => $final, 'value' => $element), + * // type != 0 is a parameter with a value + * 'paramname1' => array('type'=>1, 'value' => $element, 'final' => $final), + * 'paramname2' => array('type'=>2, 'value' => $value, 'final' => $final) + * ); + * + * @param array $parameters the parameters to merge into application + */ + public function mergeParameters($parameters) { + // load parameters + foreach($parameters as $id=>$parameter) + { + if(isset($this->_parametersfinal[$id])) + continue; + + if(!$parameter['type']) + { + $component=Prado::createComponent($parameter['class']); + foreach($parameter['properties'] as $name=>$value) + $component->setSubProperty($name,$value); + if($component instanceof IModule && isset($parameter['value'])) + $component->init($parameter['value']); + $this->_parameters->add($id,$component); + } + else + $this->_parameters->add($id,$parameter['value']); + + // If this parameter is final, and not set yet, set it + if($parameter['final'] && !isset($this->_parametersfinal[$id])) + $this->_parametersfinal->add($id, $parameter['value']); + } + } + /** * Loads configuration and initializes application. @@ -1061,7 +1098,7 @@ class TApplication extends TComponent } else $config=Prado::unserialize(file_get_contents($this->_cacheFile)); - + $this->applyConfiguration($config,false); } @@ -1627,13 +1664,20 @@ class TApplicationConfiguration extends TComponent { if(is_array($parameter)) { + $final = TPropertyValue::ensureBoolean($parameter['final']); + unset($parameter['final']); if(isset($parameter['class'])) { - $type = $parameter['class']; - unset($parameter['class']); - $properties = isset($service['properties']) ? $service['properties'] : array(); + $properties = isset($parameter['properties']) ? $parameter['properties'] : array(); $properties['id'] = $id; - $this->_parameters[$id] = array($type,$properties); + $this->_parameters[$id] = array('type'=>0, 'class' => $parameter['class'], 'properties' => $properties, + 'final' => $final, 'value' => $parameter); + } else { + if(!isset($parameter['value'])) { + $this->_parameters[$id]=array('type'=>1, 'value' => $parameter, 'final' => $final); + } else { + $this->_parameters[$id]=array('type'=>2, 'value' => $value, 'final' => $final); + } } } else @@ -1657,15 +1701,18 @@ class TApplicationConfiguration extends TComponent $properties=$element->getAttributes(); if(($id=$properties->remove('id'))===null) throw new TConfigurationException('appconfig_parameterid_required'); + $final = TPropertyValue::ensureBoolean($properties->remove('final')); if(($type=$properties->remove('class'))===null) { if(($value=$properties->remove('value'))===null) - $this->_parameters[$id]=$element; + $this->_parameters[$id]=array('type'=>1, 'value' => $element, 'final' => $final); else - $this->_parameters[$id]=$value; + $this->_parameters[$id]=array('type'=>2, 'value' => $value, 'final' => $final); + } + else { + $this->_parameters[$id]=array('type'=>0, 'class' => $type, 'properties' => $properties->toArray(), + 'final' => $final, 'value' => $element); } - else - $this->_parameters[$id]=array($type,$properties->toArray()); $this->_empty=false; } else -- cgit v1.2.3