Changeset 7631
- Timestamp:
- 02/27/08 17:18:05 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/config/sfFactoryConfigHandler.class.php
r7626 r7631 81 81 82 82 // parse parameters 83 $parameters = array(); 83 84 if (isset($keys['param'])) 84 85 { 85 $parameters = array(); 86 if (!is_array($keys['param'])) 87 { 88 throw new InvalidArgumentException(sprintf('The "param" key for the "%s" factory must be an array (in %s).', $class, $configFiles[0])); 89 } 90 86 91 foreach ($keys['param'] as $key => $value) 87 92 { … … 89 94 } 90 95 } 91 else92 {93 $parameters = null;94 }95 96 96 97 // append new data … … 106 107 107 108 case 'response': 108 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_response', '%s');\n \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', %s));", $class, is_array($parameters) ? var_export($parameters, true) : 'array()');109 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_response', '%s');\n \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', %s));", $class, var_export($parameters, true)); 109 110 $instances[] = sprintf(" if ('HEAD' == \$this->factories['request']->getMethodName())\n { \n \$this->factories['response']->setHeaderOnly(true);\n }\n"); 110 111 break; … … 123 124 124 125 case 'user': 125 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_user', '%s');\n \$this->factories['user'] = new \$class(\$this->dispatcher, \$this->factories['storage'], array_merge(array('auto_shutdown' => false, 'culture' => \$this->factories['request']->getParameter('sf_culture')), sfConfig::get('sf_factory_user_parameters', %s)));", $class, var_export( is_array($parameters) ? $parameters : array(), true));126 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_user', '%s');\n \$this->factories['user'] = new \$class(\$this->dispatcher, \$this->factories['storage'], array_merge(array('auto_shutdown' => false, 'culture' => \$this->factories['request']->getParameter('sf_culture')), sfConfig::get('sf_factory_user_parameters', %s)));", $class, var_export($parameters, true)); 126 127 break; 127 128 … … 170 171 } 171 172 172 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_routing', '%s');\n %s\n\$this->factories['routing'] = new \$class(\$this->dispatcher, \$cache, array_merge(array('auto_shutdown' => false), sfConfig::get('sf_factory_routing_parameters', %s)));", $class, $cache, var_export( is_array($parameters) ? $parameters : array(), true));173 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_routing', '%s');\n %s\n\$this->factories['routing'] = new \$class(\$this->dispatcher, \$cache, array_merge(array('auto_shutdown' => false), sfConfig::get('sf_factory_routing_parameters', %s)));", $class, $cache, var_export($parameters, true)); 173 174 if (isset($parameters['load_configuration']) && $parameters['load_configuration']) 174 175 { … … 217 218 " \$class = sfConfig::get('sf_factory_logger', '%s');\n \$this->factories['logger'] = new \$class(\$this->dispatcher, array_merge(array('auto_shutdown' => false), sfConfig::get('sf_factory_logger_parameters', %s)));\n". 218 219 " %s" 219 , $class, var_export( is_array($parameters) ? $parameters : array(), true), $loggers);220 , $class, var_export($parameters, true), $loggers); 220 221 break; 221 222 }
