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

fixed several column changes found by tests

Browse Source
This commit is contained in:
Daniel Klabbers
2018-05-14 11:34:24 +02:00
parent 04e17fbd8c
commit 80cc03e4f1
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,7 +399,7 @@ class Discussion extends AbstractModel
*/ */
public function readers() public function readers()
{ {
return $this->belongsToMany(User::class, 'users_discussions'); return $this->belongsToMany(User::class, 'discussions_users');
} }
/** /**

2
framework/core/src/Post/Floodgate.php
View File

@@ -50,6 +50,6 @@ class Floodgate
new CheckingForFlooding($actor) new CheckingForFlooding($actor)
); );
return $isFlooding ?? Post::where('user_id', $actor->id)->where('time', '>=', new DateTime('-10 seconds'))->exists(); return $isFlooding ?? Post::where('user_id', $actor->id)->where('created_at', '>=', new DateTime('-10 seconds'))->exists();
} }
} }

7
framework/core/src/User/EmailToken.php
View File

@@ -16,7 +16,10 @@ use Flarum\Database\AbstractModel;
use Flarum\User\Exception\InvalidConfirmationTokenException; use Flarum\User\Exception\InvalidConfirmationTokenException;
/** /**
* @todo document database columns with @property * @property string $token
* @property int $user_id
* @property \Carbon\Carbon $created_at
* @property string $email
*/ */
class EmailToken extends AbstractModel class EmailToken extends AbstractModel
{ {
@@ -49,7 +52,7 @@ class EmailToken extends AbstractModel
{ {
$token = new static; $token = new static;
$token->id = str_random(40); $token->token = str_random(40);
$token->user_id = $userId; $token->user_id = $userId;
$token->email = $email; $token->email = $email;
$token->created_at = time(); $token->created_at = time();

4
framework/core/src/User/User.php
View File

@@ -50,8 +50,8 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
* @property \Carbon\Carbon|null $last_seen_at * @property \Carbon\Carbon|null $last_seen_at
* @property \Carbon\Carbon|null $marked_all_as_read_at * @property \Carbon\Carbon|null $marked_all_as_read_at
* @property \Carbon\Carbon|null $read_notifications_at * @property \Carbon\Carbon|null $read_notifications_at
* @property int $discussions_count * @property int $discussion_count
* @property int $comments_count * @property int $comment_count
*/ */
class User extends AbstractModel class User extends AbstractModel
{ {

4
framework/core/src/User/UserMetadataUpdater.php
View File

@@ -93,7 +93,7 @@ class UserMetadataUpdater
$user = $post->user; $user = $post->user;
if ($user && $user->exists) { if ($user && $user->exists) {
$user->comments_count += $amount; $user->comment_count += $amount;
$user->save(); $user->save();
} }
} }
@@ -107,7 +107,7 @@ class UserMetadataUpdater
$user = $discussion->startUser; $user = $discussion->startUser;
if ($user && $user->exists) { if ($user && $user->exists) {
$user->discussions_count += $amount; $user->discussion_count += $amount;
$user->save(); $user->save();
} }
} }

2
framework/core/tests/Api/Controller/CreateUserControllerTest.php
View File

@@ -74,7 +74,7 @@ class CreateUserControllerTest extends ApiControllerTestCase
/** @var User $user */ /** @var User $user */
$user = User::where('username', 'test')->firstOrFail(); $user = User::where('username', 'test')->firstOrFail();
$this->assertEquals(1, $user->is_activated); $this->assertEquals(1, $user->is_email_confirmed);
} }
/** /**