Expand complex conditional.

Use simpler to read code to check callables.
cakephp · Aug 6, 2015 · 388940c · 388940c
1 parent e756eaa
commit 388940c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Database/Expression/QueryExpression.php b/src/Database/Expression/QueryExpression.php
@@ -502,13 +502,16 @@ public function __call($method, $args)
      */
     public function isCallable($c)
     {
-        return (
-            !is_string($c) &&
-            (
-                (is_array($c) && isset($c[0]) && is_object($c[0]) && is_callable($c)) ||
-                (is_object($c) && is_callable($c))
-            )
-        );
+        if (is_string($c)) {
+            return false;
+        }
+        if (is_object($c) && is_callable($c)) {
+            return true;
+        }
+        if (is_array($c) && isset($c[0]) && is_object($c[0]) && is_callable($c)) {
+            return true;
+        }
+        return false;
     }
 
     /**