fix array

Alexmg86 · Alexmg86 · commit 71aff96e1309 · 2020-05-06T17:54:46.000+03:00
diff --git a/src/LaravelSubQuery.php b/src/LaravelSubQuery.php
@@ -62,12 +62,14 @@ public function withAvg($relations)
     public function orderByRelation($relations, $orderType = 'desc', $type = 'max')
     {
         if (is_array($relations)) {
-            $orderType = $relations[0];
-            $type = $relations[1];
+            $orderType = isset($relations[0]) ? $relations[0] : $orderType;
+            $type = isset($relations[1]) ? $relations[1] : $type;
             unset($relations[0], $relations[1]);
         }
-        if (! strpos($relations, ':')) {
-            return $this->orderBy($relations, $orderType);
+
+        $column = is_array($relations) ? array_key_first($relations) : $relations;
+        if (! strpos($column, ':')) {
+            return $this->orderBy($column, $orderType);
         }
 
         return $this->withSubQuery($relations, $type, $orderType);

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,14 @@ public function withAvg($relations)`
`62`	`62`	`public function orderByRelation($relations, $orderType = 'desc', $type = 'max')`
`63`	`63`	`{`
`64`	`64`	`if (is_array($relations)) {`
`65`		`- $orderType = $relations[0];`
`66`		`- $type = $relations[1];`
	`65`	`+ $orderType = isset($relations[0]) ? $relations[0] : $orderType;`
	`66`	`+ $type = isset($relations[1]) ? $relations[1] : $type;`
`67`	`67`	`unset($relations[0], $relations[1]);`
`68`	`68`	`}`
`69`		`- if (! strpos($relations, ':')) {`
`70`		`- return $this->orderBy($relations, $orderType);`
	`69`	`+`
	`70`	`+ $column = is_array($relations) ? array_key_first($relations) : $relations;`
	`71`	`+ if (! strpos($column, ':')) {`
	`72`	`+ return $this->orderBy($column, $orderType);`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`return $this->withSubQuery($relations, $type, $orderType);`