Fix the broken tests for older laravel versions (#63)

* Sort the models to get the same results for laravel 5.6 as for the newer versions * Make the relations backward compatible with < laravel 5.8
beyondcode · Oct 14, 2019 · d027d5e · d027d5e
1 parent 0268113
commit d027d5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ModelFinder.php b/src/ModelFinder.php
@@ -40,7 +40,7 @@ public function getModelsInDirectory(string $directory): Collection
             return !empty($className)
                 && is_subclass_of($className, EloquentModel::class)
                 && ! (new ReflectionClass($className))->isAbstract();
-        })->diff($ignoreModels);
+        })->diff($ignoreModels)->sort();
     }
 
     protected function getFullyQualifiedClassNameFromFile(string $path): string

diff --git a/src/RelationFinder.php b/src/RelationFinder.php
@@ -80,7 +80,7 @@ protected function getRelationshipFromMethodAndModel(ReflectionMethod $method, s
 
                 if ($return instanceof BelongsTo) {
                     $foreignKey = $this->getParentKey($return->getQualifiedOwnerKeyName());
-                    $localKey = $return->getForeignKeyName();
+                    $localKey = method_exists($return, 'getForeignKeyName') ? $return->getForeignKeyName() : $return->getForeignKey();
                 }
 
                 return [