From 180899d23226b97172dd3a9f4e86c0196f4804b1 Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Thu, 1 Mar 2018 00:32:12 +1100 Subject: [PATCH] Simplify conditional operator replacement --- modules/sportspress-conditional-equations.php | 48 +++++++------------ 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/modules/sportspress-conditional-equations.php b/modules/sportspress-conditional-equations.php index 59d18fee..279db715 100644 --- a/modules/sportspress-conditional-equations.php +++ b/modules/sportspress-conditional-equations.php @@ -107,37 +107,23 @@ if ( ! class_exists( 'SportsPress_Conditional_Equations' ) ) : $rightvar = $rightvar[0]; } - // Select the correct conditional operator - if ( $conop == '>' ){ - if ( $leftvar > $rightvar ) { - $solution = 1; - } else { - $solution = 0; - } - } elseif ( $conop == '<' ){ - if ( $leftvar < $rightvar ) { - $solution = 1; - } else { - $solution = 0; - } - } elseif ( $conop == '==' ){ - if ( $leftvar == $rightvar ) { - $solution = 1; - } else { - $solution = 0; - } - } elseif ( $conop == '>=' ){ - if ( $leftvar >= $rightvar ) { - $solution = 1; - } else { - $solution = 0; - } - } elseif ( $conop == '<=' ){ - if ( $leftvar <= $rightvar ) { - $solution = 1; - } else { - $solution = 0; - } + // Select the correct conditional operator + switch ( $conop ) { + case '>': + $solution = (int) ( $leftvar > $rightvar ); + break; + case '<': + $solution = (int) ( $leftvar < $rightvar ); + break; + case '==': + $solution = (int) ( $leftvar == $rightvar ); + break; + case '>=': + $solution = (int) ( $leftvar >= $rightvar ); + break; + case '<=': + $solution = (int) ( $leftvar <= $rightvar ); + break; } // Replace the result of the conditional sub-equation to the equation