From 922fc0413128c9e512573e8b2bbd1b7aadbf4b82 Mon Sep 17 00:00:00 2001 From: jxlwqq Date: Tue, 6 Aug 2019 15:10:00 +0800 Subject: [PATCH 1/2] Update Form.php --- src/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Form.php b/src/Form.php index bf2f28386f..e277e86eb8 100644 --- a/src/Form.php +++ b/src/Form.php @@ -874,7 +874,7 @@ protected function updateRelation($relationsData) $parent->save(); // When in creating, associate two models - $foreignKeyMethod = (app()->version() < '5.8.0') ? 'getForeignKey' : 'getForeignKeyName'; + $foreignKeyMethod = version_compare(app()->version(), '5.8.0', '<') ? 'getForeignKey' : 'getForeignKeyName'; if (!$this->model->{$relation->{$foreignKeyMethod}()}) { $this->model->{$relation->{$foreignKeyMethod}()} = $parent->getKey(); From d773bd43637a952d484e5d6718c864366c5e9f28 Mon Sep 17 00:00:00 2001 From: jxlwqq Date: Tue, 6 Aug 2019 15:16:05 +0800 Subject: [PATCH 2/2] Update Model.php --- src/Grid/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Grid/Model.php b/src/Grid/Model.php index 2941d7c242..b132c3dba7 100644 --- a/src/Grid/Model.php +++ b/src/Grid/Model.php @@ -635,7 +635,7 @@ protected function joinParameters(Relation $relation) $relatedTable = $relation->getRelated()->getTable(); if ($relation instanceof BelongsTo) { - $foreignKeyMethod = (app()->version() < '5.8.0') ? 'getForeignKey' : 'getForeignKeyName'; + $foreignKeyMethod = version_compare(app()->version(), '5.8.0', '<') ? 'getForeignKey' : 'getForeignKeyName'; return [ $relatedTable,