Skip to content

Commit

Permalink
Update namespaces for beta 8
Browse files Browse the repository at this point in the history
  • Loading branch information
franzliedke committed Oct 1, 2017
1 parent bb3326f commit 76387c6
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 97 deletions.
8 changes: 4 additions & 4 deletions src/Listener/AddClientAssets.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace Flarum\Mentions\Listener;

use Flarum\Event\ConfigureWebApp;
use Flarum\Frontend\Event\Rendering;
use Illuminate\Contracts\Events\Dispatcher;

class AddClientAssets
Expand All @@ -21,13 +21,13 @@ class AddClientAssets
*/
public function subscribe(Dispatcher $events)
{
$events->listen(ConfigureWebApp::class, [$this, 'addAssets']);
$events->listen(Rendering::class, [$this, 'addAssets']);
}

/**
* @param ConfigureClientView $event
* @param Rendering $event
*/
public function addAssets(ConfigureWebApp $event)
public function addAssets(Rendering $event)
{
if ($event->isForum()) {
$event->addAssets([
Expand Down
36 changes: 18 additions & 18 deletions src/Listener/AddPostMentionedByRelationship.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
use Flarum\Api\Controller\ListPostsController;
use Flarum\Api\Controller\ShowDiscussionController;
use Flarum\Api\Controller\ShowPostController;
use Flarum\Api\Serializer\PostBasicSerializer;
use Flarum\Core\Post;
use Flarum\Core\Repository\PostRepository;
use Flarum\Core\User;
use Flarum\Event\ConfigureApiController;
use Flarum\Api\Event\WillGetData;
use Flarum\Api\Event\WillSerializeData;
use Flarum\Api\Serializer\BasicPostSerializer;
use Flarum\Event\GetApiRelationship;
use Flarum\Event\GetModelRelationship;
use Flarum\Event\PrepareApiData;
use Flarum\Post\Post;
use Flarum\Post\PostRepository;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;

class AddPostMentionedByRelationship
Expand All @@ -47,8 +47,8 @@ public function subscribe(Dispatcher $events)
{
$events->listen(GetModelRelationship::class, [$this, 'getModelRelationship']);
$events->listen(GetApiRelationship::class, [$this, 'getApiRelationship']);
$events->listen(ConfigureApiController::class, [$this, 'includeRelationships']);
$events->listen(PrepareApiData::class, [$this, 'filterVisiblePosts']);
$events->listen(WillGetData::class, [$this, 'includeRelationships']);
$events->listen(WillSerializeData::class, [$this, 'filterVisiblePosts']);
}

/**
Expand Down Expand Up @@ -76,23 +76,23 @@ public function getModelRelationship(GetModelRelationship $event)
*/
public function getApiRelationship(GetApiRelationship $event)
{
if ($event->isRelationship(PostBasicSerializer::class, 'mentionedBy')) {
return $event->serializer->hasMany($event->model, PostBasicSerializer::class, 'mentionedBy');
if ($event->isRelationship(BasicPostSerializer::class, 'mentionedBy')) {
return $event->serializer->hasMany($event->model, BasicPostSerializer::class, 'mentionedBy');
}

if ($event->isRelationship(PostBasicSerializer::class, 'mentionsPosts')) {
return $event->serializer->hasMany($event->model, PostBasicSerializer::class, 'mentionsPosts');
if ($event->isRelationship(BasicPostSerializer::class, 'mentionsPosts')) {
return $event->serializer->hasMany($event->model, BasicPostSerializer::class, 'mentionsPosts');
}

if ($event->isRelationship(PostBasicSerializer::class, 'mentionsUsers')) {
return $event->serializer->hasMany($event->model, PostBasicSerializer::class, 'mentionsUsers');
if ($event->isRelationship(BasicPostSerializer::class, 'mentionsUsers')) {
return $event->serializer->hasMany($event->model, BasicPostSerializer::class, 'mentionsUsers');
}
}

/**
* @param ConfigureApiController $event
* @param WillGetData $event
*/
public function includeRelationships(ConfigureApiController $event)
public function includeRelationships(WillGetData $event)
{
if ($event->isController(ShowDiscussionController::class)) {
$event->addInclude([
Expand Down Expand Up @@ -127,9 +127,9 @@ public function includeRelationships(ConfigureApiController $event)
* additional posts so that the user can't see any posts which they don't
* have access to.
*
* @param PrepareApiData $event
* @param WillSerializeData $event
*/
public function filterVisiblePosts(PrepareApiData $event)
public function filterVisiblePosts(WillSerializeData $event)
{
// Firstly we gather a list of posts contained within the API document.
// This will vary according to the API endpoint that is being accessed.
Expand Down
18 changes: 9 additions & 9 deletions src/Listener/FormatPostMentions.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

namespace Flarum\Mentions\Listener;

use Flarum\Core\Post\CommentPost;
use Flarum\Event\ConfigureFormatter;
use Flarum\Event\ConfigureFormatterRenderer;
use Flarum\Formatter\Event\Configuring;
use Flarum\Formatter\Event\ConfiguringRenderer;
use Flarum\Forum\UrlGenerator;
use Flarum\Post\Post\CommentPost;
use Illuminate\Contracts\Events\Dispatcher;

class FormatPostMentions
Expand All @@ -37,14 +37,14 @@ public function __construct(UrlGenerator $url)
*/
public function subscribe(Dispatcher $events)
{
$events->listen(ConfigureFormatter::class, [$this, 'configure']);
$events->listen(ConfigureFormatterRenderer::class, [$this, 'render']);
$events->listen(Configuring::class, [$this, 'configure']);
$events->listen(ConfiguringRenderer::class, [$this, 'render']);
}

/**
* @param ConfigureFormatter $event
* @param Configuring $event
*/
public function configure(ConfigureFormatter $event)
public function configure(Configuring $event)
{
$configurator = $event->configurator;

Expand All @@ -69,9 +69,9 @@ public function configure(ConfigureFormatter $event)
}

/**
* @param ConfigureFormatterRenderer $event
* @param ConfiguringRenderer $event
*/
public function render(ConfigureFormatterRenderer $event)
public function render(ConfiguringRenderer $event)
{
$event->renderer->setParameter('DISCUSSION_URL', $this->url->toRoute('discussion', ['id' => '']));
}
Expand Down
26 changes: 13 additions & 13 deletions src/Listener/FormatUserMentions.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

namespace Flarum\Mentions\Listener;

use Flarum\Core\Repository\UserRepository;
use Flarum\Event\ConfigureFormatter;
use Flarum\Event\ConfigureFormatterParser;
use Flarum\Event\ConfigureFormatterRenderer;
use Flarum\Formatter\Event\Configuring;
use Flarum\Formatter\Event\ConfiguringParser;
use Flarum\Formatter\Event\ConfiguringRenderer;
use Flarum\Forum\UrlGenerator;
use Flarum\User\UserRepository;
use Illuminate\Contracts\Events\Dispatcher;

class FormatUserMentions
Expand Down Expand Up @@ -45,15 +45,15 @@ public function __construct(UserRepository $users, UrlGenerator $url)
*/
public function subscribe(Dispatcher $events)
{
$events->listen(ConfigureFormatter::class, [$this, 'configure']);
$events->listen(ConfigureFormatterParser::class, [$this, 'parse']);
$events->listen(ConfigureFormatterRenderer::class, [$this, 'render']);
$events->listen(Configuring::class, [$this, 'configure']);
$events->listen(ConfiguringParser::class, [$this, 'parse']);
$events->listen(ConfiguringRenderer::class, [$this, 'render']);
}

/**
* @param ConfigureFormatter $event
* @param Configuring $event
*/
public function configure(ConfigureFormatter $event)
public function configure(Configuring $event)
{
$configurator = $event->configurator;

Expand All @@ -73,17 +73,17 @@ public function configure(ConfigureFormatter $event)
}

/**
* @param ConfigureFormatterParser $event
* @param ConfiguringParser $event
*/
public function parse(ConfigureFormatterParser $event)
public function parse(ConfiguringParser $event)
{
$event->parser->registeredVars['userRepository'] = $this->users;
}

/**
* @param ConfigureFormatterRenderer $event
* @param ConfiguringRenderer $event
*/
public function render(ConfigureFormatterRenderer $event)
public function render(ConfiguringRenderer $event)
{
$event->renderer->setParameter('PROFILE_URL', $this->url->toRoute('user', ['username' => '']));
}
Expand Down
48 changes: 24 additions & 24 deletions src/Listener/UpdatePostMentionsMetadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@

namespace Flarum\Mentions\Listener;

use Flarum\Api\Serializer\PostBasicSerializer;
use Flarum\Core\Notification\NotificationSyncer;
use Flarum\Core\Post;
use Flarum\Api\Serializer\BasicPostSerializer;
use Flarum\Event\ConfigureNotificationTypes;
use Flarum\Event\PostWasDeleted;
use Flarum\Event\PostWasHidden;
use Flarum\Event\PostWasPosted;
use Flarum\Event\PostWasRestored;
use Flarum\Event\PostWasRevised;
use Flarum\Mentions\Notification\PostMentionedBlueprint;
use Flarum\Notification\NotificationSyncer;
use Flarum\Post\Event\Deleted;
use Flarum\Post\Event\Hidden;
use Flarum\Post\Event\Posted;
use Flarum\Post\Event\Restored;
use Flarum\Post\Event\Revised;
use Flarum\Post\Post;
use Illuminate\Contracts\Events\Dispatcher;
use s9e\TextFormatter\Utils;

Expand All @@ -45,57 +45,57 @@ public function __construct(NotificationSyncer $notifications)
public function subscribe(Dispatcher $events)
{
$events->listen(ConfigureNotificationTypes::class, [$this, 'addNotificationType']);
$events->listen(PostWasPosted::class, [$this, 'whenPostWasPosted']);
$events->listen(PostWasRevised::class, [$this, 'whenPostWasRevised']);
$events->listen(PostWasHidden::class, [$this, 'whenPostWasHidden']);
$events->listen(PostWasRestored::class, [$this, 'whenPostWasRestored']);
$events->listen(PostWasDeleted::class, [$this, 'whenPostWasDeleted']);
$events->listen(Posted::class, [$this, 'whenPosted']);
$events->listen(Revised::class, [$this, 'whenRevised']);
$events->listen(Hidden::class, [$this, 'whenHidden']);
$events->listen(Restored::class, [$this, 'whenRestored']);
$events->listen(Deleted::class, [$this, 'whenDeleted']);
}

/**
* @param ConfigureNotificationTypes $event
*/
public function addNotificationType(ConfigureNotificationTypes $event)
{
$event->add(PostMentionedBlueprint::class, PostBasicSerializer::class, ['alert']);
$event->add(PostMentionedBlueprint::class, BasicPostSerializer::class, ['alert']);
}

/**
* @param PostWasPosted $event
* @param Posted $event
*/
public function whenPostWasPosted(PostWasPosted $event)
public function whenPosted(Posted $event)
{
$this->replyBecameVisible($event->post);
}

/**
* @param PostWasRevised $event
* @param Revised $event
*/
public function whenPostWasRevised(PostWasRevised $event)
public function whenRevised(Revised $event)
{
$this->replyBecameVisible($event->post);
}

/**
* @param PostWasHidden $event
* @param Hidden $event
*/
public function whenPostWasHidden(PostWasHidden $event)
public function whenHidden(Hidden $event)
{
$this->replyBecameInvisible($event->post);
}

/**
* @param PostWasRestored $event
* @param Restored $event
*/
public function whenPostWasRestored(PostWasRestored $event)
public function whenRestored(Restored $event)
{
$this->replyBecameVisible($event->post);
}

/**
* @param PostWasDeleted $event
* @param Deleted $event
*/
public function whenPostWasDeleted(PostWasDeleted $event)
public function whenDeleted(Deleted $event)
{
$this->replyBecameInvisible($event->post);
}
Expand Down
Loading

0 comments on commit 76387c6

Please sign in to comment.