Skip to content

Commit 6ded976

Browse files
connorhumentalstring
authored andcommitted
[util] fix missing return statement and docblock on sfContext class (FriendsOfSymfony1#351)
1 parent 27fbf07 commit 6ded976

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

lib/util/sfContext.class.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ public function getEventDispatcher()
235235
/**
236236
* Retrieve the action name for this context.
237237
*
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
240239
*/
241240
public function getActionName()
242241
{
@@ -245,6 +244,8 @@ public function getActionName()
245244
// @var $lastEntry sfActionStackEntry
246245
return $lastEntry->getActionName();
247246
}
247+
248+
return null;
248249
}
249250

250251
/**
@@ -341,8 +342,7 @@ public function getDatabaseManager()
341342
/**
342343
* Retrieve the module directory for this context.
343344
*
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
346346
*/
347347
public function getModuleDirectory()
348348
{
@@ -351,13 +351,14 @@ public function getModuleDirectory()
351351
// @var $lastEntry sfActionStackEntry
352352
return sfConfig::get('sf_app_module_dir').'/'.$lastEntry->getModuleName();
353353
}
354+
355+
return null;
354356
}
355357

356358
/**
357359
* Retrieve the module name for this context.
358360
*
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
361362
*/
362363
public function getModuleName()
363364
{
@@ -366,6 +367,8 @@ public function getModuleName()
366367
// @var $lastEntry sfActionStackEntry
367368
return $lastEntry->getModuleName();
368369
}
370+
371+
return null;
369372
}
370373

371374
/**

0 commit comments

Comments
 (0)