Merge pull request #3766 from jxlwqq/patch-24

use version_compare
z-song · Aug 6, 2019 · 72ffec4 · 72ffec4
2 parents ca2270b + d773bd4
commit 72ffec4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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();
 

diff --git 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,