Merge branch '8.x'

GrahamCampbell · GrahamCampbell · commit 99889ebfe8eb · 2020-11-30T17:50:03.000Z
diff --git a/Collection.php b/Collection.php
@@ -1128,7 +1128,7 @@ public function sortDesc($options = SORT_REGULAR)
      */
     public function sortBy($callback, $options = SORT_REGULAR, $descending = false)
     {
-        if (is_array($callback)) {
+        if (is_array($callback) && ! is_callable($callback)) {
             return $this->sortByMany($callback);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1128,7 +1128,7 @@ public function sortDesc($options = SORT_REGULAR)`
`1128`	`1128`	`*/`
`1129`	`1129`	`public function sortBy($callback, $options = SORT_REGULAR, $descending = false)`
`1130`	`1130`	`{`
`1131`		`- if (is_array($callback)) {`
	`1131`	`+ if (is_array($callback) && ! is_callable($callback)) {`
`1132`	`1132`	`return $this->sortByMany($callback);`
`1133`	`1133`	`}`
`1134`	`1134`