Changeset 6490
- Timestamp:
- 12/13/07 22:44:39 (2 years ago)
- Files:
-
- trunk/lib/command/sfCommandLogger.class.php (modified) (2 diffs)
- trunk/lib/event/sfEvent.class.php (modified) (3 diffs)
- trunk/lib/i18n/sfI18N.class.php (modified) (2 diffs)
- trunk/lib/log/sfLogger.class.php (modified) (1 diff)
- trunk/lib/plugin/sfSymfonyPluginManager.class.php (modified) (2 diffs)
- trunk/lib/response/sfWebResponse.class.php (modified) (1 diff)
- trunk/lib/routing/sfRouting.class.php (modified) (2 diffs)
- trunk/test/unit/sfEventDispatcherTest.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/command/sfCommandLogger.class.php
r5250 r6490 39 39 public function listenToLogEvent(sfEvent $event) 40 40 { 41 $priority = $event->getParameterHolder()->remove('priority', self::INFO);41 $priority = isset($event['priority']) ? $event['priority'] : self::INFO; 42 42 43 43 $prefix = ''; … … 50 50 } 51 51 52 foreach ($event->getParameter Holder()->getAll() as $message)52 foreach ($event->getParameters() as $message) 53 53 { 54 54 $this->log(sprintf('%s%s', $prefix, $message), $priority); trunk/lib/event/sfEvent.class.php
r5016 r6490 17 17 * @version SVN: $Id$ 18 18 */ 19 class sfEvent 19 class sfEvent implements ArrayAccess 20 20 { 21 21 protected 22 $value 23 $processed 24 $subject 25 $name 26 $parameter Holder= null;22 $value = null, 23 $processed = false, 24 $subject = null, 25 $name = '', 26 $parameters = null; 27 27 28 28 /** … … 38 38 $this->name = $name; 39 39 40 $this->parameterHolder = new sfParameterHolder(); 41 $this->parameterHolder->add($parameters); 40 $this->parameters = $parameters; 42 41 } 43 42 … … 102 101 } 103 102 104 public function getParameter Holder()103 public function getParameters() 105 104 { 106 return $this->parameter Holder;105 return $this->parameters; 107 106 } 108 107 109 public function getParameter($name, $default = null) 108 /** 109 * Returns true if the parameter exists (implements the ArrayAccess interface). 110 * 111 * @param string The parameter name 112 * 113 * @return Boolean true if the parameter exists, false otherwise 114 */ 115 public function offsetExists($name) 110 116 { 111 return $this->parameterHolder->get($name, $default);117 return isset($this->parameters[$name]); 112 118 } 113 119 114 public function hasParameter($name) 120 /** 121 * Returns a parameter value (implements the ArrayAccess interface). 122 * 123 * @param string The parameter name 124 * 125 * @return mixed The parameter value 126 */ 127 public function offsetGet($name) 115 128 { 116 return $this->parameterHolder->has($name);129 return isset($this->parameters[$name]) ? $this->parameters[$name] : null; 117 130 } 118 131 119 public function setParameter($name, $value) 132 /** 133 * Sets a parameter (implements the ArrayAccess interface). 134 * 135 * @param string The parameter name 136 * @param mixed 137 */ 138 public function offsetSet($name, $value) 120 139 { 121 return $this->parameterHolder->set($name, $value); 140 $this->parameters[$name] = $value; 141 } 142 143 /** 144 * Removes a parameter (implements the ArrayAccess interface). 145 * 146 * @param string The parameter name 147 */ 148 public function offsetUnset($name) 149 { 150 unset($this->parameters[$name]); 122 151 } 123 152 } trunk/lib/i18n/sfI18N.class.php
r4957 r6490 266 266 { 267 267 // change the message format object with the new culture 268 $this->setCulture($event ->getParameter('culture'));268 $this->setCulture($event['culture']); 269 269 } 270 270 … … 278 278 { 279 279 // change message source directory to our module 280 $this->setMessageSource(sfLoader::getI18NDirs($event ->getParameter('module')));280 $this->setMessageSource(sfLoader::getI18NDirs($event['module'])); 281 281 } 282 282 } trunk/lib/log/sfLogger.class.php
r5232 r6490 213 213 * 214 214 * @param sfEvent An sfEvent instance 215 *216 215 */ 217 216 public function listenToLogEvent(sfEvent $event) 218 217 { 219 $priority = $event->getParameterHolder()->remove('priority', self::INFO);218 $priority = isset($event['priority']) ? $event['priority'] : self::INFO; 220 219 $subject = $event->getSubject(); 221 220 $subject = is_object($subject) ? get_class($subject) : (is_string($subject) ? $subject : 'main'); 222 foreach ($event->getParameter Holder()->getAll() as $message)221 foreach ($event->getParameters() as $message) 223 222 { 224 223 $this->log(sprintf('{%s} %s', $subject, $message), $priority); trunk/lib/plugin/sfSymfonyPluginManager.class.php
r5250 r6490 110 110 public function ListenToPluginPostInstall($event) 111 111 { 112 $this->installWebContent($event ->getParameter('plugin'));112 $this->installWebContent($event['plugin']); 113 113 } 114 114 … … 120 120 public function ListenToPluginPostUninstall($event) 121 121 { 122 $this->uninstallWebContent($event ->getParameter('plugin'));122 $this->uninstallWebContent($event['plugin']); 123 123 } 124 124 trunk/lib/response/sfWebResponse.class.php
r5735 r6490 709 709 public function listenToChangeActionEvent(sfEvent $event) 710 710 { 711 $moduleName = $event ->getParameter('module');712 $actionName = $event ->getParameter('action');711 $moduleName = $event['module']; 712 $actionName = $event['action']; 713 713 714 714 if ($moduleName == sfConfig::get('sf_error_404_module') && $actionName == sfConfig::get('sf_error_404_action')) trunk/lib/routing/sfRouting.class.php
r4961 r6490 162 162 { 163 163 // change the culture in the routing default parameters 164 $this->setDefaultParameter('sf_culture', $event ->getParameter('culture'));164 $this->setDefaultParameter('sf_culture', $event['culture']); 165 165 } 166 166 … … 173 173 public function listenToLoadParametersInfoEvent(sfEvent $event, $parameters) 174 174 { 175 return array_merge($parameters, $this->parse($event ->getParameter('path_info')));175 return array_merge($parameters, $this->parse($event['path_info'])); 176 176 } 177 177 trunk/test/unit/sfEventDispatcherTest.class.php
r4951 r6490 41 41 static public function newMethod(sfEvent $event) 42 42 { 43 if ($event ->getParameter('method')== 'newMethod')43 if ($event['method'] == 'newMethod') 44 44 { 45 $arguments = $event ->getParameter('arguments');45 $arguments = $event['arguments']; 46 46 $event->setReturnValue($arguments[0]); 47 47
