Merge pull request #13 from phailee/5.6

ajayfroiden · web-flow · commit 7bf69af45589 · 2018-08-27T01:39:46.000-07:00
Fix: hasMany relation bug (call relation on relation) fix
diff --git a/src/RequestParser.php b/src/RequestParser.php
@@ -429,7 +429,7 @@ private function parseFields($fields)
                             $singular = $relation->getForeignKey();
                         }
                         else if ($relation instanceof HasOne || $relation instanceof HasMany) {
-                            $singular = explode('.', $relation->getForeignKey())[1];
+                            $singular = $relation->getForeignKeyName();
                         }
 
                         // Unset last element of array

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ private function parseFields($fields)`
`429`	`429`	`$singular = $relation->getForeignKey();`
`430`	`430`	`}`
`431`	`431`	`else if ($relation instanceof HasOne \|\| $relation instanceof HasMany) {`
`432`		`- $singular = explode('.', $relation->getForeignKey())[1];`
	`432`	`+ $singular = $relation->getForeignKeyName();`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`// Unset last element of array`