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

Cleanup code, typehints and class references

Browse Source
This commit is contained in:
Franz Liedke
2017-07-02 13:29:30 +02:00
parent e46b3d54d1
commit 4aad7c1040
23 changed files with 87 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Discussion/Command/StartDiscussionHandler.php
View File

@@ -16,6 +16,7 @@ use Flarum\Discussion\Discussion;
use Flarum\Discussion\DiscussionValidator;
use Flarum\Discussion\Event\Saving;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\Post\Command\PostReply;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Bus\Dispatcher as BusDispatcher;
use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;

6
src/Discussion/DiscussionServiceProvider.php
View File

@@ -22,8 +22,8 @@ class DiscussionServiceProvider extends AbstractServiceProvider
{
$events = $this->app->make('events');
$events->subscribe('Flarum\Discussion\DiscussionMetadataUpdater');
$events->subscribe('Flarum\Discussion\DiscussionPolicy');
$events->subscribe('Flarum\Discussion\DiscussionRenamedLogger');
$events->subscribe(DiscussionMetadataUpdater::class);
$events->subscribe(DiscussionPolicy::class);
$events->subscribe(DiscussionRenamedLogger::class);
}
}

10
src/Discussion/Search/DiscussionSearcher.php
View File

@@ -17,6 +17,8 @@ use Flarum\Discussion\Event\Searching;
use Flarum\Post\PostRepository;
use Flarum\Search\ApplySearchParametersTrait;
use Flarum\Search\GambitManager;
use Flarum\Search\SearchCriteria;
use Flarum\Search\SearchResults;
use Illuminate\Database\Eloquent\Collection;
/**
@@ -58,13 +60,13 @@ class DiscussionSearcher
}
/**
* @param \Flarum\Search\SearchCriteria $criteria
* @param SearchCriteria $criteria
* @param int|null $limit
* @param int $offset
* @param array $load An array of relationships to load on the results.
* @return \Flarum\Search\SearchResults
* @return SearchResults
*/
public function search(\Flarum\Search\SearchCriteria $criteria, $limit = null, $offset = 0, array $load = [])
public function search(SearchCriteria $criteria, $limit = null, $offset = 0, array $load = [])
{
$actor = $criteria->actor;
@@ -107,7 +109,7 @@ class DiscussionSearcher
Discussion::setStateUser($actor);
$discussions->load($load);
return new \Flarum\Search\SearchResults($discussions, $areMoreResults);
return new SearchResults($discussions, $areMoreResults);
}
/**

5
src/Discussion/UserState.php
View File

@@ -14,6 +14,7 @@ namespace Flarum\Discussion;
use Flarum\Database\AbstractModel;
use Flarum\Discussion\Event\UserRead;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\User\User;
use Illuminate\Database\Eloquent\Builder;
/**
@@ -70,7 +71,7 @@ class UserState extends AbstractModel
*/
public function discussion()
{
return $this->belongsTo('Flarum\Discussion\Discussion', 'discussion_id');
return $this->belongsTo(Discussion::class, 'discussion_id');
}
/**
@@ -80,7 +81,7 @@ class UserState extends AbstractModel
*/
public function user()
{
return $this->belongsTo('Flarum\User\User', 'user_id');
return $this->belongsTo(User::class, 'user_id');
}
/**