Merge pull request #9379 from cakephp/issue-9372

Clarify Query::from() usage.
cakephp · Aug 31, 2016 · a48e247 · a48e247
2 parents 8314c2f + f4c6dcb
commit a48e247
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -422,7 +422,9 @@ public function modifier($modifiers, $overwrite = false)
      * $query->from(['sub' => $countQuery]); // FROM (SELECT ...) sub
      * ```
      *
-     * @param array|\Cake\Database\ExpressionInterface|string $tables tables to be added to the list
+     * @param array|string $tables tables to be added to the list. This argument, can be
+     *  passed as an array of strings, array of expression objects, or a single string. See
+     *  the examples above for the valid call types.
      * @param bool $overwrite whether to reset tables with passed list or not
      * @return $this
      */