Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions lib/util/sfContext.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ public function getEventDispatcher()
/**
* Retrieve the action name for this context.
*
* @return string the currently executing action name, if one is set,
* otherwise null
* @return string|null the currently executing action name if one is set, null otherwise
*/
public function getActionName()
{
Expand All @@ -245,6 +244,8 @@ public function getActionName()
// @var $lastEntry sfActionStackEntry
return $lastEntry->getActionName();
}

return null;
}

/**
Expand Down Expand Up @@ -341,8 +342,7 @@ public function getDatabaseManager()
/**
* Retrieve the module directory for this context.
*
* @return string an absolute filesystem path to the directory of the
* currently executing module, if one is set, otherwise null
* @return string|null an absolute filesystem path to the directory of the currently executing module if one is set, null otherwise
*/
public function getModuleDirectory()
{
Expand All @@ -351,13 +351,14 @@ public function getModuleDirectory()
// @var $lastEntry sfActionStackEntry
return sfConfig::get('sf_app_module_dir').'/'.$lastEntry->getModuleName();
}

return null;
}

/**
* Retrieve the module name for this context.
*
* @return string the currently executing module name, if one is set,
* otherwise null
* @return string|null the currently executing module name if one is set, null otherwise
*/
public function getModuleName()
{
Expand All @@ -366,6 +367,8 @@ public function getModuleName()
// @var $lastEntry sfActionStackEntry
return $lastEntry->getModuleName();
}

return null;
}

/**
Expand Down