Refactor addConstraints method in Relations classes

Author: MrPunyapal

src/Relations/BelongsToArrayColumn.php

@@ -24,17 +24,18 @@ public function __construct(Builder $query, Model $child, string $foreignKey, st
      */
     public function addConstraints(): void
     {
-        if (static::$constraints) {
-            $query = $this->getBaseQuery();
+        if (! static::$constraints) {
+            return;
+        }
+        $query = $this->getBaseQuery();
 
-            $query->when($this->isString, function ($q) {
-                $q->whereJsonContains($this->ownerKey, (string) $this->getParentKey());
-            }, function ($q) {
-                $q->whereJsonContains($this->ownerKey, $this->getParentKey());
-            });
+        $query->when($this->isString, function ($q) {
+            $q->whereJsonContains($this->ownerKey, (string) $this->getParentKey());
+        }, function ($q) {
+            $q->whereJsonContains($this->ownerKey, $this->getParentKey());
+        });
 
-            $query->whereNotNull($this->ownerKey);
-        }
+        $query->whereNotNull($this->ownerKey);
     }
 
     /**

src/Relations/BelongsToManyKeys.php

@@ -41,16 +41,17 @@ public function __construct(Builder $query, Model $parent, protected string $for
      */
     public function addConstraints(): void
     {
-        if (static::$constraints) {
-            $this->query->where(function ($query) {
-                foreach ($this->localKeys as $localKey) {
-                    $query->orWhere(function ($query) use ($localKey) {
-                        $query->where($this->foreignKey, '=', $this->getParentKey($localKey))
-                            ->whereNotNull($this->foreignKey);
-                    });
-                }
-            });
+        if (! static::$constraints) {
+            return;
         }
+        $this->query->where(function ($query) {
+            foreach ($this->localKeys as $localKey) {
+                $query->orWhere(function ($query) use ($localKey) {
+                    $query->where($this->foreignKey, '=', $this->getParentKey($localKey))
+                        ->whereNotNull($this->foreignKey);
+                });
+            }
+        });
     }
 
     /**

src/Relations/HasManyArrayColumn.php

@@ -14,13 +14,14 @@ class HasManyArrayColumn extends HasMany
      */
     public function addConstraints(): void
     {
-        if (static::$constraints) {
-            $query = $this->getRelationQuery();
+        if (! static::$constraints) {
+            return;
+        }
+        $query = $this->getRelationQuery();
 
-            $query->wherein($this->foreignKey, $this->getParentKey());
+        $query->wherein($this->foreignKey, $this->getParentKey());
 
-            $query->whereNotNull($this->foreignKey);
-        }
+        $query->whereNotNull($this->foreignKey);
     }
 
     /**

src/Relations/HasManyKeys.php

@@ -42,18 +42,19 @@ public function __construct(Builder $query, Model $parent, array $relations, pro
      */
     public function addConstraints(): void
     {
-        if (static::$constraints) {
-            $foreignKeys = $this->foreignKeys;
-
-            $this->query->where(function ($query) use ($foreignKeys): void {
-                foreach ($foreignKeys as $foreignKey) {
-                    $query->orWhere(function ($query) use ($foreignKey): void {
-                        $query->where($foreignKey, '=', $this->getParentKey())
-                            ->whereNotNull($foreignKey);
-                    });
-                }
-            });
+        if (! static::$constraints) {
+            return;
         }
+        $foreignKeys = $this->foreignKeys;
+
+        $this->query->where(function ($query) use ($foreignKeys): void {
+            foreach ($foreignKeys as $foreignKey) {
+                $query->orWhere(function ($query) use ($foreignKey): void {
+                    $query->where($foreignKey, '=', $this->getParentKey())
+                        ->whereNotNull($foreignKey);
+                });
+            }
+        });
     }
 
     /**