diff --git a/src/ValidatingObserver.php b/src/ValidatingObserver.php index fdbf6f1..f706595 100644 --- a/src/ValidatingObserver.php +++ b/src/ValidatingObserver.php @@ -74,7 +74,7 @@ protected function performValidation(Model $model, $event) */ protected function fireValidatingEvent(Model $model, $event) { - return Event::until("eloquent.validating: ".get_class($model), [$model, $event]); + return app('events')->until('eloquent.validating: '.get_class($model), [$model, $event]); } /** @@ -86,6 +86,6 @@ protected function fireValidatingEvent(Model $model, $event) */ protected function fireValidatedEvent(Model $model, $status) { - Event::fire("eloquent.validated: ".get_class($model), [$model, $status]); + event('eloquent.validated: '.get_class($model), [$model, $status]); } } diff --git a/src/ValidatingTrait.php b/src/ValidatingTrait.php index 048cee3..2d5bc8a 100644 --- a/src/ValidatingTrait.php +++ b/src/ValidatingTrait.php @@ -325,7 +325,7 @@ public function saveOrReturn() */ public function getValidator() { - return $this->validator ?: Validator::getFacadeRoot(); + return $this->validator ?: app('validator'); } /**