Simplify returns in generate-phpt

6 files changed, 17 insertions, 43 deletions

diff --git a/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php b/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php
index 1d2a163175..17409bc455 100644
--- a/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php
+++ b/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php
@@ -56,17 +56,11 @@ class gtOptionalSections {
   }
 
   public function hasSkipifKey() {
-    if($this->skipifKey != '') {
-      return true;
-    }
-    return false;
+    return $this->skipifKey != '';
   }
   
   public function hasSkipifExt() {
-    if($this->skipifExt != '') {
-      return true;
-    }
-    return false;
+    return $this->skipifExt != '';
   }
   public function hasIni() {
     return $this->optSections['ini'];
diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php
index c91b210714..f4cb23a266 100644
--- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php
+++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php
@@ -5,20 +5,14 @@
  *
  */
 class gtIfClassHasMethod extends gtPreCondition {
-  
+
   public function check( $clo) {
-    if($clo->hasOption('c')) {
-      if(!$clo->hasOption('m')) {
-        return false;
-      }
-      return  true;
-    }
-    return true;
+    return !$clo->hasOption('c') || $clo->hasOption('m');
   }
-  
+
   public function getMessage() {
     return gtText::get('methodNotSpecified');
   }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php
index 7495c73eca..0d2b6df7f5 100644
--- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php
+++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php
@@ -5,17 +5,13 @@
  *
  */
 class gtIsSpecifiedFunctionOrMethod extends gtPreCondition {
-  
+
   public function check( $clo) {
-    if($clo->hasOption('f') || $clo->hasOption('m')) {
-    
-        return true;
-      }
-    return false;
+    return $clo->hasOption('f') || $clo->hasOption('m');
   }
-  
+
   public function getMessage() {
     return gtText::get('functionOrMethodNotSpecified');
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php
index 40530f3aca..9069a604ea 100644
--- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php
+++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php
@@ -5,17 +5,13 @@
  *
  */
 class gtIsSpecifiedTestType extends gtPreCondition {
-  
+
   public function check( $clo) {
-    if($clo->hasOption('b') || $clo->hasOption('e') || $clo->hasOption('v') ) {
-    
-        return true;
-      }
-    return false;
+    return $clo->hasOption('b') || $clo->hasOption('e') || $clo->hasOption('v');
   }
   
   public function getMessage() {
     return gtText::get('testTypeNotSpecified');
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php
index a39bab453e..363fdc9594 100644
--- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php
+++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php
@@ -9,10 +9,7 @@ class gtIsValidClass extends gtPreCondition {
   public function check( $clo) {
     if($clo->hasOption('c') ) {
       $className = $clo->getOption('c');
-      if( in_array( $className, get_declared_classes() ) ) {
-        return true;
-      }
-      return false;
+      return in_array( $className, get_declared_classes() );
     }
     return true;
   }
@@ -21,4 +18,4 @@ class gtIsValidClass extends gtPreCondition {
     return gtText::get('unknownClass');
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php
index ed91c2ca3b..9d7f2a5b75 100644
--- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php
+++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php
@@ -10,10 +10,7 @@ class gtIsValidFunction extends gtPreCondition {
     if($clo->hasOption('f') ) {
       $function = $clo->getOption('f');
       $functions = get_defined_functions();
-      if( in_array( $function, $functions['internal'] ) ) {
-        return true;
-      }
-      return false;
+      return in_array( $function, $functions['internal'] );
     }
     return true;
   }
@@ -22,4 +19,4 @@ class gtIsValidFunction extends gtPreCondition {
     return gtText::get('unknownFunction');
   }
 }
-?>
\ No newline at end of file
+?>