mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-18 10:16:09 +02:00
Code Issues Releases Wiki Activity

Fix some incorrect automated refactorings

Browse Source
This commit is contained in:
Franz Liedke
2017-06-24 14:10:39 +02:00
parent c22219ec20
commit 920a4071b6
9 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/User/User.php
View File

@@ -12,7 +12,6 @@
namespace Flarum\User;
use DomainException;
use Flarum\User\Gate;
use Flarum\Group\Group;
use Flarum\Core\Notification;
use Flarum\Group\Permission;
@@ -21,7 +20,7 @@ use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Database\AbstractModel;
use Flarum\Event\CheckUserPassword;
use Flarum\Event\ConfigureUserPreferences;
use Flarum\Post\Event\Deleted;
use Flarum\Post\Event\Deleted as PostDeleted;
use Flarum\Event\PrepareUserGroups;
use Flarum\User\Event\AvatarChanged;
use Flarum\User\Event\BioChanged;
@@ -136,7 +135,7 @@ class User extends AbstractModel
$posts = $user->posts()->allTypes();
foreach ($posts->get() as $post) {
$user->raise(new Deleted($post));
$user->raise(new PostDeleted($post));
}
$posts->delete();

14
src/User/UserMetadataUpdater.php
View File

@@ -12,13 +12,13 @@
namespace Flarum\User;
use Flarum\Discussion\Discussion;
use Flarum\Core\Post;
use Flarum\Discussion\Event\Deleted;
use Flarum\Discussion\Event\Deleted as DiscussionDeleted;
use Flarum\Discussion\Event\Started;
use Flarum\Post\Event\Deleted;
use Flarum\Post\Event\Deleted as PostDeleted;
use Flarum\Post\Event\Hidden;
use Flarum\Post\Event\Posted;
use Flarum\Post\Event\Restored;
use Flarum\Post\Post;
use Illuminate\Contracts\Events\Dispatcher;
class UserMetadataUpdater
@@ -29,11 +29,11 @@ class UserMetadataUpdater
public function subscribe(Dispatcher $events)
{
$events->listen(Posted::class, [$this, 'whenPostWasPosted']);
$events->listen(Deleted::class, [$this, 'whenPostWasDeleted']);
$events->listen(PostDeleted::class, [$this, 'whenPostWasDeleted']);
$events->listen(Hidden::class, [$this, 'whenPostWasHidden']);
$events->listen(Restored::class, [$this, 'whenPostWasRestored']);
$events->listen(Started::class, [$this, 'whenDiscussionWasStarted']);
$events->listen(Deleted::class, [$this, 'whenDiscussionWasDeleted']);
$events->listen(DiscussionDeleted::class, [$this, 'whenDiscussionWasDeleted']);
}
/**
@@ -47,7 +47,7 @@ class UserMetadataUpdater
/**
* @param \Flarum\Post\Event\Deleted $event
*/
public function whenPostWasDeleted(Deleted $event)
public function whenPostWasDeleted(PostDeleted $event)
{
$this->updateCommentsCount($event->post, -1);
}
@@ -79,7 +79,7 @@ class UserMetadataUpdater
/**
* @param \Flarum\Discussion\Event\Deleted $event
*/
public function whenDiscussionWasDeleted(Deleted $event)
public function whenDiscussionWasDeleted(DiscussionDeleted $event)
{
$this->updateDiscussionsCount($event->discussion, -1);
}