1
0
mirror of https://github.com/flarum/core.git synced 2025-07-17 06:41:21 +02:00

fire -> dispatch

As per Illuminate\Contracts\Events\Dispatcher
This commit is contained in:
Toby Zerner
2018-02-10 12:09:35 +10:30
parent aff1b9a5e4
commit 160493e725
31 changed files with 42 additions and 42 deletions

View File

@@ -63,7 +63,7 @@ class FrontendController extends AbstractFrontendController
$settings = $this->settings->all(); $settings = $this->settings->all();
$this->events->fire( $this->events->dispatch(
new Deserializing($settings) new Deserializing($settings)
); );

View File

@@ -90,13 +90,13 @@ abstract class AbstractSerializeController implements ControllerInterface
{ {
$document = new Document; $document = new Document;
static::$events->fire( static::$events->dispatch(
new WillGetData($this) new WillGetData($this)
); );
$data = $this->data($request, $document); $data = $this->data($request, $document);
static::$events->fire( static::$events->dispatch(
new WillSerializeData($this, $data, $request, $document) new WillSerializeData($this, $data, $request, $document)
); );

View File

@@ -53,11 +53,11 @@ class SetSettingsController implements ControllerInterface
$settings = $request->getParsedBody(); $settings = $request->getParsedBody();
foreach ($settings as $k => $v) { foreach ($settings as $k => $v) {
$this->dispatcher->fire(new Serializing($k, $v)); $this->dispatcher->dispatch(new Serializing($k, $v));
$this->settings->set($k, $v); $this->settings->set($k, $v);
$this->dispatcher->fire(new Saved($k, $v)); $this->dispatcher->dispatch(new Saved($k, $v));
} }
return new EmptyResponse(204); return new EmptyResponse(204);

View File

@@ -70,7 +70,7 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
$attributes = $this->getDefaultAttributes($model); $attributes = $this->getDefaultAttributes($model);
static::$dispatcher->fire( static::$dispatcher->dispatch(
new Serializing($this, $model, $attributes) new Serializing($this, $model, $attributes)
); );

View File

@@ -75,7 +75,7 @@ abstract class AbstractModel extends Eloquent
{ {
$defaults = []; $defaults = [];
static::$dispatcher->fire( static::$dispatcher->dispatch(
new ConfigureModelDefaultAttributes($this, $defaults) new ConfigureModelDefaultAttributes($this, $defaults)
); );
@@ -96,7 +96,7 @@ abstract class AbstractModel extends Eloquent
$class = get_class($this); $class = get_class($this);
if (! isset($dates[$class])) { if (! isset($dates[$class])) {
static::$dispatcher->fire( static::$dispatcher->dispatch(
new ConfigureModelDates($this, $this->dates) new ConfigureModelDates($this, $this->dates)
); );

View File

@@ -25,7 +25,7 @@ trait ScopeVisibilityTrait
*/ */
public function scopeWhereVisibleTo(Builder $query, User $actor) public function scopeWhereVisibleTo(Builder $query, User $actor)
{ {
static::$dispatcher->fire( static::$dispatcher->dispatch(
new ScopeModelVisibility($query, $actor, 'view') new ScopeModelVisibility($query, $actor, 'view')
); );
} }

View File

@@ -51,7 +51,7 @@ class DeleteDiscussionHandler
$this->assertCan($actor, 'delete', $discussion); $this->assertCan($actor, 'delete', $discussion);
$this->events->fire( $this->events->dispatch(
new Deleting($discussion, $actor, $command->data) new Deleting($discussion, $actor, $command->data)
); );

View File

@@ -74,7 +74,7 @@ class EditDiscussionHandler
} }
} }
$this->events->fire( $this->events->dispatch(
new Saving($discussion, $actor, $data) new Saving($discussion, $actor, $data)
); );

View File

@@ -53,7 +53,7 @@ class ReadDiscussionHandler
$state = $discussion->stateFor($actor); $state = $discussion->stateFor($actor);
$state->read($command->readNumber); $state->read($command->readNumber);
$this->events->fire( $this->events->dispatch(
new UserDataSaving($state) new UserDataSaving($state)
); );

View File

@@ -70,7 +70,7 @@ class StartDiscussionHandler
$actor $actor
); );
$this->events->fire( $this->events->dispatch(
new Saving($discussion, $actor, $data) new Saving($discussion, $actor, $data)
); );

View File

@@ -82,7 +82,7 @@ class DiscussionPolicy extends AbstractPolicy
$query->where(function ($query) use ($actor) { $query->where(function ($query) use ($actor) {
$query->where('discussions.is_private', false) $query->where('discussions.is_private', false)
->orWhere(function ($query) use ($actor) { ->orWhere(function ($query) use ($actor) {
$this->events->fire( $this->events->dispatch(
new ScopeModelVisibility($query, $actor, 'viewPrivate') new ScopeModelVisibility($query, $actor, 'viewPrivate')
); );
}); });
@@ -109,7 +109,7 @@ class DiscussionPolicy extends AbstractPolicy
$query->where('comments_count', '>', 0) $query->where('comments_count', '>', 0)
->orWhere('start_user_id', $actor->id) ->orWhere('start_user_id', $actor->id)
->orWhere(function ($query) use ($actor) { ->orWhere(function ($query) use ($actor) {
$this->events->fire( $this->events->dispatch(
new ScopeModelVisibility($query, $actor, 'editPosts') new ScopeModelVisibility($query, $actor, 'editPosts')
); );
}); });

View File

@@ -116,7 +116,7 @@ class ExtensionManager
if (! $this->isEnabled($name)) { if (! $this->isEnabled($name)) {
$extension = $this->getExtension($name); $extension = $this->getExtension($name);
$this->dispatcher->fire(new Enabling($extension)); $this->dispatcher->dispatch(new Enabling($extension));
$enabled = $this->getEnabled(); $enabled = $this->getEnabled();
@@ -130,7 +130,7 @@ class ExtensionManager
$extension->setEnabled(true); $extension->setEnabled(true);
$this->dispatcher->fire(new Enabled($extension)); $this->dispatcher->dispatch(new Enabled($extension));
} }
} }
@@ -146,7 +146,7 @@ class ExtensionManager
if (($k = array_search($name, $enabled)) !== false) { if (($k = array_search($name, $enabled)) !== false) {
$extension = $this->getExtension($name); $extension = $this->getExtension($name);
$this->dispatcher->fire(new Disabling($extension)); $this->dispatcher->dispatch(new Disabling($extension));
unset($enabled[$k]); unset($enabled[$k]);
@@ -154,7 +154,7 @@ class ExtensionManager
$extension->setEnabled(false); $extension->setEnabled(false);
$this->dispatcher->fire(new Disabled($extension)); $this->dispatcher->dispatch(new Disabled($extension));
} }
} }
@@ -175,7 +175,7 @@ class ExtensionManager
$extension->setInstalled(false); $extension->setInstalled(false);
$this->dispatcher->fire(new Uninstalled($extension)); $this->dispatcher->dispatch(new Uninstalled($extension));
} }
/** /**

View File

@@ -59,7 +59,7 @@ class Formatter
{ {
$parser = $this->getParser($context); $parser = $this->getParser($context);
$this->events->fire(new Parsing($parser, $context, $text)); $this->events->dispatch(new Parsing($parser, $context, $text));
return $parser->parse($text); return $parser->parse($text);
} }
@@ -75,7 +75,7 @@ class Formatter
{ {
$renderer = $this->getRenderer($context); $renderer = $this->getRenderer($context);
$this->events->fire(new Rendering($renderer, $context, $xml)); $this->events->dispatch(new Rendering($renderer, $context, $xml));
return $renderer->render($xml); return $renderer->render($xml);
} }
@@ -117,7 +117,7 @@ class Formatter
$configurator->Autolink; $configurator->Autolink;
$configurator->tags->onDuplicate('replace'); $configurator->tags->onDuplicate('replace');
$this->events->fire(new Configuring($configurator)); $this->events->dispatch(new Configuring($configurator));
$this->configureExternalLinks($configurator); $this->configureExternalLinks($configurator);

View File

@@ -119,7 +119,7 @@ class LogOutController implements ControllerInterface
$actor->accessTokens()->delete(); $actor->accessTokens()->delete();
$this->events->fire(new LoggedOut($actor)); $this->events->dispatch(new LoggedOut($actor));
return $this->rememberer->forget($response); return $this->rememberer->forget($response);
} }

View File

@@ -93,7 +93,7 @@ abstract class AbstractValidator
$validator = $this->validator->make($attributes, $rules, $this->getMessages()); $validator = $this->validator->make($attributes, $rules, $this->getMessages());
$this->events->fire( $this->events->dispatch(
new Validating($this, $validator) new Validating($this, $validator)
); );

View File

@@ -32,7 +32,7 @@ trait DispatchEventsTrait
foreach ($entity->releaseEvents() as $event) { foreach ($entity->releaseEvents() as $event) {
$event->actor = $actor; $event->actor = $actor;
$this->events->fire($event); $this->events->dispatch($event);
} }
} }
} }

View File

@@ -36,10 +36,10 @@ abstract class AbstractFrontendController extends AbstractHtmlController
{ {
$view = $this->getView($request); $view = $this->getView($request);
$this->events->fire( $this->events->dispatch(
new ConfigureClientView($this, $view, $request) new ConfigureClientView($this, $view, $request)
); );
$this->events->fire( $this->events->dispatch(
new Rendering($this, $view, $request) new Rendering($this, $view, $request)
); );

View File

@@ -57,7 +57,7 @@ class CreateGroupHandler
array_get($data, 'attributes.icon') array_get($data, 'attributes.icon')
); );
$this->events->fire( $this->events->dispatch(
new Saving($group, $actor, $data) new Saving($group, $actor, $data)
); );

View File

@@ -50,7 +50,7 @@ class DeleteGroupHandler
$this->assertCan($actor, 'delete', $group); $this->assertCan($actor, 'delete', $group);
$this->events->fire( $this->events->dispatch(
new Deleting($group, $actor, $command->data) new Deleting($group, $actor, $command->data)
); );

View File

@@ -75,7 +75,7 @@ class EditGroupHandler
$group->icon = $attributes['icon']; $group->icon = $attributes['icon'];
} }
$this->events->fire( $this->events->dispatch(
new Saving($group, $actor, $data) new Saving($group, $actor, $data)
); );

View File

@@ -29,7 +29,7 @@ class LocaleServiceProvider extends AbstractServiceProvider
$locales->addLocale($this->getDefaultLocale(), 'Default'); $locales->addLocale($this->getDefaultLocale(), 'Default');
$events->fire(new ConfigureLocales($locales)); $events->dispatch(new ConfigureLocales($locales));
} }
/** /**

View File

@@ -50,7 +50,7 @@ class DeletePostHandler
$this->assertCan($actor, 'delete', $post); $this->assertCan($actor, 'delete', $post);
$this->events->fire( $this->events->dispatch(
new Deleting($post, $actor, $command->data) new Deleting($post, $actor, $command->data)
); );

View File

@@ -78,7 +78,7 @@ class EditPostHandler
} }
} }
$this->events->fire( $this->events->dispatch(
new Saving($post, $actor, $data) new Saving($post, $actor, $data)
); );

View File

@@ -95,7 +95,7 @@ class PostReplyHandler
$post->time = new DateTime($time); $post->time = new DateTime($time);
} }
$this->events->fire( $this->events->dispatch(
new Saving($post, $actor, $command->data) new Saving($post, $actor, $command->data)
); );

View File

@@ -70,7 +70,7 @@ class PostPolicy extends AbstractPolicy
$query->where(function ($query) use ($actor) { $query->where(function ($query) use ($actor) {
$query->where('posts.is_private', false) $query->where('posts.is_private', false)
->orWhere(function ($query) use ($actor) { ->orWhere(function ($query) use ($actor) {
$this->events->fire( $this->events->dispatch(
new ScopeModelVisibility($query, $actor, 'viewPrivate') new ScopeModelVisibility($query, $actor, 'viewPrivate')
); );
}); });

View File

@@ -62,7 +62,7 @@ class DeleteAvatarHandler
$this->uploader->remove($user); $this->uploader->remove($user);
$this->events->fire( $this->events->dispatch(
new AvatarDeleting($user, $actor) new AvatarDeleting($user, $actor)
); );

View File

@@ -50,7 +50,7 @@ class DeleteUserHandler
$this->assertCan($actor, 'delete', $user); $this->assertCan($actor, 'delete', $user);
$this->events->fire( $this->events->dispatch(
new Deleting($user, $actor, $command->data) new Deleting($user, $actor, $command->data)
); );

View File

@@ -168,7 +168,7 @@ class EditUserHandler
$this->avatarUploader->remove($user); $this->avatarUploader->remove($user);
} }
$this->events->fire( $this->events->dispatch(
new Saving($user, $actor, $data) new Saving($user, $actor, $data)
); );

View File

@@ -116,7 +116,7 @@ class RegisterUserHandler
$user->activate(); $user->activate();
} }
$this->events->fire( $this->events->dispatch(
new Saving($user, $actor, $data) new Saving($user, $actor, $data)
); );

View File

@@ -97,7 +97,7 @@ class UploadAvatarHandler
$image = (new ImageManager)->make($tmpFile); $image = (new ImageManager)->make($tmpFile);
$this->events->fire( $this->events->dispatch(
new AvatarSaving($user, $actor, $image) new AvatarSaving($user, $actor, $image)
); );

View File

@@ -146,7 +146,7 @@ class User extends AbstractModel
$user->notifications()->delete(); $user->notifications()->delete();
}); });
static::$dispatcher->fire( static::$dispatcher->dispatch(
new ConfigureUserPreferences new ConfigureUserPreferences
); );
} }