Refactor complex conditional for clarity.

markrogoyski · Apr 6, 2020 · 09a3824 · 09a3824
1 parent 10cd227
commit 09a3824
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/NumericalAnalysis/Interpolation/ClampedCubicSpline.php b/src/NumericalAnalysis/Interpolation/ClampedCubicSpline.php
@@ -165,7 +165,7 @@ public static function interpolate($source, ...$args): Piecewise
     public static function getSplinePoints($source, array $args = []): array
     {
         // Guard clause - source must be callable or array of points
-        if (!is_callable($source) && !is_array($source)) {
+        if (!(is_callable($source) || is_array($source))) {
             throw new Exception\BadDataException('Input source is incorrect. You need to input either a callback function or a set of arrays');
         }
 

diff --git a/src/NumericalAnalysis/Interpolation/Interpolation.php b/src/NumericalAnalysis/Interpolation/Interpolation.php
@@ -37,7 +37,7 @@ abstract class Interpolation
     public static function getPoints($source, array $args = []): array
     {
         // Guard clause - source must be callable or array of points
-        if (!is_callable($source) && !is_array($source)) {
+        if (!(is_callable($source) || is_array($source))) {
             throw new Exception\BadDataException('Input source is incorrect. You need to input either a callback function or a set of arrays');
         }
 

diff --git a/src/NumericalAnalysis/NumericalDifferentiation/NumericalDifferentiation.php b/src/NumericalAnalysis/NumericalDifferentiation/NumericalDifferentiation.php
@@ -47,7 +47,7 @@ abstract public static function differentiate(float $target, $source, ...$args);
     public static function getPoints($source, array $args = []): array
     {
         // Guard clause - source must be callable or array of points
-        if (!is_callable($source) && !is_array($source)) {
+        if (!(is_callable($source) || is_array($source))) {
             throw new Exception\BadDataException('Input source is incorrect. You need to input either a callback function or a set of arrays');
         }
 

diff --git a/src/NumericalAnalysis/NumericalIntegration/NumericalIntegration.php b/src/NumericalAnalysis/NumericalIntegration/NumericalIntegration.php
@@ -48,7 +48,7 @@ abstract public static function approximate($source, ...$args);
     public static function getPoints($source, array $args = []): array
     {
         // Guard clause - source must be callable or array of points
-        if (!is_callable($source) && !is_array($source)) {
+        if (!(is_callable($source) || is_array($source))) {
             throw new Exception\BadDataException('Input source is incorrect. You need to input either a callback function or a set of arrays');
         }