mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00
Code Issues Releases Wiki Activity

Extract Flarum\Group namespace

Browse Source
This commit is contained in:
Franz Liedke
2017-06-24 14:05:00 +02:00
parent 11bf3e34b7
commit c22219ec20
24 changed files with 69 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/Command/CreateGroupHandler.php
View File

@@ -13,10 +13,10 @@ namespace Flarum\Core\Command;
use Flarum\Core\Access\AssertPermissionTrait;
use Flarum\User\Exception\PermissionDeniedException;
use Flarum\Core\Group;
use Flarum\Group\Group;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\Core\Validator\GroupValidator;
use Flarum\Event\GroupWillBeSaved;
use Flarum\Group\GroupValidator;
use Flarum\Group\Event\Saving;
use Illuminate\Contracts\Events\Dispatcher;
class CreateGroupHandler
@@ -25,13 +25,13 @@ class CreateGroupHandler
use AssertPermissionTrait;
/**
* @var GroupValidator
* @var \Flarum\Group\GroupValidator
*/
protected $validator;
/**
* @param Dispatcher $events
* @param GroupValidator $validator
* @param \Flarum\Group\GroupValidator $validator
*/
public function __construct(Dispatcher $events, GroupValidator $validator)
{
@@ -41,7 +41,7 @@ class CreateGroupHandler
/**
* @param CreateGroup $command
* @return Group
* @return \Flarum\Group\Group
* @throws \Flarum\User\Exception\PermissionDeniedException
*/
public function handle(CreateGroup $command)
@@ -59,7 +59,7 @@ class CreateGroupHandler
);
$this->events->fire(
new GroupWillBeSaved($group, $actor, $data)
new Saving($group, $actor, $data)
);
$this->validator->assertValid($group->getAttributes());

8
src/Core/Command/DeleteGroupHandler.php
View File

@@ -13,9 +13,9 @@ namespace Flarum\Core\Command;
use Flarum\Core\Access\AssertPermissionTrait;
use Flarum\User\Exception\PermissionDeniedException;
use Flarum\Core\Repository\GroupRepository;
use Flarum\Group\GroupRepository;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\Event\GroupWillBeDeleted;
use Flarum\Group\Event\Deleting;
use Illuminate\Contracts\Events\Dispatcher;
class DeleteGroupHandler
@@ -39,7 +39,7 @@ class DeleteGroupHandler
/**
* @param DeleteGroup $command
* @return \Flarum\Core\Group
* @return \Flarum\Group\Group
* @throws PermissionDeniedException
*/
public function handle(DeleteGroup $command)
@@ -51,7 +51,7 @@ class DeleteGroupHandler
$this->assertCan($actor, 'delete', $group);
$this->events->fire(
new GroupWillBeDeleted($group, $actor, $command->data)
new Deleting($group, $actor, $command->data)
);
$group->delete();

12
src/Core/Command/EditGroupHandler.php
View File

@@ -13,11 +13,11 @@ namespace Flarum\Core\Command;
use Flarum\Core\Access\AssertPermissionTrait;
use Flarum\User\Exception\PermissionDeniedException;
use Flarum\Core\Group;
use Flarum\Core\Repository\GroupRepository;
use Flarum\Group\Group;
use Flarum\Group\GroupRepository;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\Core\Validator\GroupValidator;
use Flarum\Event\GroupWillBeSaved;
use Flarum\Group\GroupValidator;
use Flarum\Group\Event\Saving;
use Illuminate\Contracts\Events\Dispatcher;
class EditGroupHandler
@@ -26,7 +26,7 @@ class EditGroupHandler
use AssertPermissionTrait;
/**
* @var GroupRepository
* @var \Flarum\Group\GroupRepository
*/
protected $groups;
@@ -76,7 +76,7 @@ class EditGroupHandler
}
$this->events->fire(
new GroupWillBeSaved($group, $actor, $data)
new Saving($group, $actor, $data)
);
$this->validator->assertValid($group->getDirty());