From 0ccb13221c43bbef45f5c68927d857adec9212c0 Mon Sep 17 00:00:00 2001 From: connor Date: Thu, 21 Mar 2024 09:29:21 +0100 Subject: [PATCH 1/4] [util] fix return statement missing stan error --- lib/util/sfContext.class.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php index a0b9f5f75..41b540895 100644 --- a/lib/util/sfContext.class.php +++ b/lib/util/sfContext.class.php @@ -235,8 +235,8 @@ 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, + * otherwise null */ public function getActionName() { @@ -245,6 +245,8 @@ public function getActionName() // @var $lastEntry sfActionStackEntry return $lastEntry->getActionName(); } + + return null; } /** @@ -341,8 +343,8 @@ 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, otherwise null */ public function getModuleDirectory() { @@ -351,13 +353,15 @@ 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, + * otherwise null */ public function getModuleName() { @@ -366,6 +370,8 @@ public function getModuleName() // @var $lastEntry sfActionStackEntry return $lastEntry->getModuleName(); } + + return null; } /** From c63c08ef45f7ea7ecf8a0481065d3a005beb5474 Mon Sep 17 00:00:00 2001 From: Connor Date: Thu, 21 Mar 2024 10:40:15 +0100 Subject: [PATCH 2/4] layouting comment Co-authored-by: Emanuele Panzeri --- lib/util/sfContext.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php index 41b540895..c6182b753 100644 --- a/lib/util/sfContext.class.php +++ b/lib/util/sfContext.class.php @@ -343,8 +343,7 @@ public function getDatabaseManager() /** * Retrieve the module directory for this context. * - * @return string|null 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() { From 6374e64c15779f24042b5c09429235c72c19a10d Mon Sep 17 00:00:00 2001 From: Connor Date: Thu, 21 Mar 2024 10:40:22 +0100 Subject: [PATCH 3/4] layouting comment Co-authored-by: Emanuele Panzeri --- lib/util/sfContext.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php index c6182b753..f0dc5aebf 100644 --- a/lib/util/sfContext.class.php +++ b/lib/util/sfContext.class.php @@ -359,8 +359,7 @@ public function getModuleDirectory() /** * Retrieve the module name for this context. * - * @return string|null 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() { From e187ff82a3fbf71a2d517e210d7ef7c439bbad7d Mon Sep 17 00:00:00 2001 From: Connor Date: Thu, 21 Mar 2024 10:40:28 +0100 Subject: [PATCH 4/4] layouting comment Co-authored-by: Emanuele Panzeri --- lib/util/sfContext.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php index f0dc5aebf..1e6c42830 100644 --- a/lib/util/sfContext.class.php +++ b/lib/util/sfContext.class.php @@ -235,8 +235,7 @@ public function getEventDispatcher() /** * Retrieve the action name for this context. * - * @return string|null 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() {