From e020e265a436ee896d60b6e15ecb7d293082a8bf Mon Sep 17 00:00:00 2001 From: Markus Podar Date: Sun, 12 Jan 2020 18:23:52 +0100 Subject: [PATCH] Fixed bug in model command where loose string comparison would override properties for model relations (#873) --- src/Console/ModelsCommand.php | 2 +- tests/Console/ModelsCommand/Relations/Test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php index 0b5085b..2b0622b 100644 --- a/src/Console/ModelsCommand.php +++ b/src/Console/ModelsCommand.php @@ -505,7 +505,7 @@ class ModelsCommand extends Command 'morphedByMany' => '\Illuminate\Database\Eloquent\Relations\MorphToMany' ) as $relation => $impl) { $search = '$this->' . $relation . '('; - if (stripos($code, $search) || stripos($impl, (string)$type) !== false) { + if (stripos($code, $search) || $impl === (string)$type) { //Resolve the relation's model to a Relation object. $methodReflection = new \ReflectionMethod($model, $method); if ($methodReflection->getNumberOfParameters()) { diff --git a/tests/Console/ModelsCommand/Relations/Test.php b/tests/Console/ModelsCommand/Relations/Test.php index b6c9190..77f2a03 100644 --- a/tests/Console/ModelsCommand/Relations/Test.php +++ b/tests/Console/ModelsCommand/Relations/Test.php @@ -81,7 +81,7 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany; * @property-read \Illuminate\Database\Eloquent\Collection|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple[] $relationMorphMany * @property-read int|null $relation_morph_many_count * @property-read \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple $relationMorphOne - * @property-read \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple $relationMorphTo + * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $relationMorphTo * @property-read \Illuminate\Database\Eloquent\Collection|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple[] $relationMorphedByMany * @property-read int|null $relation_morphed_by_many_count * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple newModelQuery()