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 33479b7 commit d8f3052
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion migrations/2017_07_22_000000_add_default_permissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* file that was distributed with this source code.
*/

use Flarum\Core\Group;
use Flarum\Database\Migration;
use Flarum\Group\Group;

return Migration::addPermissions([
'discussion.lock' => Group::MODERATOR_ID
Expand Down
6 changes: 3 additions & 3 deletions src/Access/DiscussionPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace Flarum\Lock\Access;

use Flarum\Core\Access\AbstractPolicy;
use Flarum\Core\Discussion;
use Flarum\Core\User;
use Flarum\Discussion\Discussion;
use Flarum\User\AbstractPolicy;
use Flarum\User\User;

class DiscussionPolicy extends AbstractPolicy
{
Expand Down
6 changes: 3 additions & 3 deletions src/Access/PostPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace Flarum\Lock\Access;

use Flarum\Core\Access\AbstractPolicy;
use Flarum\Core\Post;
use Flarum\Core\User;
use Flarum\Post\Post;
use Flarum\User\AbstractPolicy;
use Flarum\User\User;

class PostPolicy extends AbstractPolicy
{
Expand Down
4 changes: 2 additions & 2 deletions src/Event/DiscussionWasLocked.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

namespace Flarum\Lock\Event;

use Flarum\Core\Discussion;
use Flarum\Core\User;
use Flarum\Discussion\Discussion;
use Flarum\User\User;

class DiscussionWasLocked
{
Expand Down
4 changes: 2 additions & 2 deletions src/Event/DiscussionWasUnlocked.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

namespace Flarum\Lock\Event;

use Flarum\Core\Discussion;
use Flarum\Core\User;
use Flarum\Discussion\Discussion;
use Flarum\User\User;

class DiscussionWasUnlocked
{
Expand Down
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\Lock\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
8 changes: 4 additions & 4 deletions src/Listener/AddDiscussionLockedAttributes.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

namespace Flarum\Lock\Listener;

use Flarum\Api\Event\Serializing;
use Flarum\Api\Serializer\DiscussionSerializer;
use Flarum\Event\PrepareApiAttributes;
use Illuminate\Contracts\Events\Dispatcher;

class AddDiscussionLockedAttributes
Expand All @@ -22,13 +22,13 @@ class AddDiscussionLockedAttributes
*/
public function subscribe(Dispatcher $events)
{
$events->listen(PrepareApiAttributes::class, [$this, 'prepareApiAttributes']);
$events->listen(Serializing::class, [$this, 'prepareApiAttributes']);
}

/**
* @param PrepareApiAttributes $event
* @param Serializing $event
*/
public function prepareApiAttributes(PrepareApiAttributes $event)
public function prepareApiAttributes(Serializing $event)
{
if ($event->isSerializer(DiscussionSerializer::class)) {
$event->attributes['isLocked'] = (bool) $event->model->is_locked;
Expand Down
8 changes: 4 additions & 4 deletions src/Listener/CreatePostWhenDiscussionIsLocked.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@

namespace Flarum\Lock\Listener;

use Flarum\Api\Serializer\DiscussionBasicSerializer;
use Flarum\Core\Discussion;
use Flarum\Api\Serializer\BasicDiscussionSerializer;
use Flarum\Core\Notification\NotificationSyncer;
use Flarum\Core\User;
use Flarum\Discussion\Discussion;
use Flarum\Event\ConfigureNotificationTypes;
use Flarum\Event\ConfigurePostTypes;
use Flarum\Lock\Event\DiscussionWasLocked;
use Flarum\Lock\Event\DiscussionWasUnlocked;
use Flarum\Lock\Notification\DiscussionLockedBlueprint;
use Flarum\Lock\Post\DiscussionLockedPost;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;

class CreatePostWhenDiscussionIsLocked
Expand Down Expand Up @@ -62,7 +62,7 @@ public function addPostType(ConfigurePostTypes $event)
*/
public function addNotificationType(ConfigureNotificationTypes $event)
{
$event->add(DiscussionLockedBlueprint::class, DiscussionBasicSerializer::class, ['alert']);
$event->add(DiscussionLockedBlueprint::class, BasicDiscussionSerializer::class, ['alert']);
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/Listener/SaveLockedToDatabase.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

namespace Flarum\Lock\Listener;

use Flarum\Core\Access\AssertPermissionTrait;
use Flarum\Event\DiscussionWillBeSaved;
use Flarum\Discussion\Event\Saving;
use Flarum\Lock\Event\DiscussionWasLocked;
use Flarum\Lock\Event\DiscussionWasUnlocked;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Events\Dispatcher;

class SaveLockedToDatabase
Expand All @@ -26,13 +26,13 @@ class SaveLockedToDatabase
*/
public function subscribe(Dispatcher $events)
{
$events->listen(DiscussionWillBeSaved::class, [$this, 'whenDiscussionWillBeSaved']);
$events->listen(Saving::class, [$this, 'whenSaving']);
}

/**
* @param DiscussionWillBeSaved $event
* @param Saving $event
*/
public function whenDiscussionWillBeSaved(DiscussionWillBeSaved $event)
public function whenSaving(Saving $event)
{
if (isset($event->data['attributes']['isLocked'])) {
$isLocked = (bool) $event->data['attributes']['isLocked'];
Expand Down
4 changes: 2 additions & 2 deletions src/Notification/DiscussionLockedBlueprint.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace Flarum\Lock\Notification;

use Flarum\Core\Discussion;
use Flarum\Core\Notification\BlueprintInterface;
use Flarum\Discussion\Discussion;
use Flarum\Lock\Post\DiscussionLockedPost;
use Flarum\Notification\Blueprint\BlueprintInterface;

class DiscussionLockedBlueprint implements BlueprintInterface
{
Expand Down
6 changes: 3 additions & 3 deletions src/Post/DiscussionLockedPost.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace Flarum\Lock\Post;

use Flarum\Core\Post;
use Flarum\Core\Post\AbstractEventPost;
use Flarum\Core\Post\MergeableInterface;
use Flarum\Post\Post;
use Flarum\Post\Post\AbstractEventPost;
use Flarum\Post\Post\MergeableInterface;

class DiscussionLockedPost extends AbstractEventPost implements MergeableInterface
{
Expand Down

0 comments on commit d8f3052

Please sign in to comment.