From d5f9e0659fc725a70a4466330dd97a5fc7012fdd Mon Sep 17 00:00:00 2001 From: Reuben Moes Date: Fri, 28 Jan 2022 15:34:00 -0800 Subject: [PATCH] fix acquia#4437 - If custom environment detector returns FALSE, ensure false is returned. --- src/Robo/Common/EnvironmentDetector.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Robo/Common/EnvironmentDetector.php b/src/Robo/Common/EnvironmentDetector.php index e75f42f77..bb3906776 100644 --- a/src/Robo/Common/EnvironmentDetector.php +++ b/src/Robo/Common/EnvironmentDetector.php @@ -104,8 +104,8 @@ public static function isPantheonProdEnv() { */ public static function isLocalEnv() { $results = self::getSubclassResults(__FUNCTION__); - if ($results) { - return TRUE; + if ( !empty($results) ) { + return !in_array(FALSE, $results); } return parent::isLocalEnv() && !self::isPantheonEnv() && !self::isCiEnv(); @@ -116,8 +116,8 @@ public static function isLocalEnv() { */ public static function isDevEnv() { $results = self::getSubclassResults(__FUNCTION__); - if ($results) { - return TRUE; + if ( !empty($results) ) { + return !in_array(FALSE, $results); } return self::isAhDevEnv() || self::isPantheonDevEnv(); @@ -128,8 +128,8 @@ public static function isDevEnv() { */ public static function isStageEnv() { $results = self::getSubclassResults(__FUNCTION__); - if ($results) { - return TRUE; + if ( !empty($results) ) { + return !in_array(FALSE, $results); } return self::isAhStageEnv() || self::isPantheonStageEnv(); @@ -140,8 +140,8 @@ public static function isStageEnv() { */ public static function isProdEnv() { $results = self::getSubclassResults(__FUNCTION__); - if ($results) { - return TRUE; + if ( !empty($results) ) { + return in_array(TRUE, $results); } return self::isAhProdEnv() || self::isPantheonProdEnv(); @@ -339,7 +339,7 @@ private static function getSubclassResults($functionName) { $results[] = call_user_func([$detector, $functionName]); } } - return array_filter($results); + return $results; } }