修复非一对多检索情况下重复添加查询条件的问题 (#75)

zingimmick · Sep 12, 2024 · f0d58c1 · f0d58c1
1 parent cd419b8
commit f0d58c1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -10,3 +10,4 @@ parameters:
         - identifier: missingType.generics
         - '#Access to an undefined property (.*?)::\$pivot#'
         - '#Parameter \#1 \$(.*?) of function array_pop expects array, array<int, string>\|false given.#'
+        - '#Cannot call method listen\(\) on Illuminate\\Contracts\\Events\\Dispatcher\|null.#'
diff --git a/src/Relations/BelongsToOne.php b/src/Relations/BelongsToOne.php
@@ -94,6 +94,8 @@ public function addConstraints(): void
     {
         if (! $this->isOneOfMany()) {
             parent::addConstraints();
+
+            return;
         }
 
         if (static::$constraints) {

diff --git a/src/Relations/MorphToOne.php b/src/Relations/MorphToOne.php
@@ -94,6 +94,8 @@ public function addConstraints(): void
     {
         if (! $this->isOneOfMany()) {
             parent::addConstraints();
+
+            return;
         }
 
         if (static::$constraints) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,6 +94,8 @@ public function addConstraints(): void @@
         {
             if (! $this->isOneOfMany()) {
                 parent::addConstraints();
+                return;
             }
             if (static::$constraints) {
@@ Expand Down @@