mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 22:47:33 +02:00
Code Issues Releases Wiki Activity

Apply namespace changes for beta 8 (#12)

Browse Source 
* Update for beta 8

* StyleCI :)

* docBlock

* whenSavingUser
This commit is contained in:
Charlie
2017-09-14 10:41:56 -07:00
committed by Franz Liedke
parent 4e9184ae32
commit d6be091b79
7 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/suspend/migrations/2017_07_22_000000_add_default_permissions.php
View File

@@ -9,8 +9,8 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Flarum\Core\Group;
use Flarum\Database\Migration; use Flarum\Database\Migration;
use Flarum\Group\Group;
return Migration::addPermissions([ return Migration::addPermissions([
'user.suspend' => Group::MODERATOR_ID 'user.suspend' => Group::MODERATOR_ID

4
extensions/suspend/src/Access/UserPolicy.php
View File

@@ -11,8 +11,8 @@
namespace Flarum\Suspend\Access; namespace Flarum\Suspend\Access;
use Flarum\Core\Access\AbstractPolicy; use Flarum\User\AbstractPolicy;
use Flarum\Core\User; use Flarum\User\User;
class UserPolicy extends AbstractPolicy class UserPolicy extends AbstractPolicy
{ {

9
extensions/suspend/src/Listener/AddClientAssets.php
View File

@@ -11,7 +11,7 @@
namespace Flarum\Suspend\Listener; namespace Flarum\Suspend\Listener;
use Flarum\Event\ConfigureWebApp; use Flarum\Frontend\Event\Rendering;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class AddClientAssets class AddClientAssets
@@ -21,13 +21,10 @@ class AddClientAssets
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(ConfigureWebApp::class, [$this, 'addAssets']); $events->listen(Rendering::class, [$this, 'addAssets']);
} }
/** public function addAssets(Rendering $event)
* @param ConfigureClientView $event
*/
public function addAssets(ConfigureWebApp $event)
{ {
if ($event->isForum()) { if ($event->isForum()) {
$event->addAssets([ $event->addAssets([

10
extensions/suspend/src/Listener/AddUserSuspendAttributes.php
View File

@@ -11,10 +11,10 @@
namespace Flarum\Suspend\Listener; namespace Flarum\Suspend\Listener;
use Flarum\Api\Event\Serializing;
use Flarum\Api\Serializer\UserSerializer; use Flarum\Api\Serializer\UserSerializer;
use Flarum\Core\User;
use Flarum\Event\ConfigureModelDates; use Flarum\Event\ConfigureModelDates;
use Flarum\Event\PrepareApiAttributes; use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class AddUserSuspendAttributes class AddUserSuspendAttributes
@@ -25,7 +25,7 @@ class AddUserSuspendAttributes
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(ConfigureModelDates::class, [$this, 'addDates']); $events->listen(ConfigureModelDates::class, [$this, 'addDates']);
$events->listen(PrepareApiAttributes::class, [$this, 'addAttributes']); $events->listen(Serializing::class, [$this, 'addAttributes']);
} }
/** /**
@@ -39,9 +39,9 @@ class AddUserSuspendAttributes
} }
/** /**
* @param PrepareApiAttributes $event * @param Serializing $event
*/ */
public function addAttributes(PrepareApiAttributes $event) public function addAttributes(Serializing $event)
{ {
if ($event->isSerializer(UserSerializer::class)) { if ($event->isSerializer(UserSerializer::class)) {
$canSuspend = $event->actor->can('suspend', $event->model); $canSuspend = $event->actor->can('suspend', $event->model);

2
extensions/suspend/src/Listener/RevokeAccessFromSuspendedUsers.php
View File

@@ -12,8 +12,8 @@
namespace Flarum\Suspend\Listener; namespace Flarum\Suspend\Listener;
use Carbon\Carbon; use Carbon\Carbon;
use Flarum\Core\Group;
use Flarum\Event\PrepareUserGroups; use Flarum\Event\PrepareUserGroups;
use Flarum\Group\Group;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class RevokeAccessFromSuspendedUsers class RevokeAccessFromSuspendedUsers

10
extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
View File

@@ -12,9 +12,9 @@
namespace Flarum\Suspend\Listener; namespace Flarum\Suspend\Listener;
use DateTime; use DateTime;
use Flarum\Core\Access\AssertPermissionTrait;
use Flarum\Event\UserWillBeSaved;
use Flarum\Suspend\SuspendValidator; use Flarum\Suspend\SuspendValidator;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Event\Saving;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class SaveSuspensionToDatabase class SaveSuspensionToDatabase
@@ -41,13 +41,13 @@ class SaveSuspensionToDatabase
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(UserWillBeSaved::class, [$this, 'whenUserWillBeSaved']); $events->listen(Saving::class, [$this, 'whenSavingUser']);
} }
/** /**
* @param UserWillBeSaved $event * @param Saving $event
*/ */
public function whenUserWillBeSaved(UserWillBeSaved $event) public function whenSavingUser(Saving $event)
{ {
$attributes = array_get($event->data, 'attributes', []); $attributes = array_get($event->data, 'attributes', []);

2
extensions/suspend/src/SuspendValidator.php
View File

@@ -11,7 +11,7 @@
namespace Flarum\Suspend; namespace Flarum\Suspend;
use Flarum\Core\Validator\AbstractValidator; use Flarum\Foundation\AbstractValidator;
class SuspendValidator extends AbstractValidator class SuspendValidator extends AbstractValidator
{ {