mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-20 08:11:27 +02:00
Code Issues Releases Wiki Activity

Move UserState class to Flarum\Discussion namespace

Browse Source
This commit is contained in:
Franz Liedke
2017-06-24 14:24:42 +02:00
parent 600f50198b
commit d6954a997a
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Core/Command/ReadDiscussionHandler.php
View File

@@ -39,7 +39,7 @@ class ReadDiscussionHandler
/** /**
* @param ReadDiscussion $command * @param ReadDiscussion $command
* @return \Flarum\Core\DiscussionState * @return \Flarum\Discussion\UserState
* @throws \Flarum\User\Exception\PermissionDeniedException * @throws \Flarum\User\Exception\PermissionDeniedException
*/ */
public function handle(ReadDiscussion $command) public function handle(ReadDiscussion $command)

10
framework/core/src/Discussion/Discussion.php
View File

@@ -11,7 +11,7 @@
namespace Flarum\Discussion; namespace Flarum\Discussion;
use Flarum\Core\DiscussionState; use Flarum\Discussion\UserState;
use Flarum\Post\MergeableInterface; use Flarum\Post\MergeableInterface;
use Flarum\Foundation\EventGeneratorTrait; use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Database\ScopeVisibilityTrait; use Flarum\Database\ScopeVisibilityTrait;
@@ -44,7 +44,7 @@ use Flarum\Util\Str;
* @property int|null $last_post_number * @property int|null $last_post_number
* @property \Carbon\Carbon|null $hide_time * @property \Carbon\Carbon|null $hide_time
* @property int|null $hide_user_id * @property int|null $hide_user_id
* @property DiscussionState|null $state * @property UserState|null $state
* @property \Illuminate\Database\Eloquent\Collection $posts * @property \Illuminate\Database\Eloquent\Collection $posts
* @property \Illuminate\Database\Eloquent\Collection $comments * @property \Illuminate\Database\Eloquent\Collection $comments
* @property \Illuminate\Database\Eloquent\Collection $participants * @property \Illuminate\Database\Eloquent\Collection $participants
@@ -416,7 +416,7 @@ class Discussion extends AbstractModel
{ {
$user = $user ?: static::$stateUser; $user = $user ?: static::$stateUser;
return $this->hasOne('Flarum\Core\DiscussionState')->where('user_id', $user ? $user->id : null); return $this->hasOne('Flarum\Discussion\UserState')->where('user_id', $user ? $user->id : null);
} }
/** /**
@@ -424,14 +424,14 @@ class Discussion extends AbstractModel
* exist. * exist.
* *
* @param User $user * @param User $user
* @return \Flarum\Core\DiscussionState * @return \Flarum\Discussion\UserState
*/ */
public function stateFor(User $user) public function stateFor(User $user)
{ {
$state = $this->state($user)->first(); $state = $this->state($user)->first();
if (! $state) { if (! $state) {
$state = new DiscussionState; $state = new UserState;
$state->discussion_id = $this->id; $state->discussion_id = $this->id;
$state->user_id = $user->id; $state->user_id = $user->id;
} }

8
framework/core/src/Discussion/Event/UserDataSaving.php
View File

@@ -11,19 +11,19 @@
namespace Flarum\Discussion\Event; namespace Flarum\Discussion\Event;
use Flarum\Core\DiscussionState; use Flarum\Discussion\UserState;
class UserDataSaving class UserDataSaving
{ {
/** /**
* @var DiscussionState * @var \Flarum\Discussion\UserState
*/ */
public $state; public $state;
/** /**
* @param DiscussionState $state * @param \Flarum\Discussion\UserState $state
*/ */
public function __construct(DiscussionState $state) public function __construct(UserState $state)
{ {
$this->state = $state; $this->state = $state;
} }

8
framework/core/src/Discussion/Event/UserRead.php
View File

@@ -11,19 +11,19 @@
namespace Flarum\Discussion\Event; namespace Flarum\Discussion\Event;
use Flarum\Core\DiscussionState; use Flarum\Discussion\UserState;
class UserRead class UserRead
{ {
/** /**
* @var DiscussionState * @var UserState
*/ */
public $state; public $state;
/** /**
* @param DiscussionState $state * @param UserState $state
*/ */
public function __construct(DiscussionState $state) public function __construct(UserState $state)
{ {
$this->state = $state; $this->state = $state;
} }

4
framework/core/src/Core/DiscussionState.php → framework/core/src/Discussion/UserState.php
View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Flarum\Core; namespace Flarum\Discussion;
use Flarum\Discussion\Discussion; use Flarum\Discussion\Discussion;
use Flarum\Foundation\EventGeneratorTrait; use Flarum\Foundation\EventGeneratorTrait;
@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Builder;
* @property Discussion $discussion * @property Discussion $discussion
* @property \Flarum\User\User $user * @property \Flarum\User\User $user
*/ */
class DiscussionState extends AbstractModel class UserState extends AbstractModel
{ {
use EventGeneratorTrait; use EventGeneratorTrait;