@@ -235,8 +235,7 @@ public function getEventDispatcher()
235
235
/**
236
236
* Retrieve the action name for this context.
237
237
*
238
- * @return string the currently executing action name, if one is set,
239
- * otherwise null
238
+ * @return string|null the currently executing action name if one is set, null otherwise
240
239
*/
241
240
public function getActionName ()
242
241
{
@@ -245,6 +244,8 @@ public function getActionName()
245
244
// @var $lastEntry sfActionStackEntry
246
245
return $ lastEntry ->getActionName ();
247
246
}
247
+
248
+ return null ;
248
249
}
249
250
250
251
/**
@@ -341,8 +342,7 @@ public function getDatabaseManager()
341
342
/**
342
343
* Retrieve the module directory for this context.
343
344
*
344
- * @return string an absolute filesystem path to the directory of the
345
- * currently executing module, if one is set, otherwise null
345
+ * @return string|null an absolute filesystem path to the directory of the currently executing module if one is set, null otherwise
346
346
*/
347
347
public function getModuleDirectory ()
348
348
{
@@ -351,13 +351,14 @@ public function getModuleDirectory()
351
351
// @var $lastEntry sfActionStackEntry
352
352
return sfConfig::get ('sf_app_module_dir ' ).'/ ' .$ lastEntry ->getModuleName ();
353
353
}
354
+
355
+ return null ;
354
356
}
355
357
356
358
/**
357
359
* Retrieve the module name for this context.
358
360
*
359
- * @return string the currently executing module name, if one is set,
360
- * otherwise null
361
+ * @return string|null the currently executing module name if one is set, null otherwise
361
362
*/
362
363
public function getModuleName ()
363
364
{
@@ -366,6 +367,8 @@ public function getModuleName()
366
367
// @var $lastEntry sfActionStackEntry
367
368
return $ lastEntry ->getModuleName ();
368
369
}
370
+
371
+ return null ;
369
372
}
370
373
371
374
/**
0 commit comments