Merge branch 'develop' into wip/laravel-style-relations

wintercms · Jul 30, 2024 · abcf7ee · abcf7ee
2 parents e48418b + 339af87
commit abcf7ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/Database/Model.php b/src/Database/Model.php
@@ -851,7 +851,6 @@ public function newRelationPivot($relationName, $parent, $attributes, $table, $e
     {
         $relation = $this->{$relationName}();
         $pivotModel = $relation->getPivotClass();
-
         return $pivotModel::fromRawAttributes($parent, $attributes, $table, $exists);
     }
 

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -327,7 +327,7 @@ public function after($callback)
      */
     public function error(Closure $callback)
     {
-        $this->make('Illuminate\Contracts\Debug\ExceptionHandler')->error($callback);
+        $this->make('Illuminate\Contracts\Debug\ExceptionHandler')->error($callback); // @phpstan-ignore-line
     }
 
     /**