Fixes belongsToMany detach() failing when scope is defined on the rel…

…ationship (#3) Refs: octobercms/october#5499
wintercms · Mar 6, 2021 · e1686e0 · e1686e0
1 parent 02c0c9b
commit e1686e0
Show file tree

Hide file tree

Showing 2 changed files with 231 additions and 118 deletions.
diff --git a/src/Database/Relations/DefinedConstraints.php b/src/Database/Relations/DefinedConstraints.php
@@ -118,7 +118,8 @@ public function addDefinedConstraintsToQuery($query, $args = null)
          * Scope
          */
         if ($scope = array_get($args, 'scope')) {
-            $query->$scope($this->parent);
+            $scopeMethod = 'scope' . ucfirst($scope);
+            $this->getRelated()->{$scopeMethod}($query, $this->parent);
         }
     }
 
@@ -141,6 +142,6 @@ public function newPivotQuery()
 
         return $query
             ->join($related->getTable(), $related->getQualifiedKeyName(), '=', $this->getOtherKey())
-            ->select($this->getTable().'.*');
+            ->select($this->getTable() . '.*');
     }
 }