From 3fd1b233fc1025f324a70b130f4075d75af0ba56 Mon Sep 17 00:00:00 2001 From: Carl Olsen Date: Fri, 23 Mar 2018 16:37:29 -0400 Subject: [PATCH] make model factory after method signatures more consistent (#23676) --- src/Illuminate/Database/Eloquent/Factory.php | 22 +++++++++----------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/Illuminate/Database/Eloquent/Factory.php b/src/Illuminate/Database/Eloquent/Factory.php index 684da7d2d62a..82917ae3832a 100644 --- a/src/Illuminate/Database/Eloquent/Factory.php +++ b/src/Illuminate/Database/Eloquent/Factory.php @@ -116,11 +116,12 @@ public function state($class, $state, $attributes) * * @param string $class * @param callable $callback + * @param string $name * @return $this */ - public function afterMaking($class, $callback) + public function afterMaking($class, callable $callback, $name = 'default') { - $this->afterMaking[$class]['default'][] = $callback; + $this->afterMaking[$class][$name][] = $callback; return $this; } @@ -133,11 +134,9 @@ public function afterMaking($class, $callback) * @param callable $callback * @return $this */ - public function afterMakingState($class, $state, $callback) + public function afterMakingState($class, $state, callable $callback) { - $this->afterMaking[$class][$state][] = $callback; - - return $this; + return $this->afterMaking($class, $callback, $state); } /** @@ -145,11 +144,12 @@ public function afterMakingState($class, $state, $callback) * * @param string $class * @param callable $callback + * @param string $name * @return $this */ - public function afterCreating($class, $callback) + public function afterCreating($class, callable $callback, $name = 'default') { - $this->afterCreating[$class]['default'][] = $callback; + $this->afterCreating[$class][$name][] = $callback; return $this; } @@ -162,11 +162,9 @@ public function afterCreating($class, $callback) * @param callable $callback * @return $this */ - public function afterCreatingState($class, $state, $callback) + public function afterCreatingState($class, $state, callable $callback) { - $this->afterCreating[$class][$state][] = $callback; - - return $this; + return $this->afterCreating($class, $callback, $state); } /**