From 20373718861a2ef829e8b32eac5e6092440f7b11 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Thu, 5 Oct 2017 13:39:41 +0200 Subject: [PATCH] lists > pluck --- composer.json | 38 +++++++++---------- src/Api/Controller/CreatePostController.php | 2 +- src/Api/Controller/ListPostsController.php | 2 +- .../Controller/ShowDiscussionController.php | 2 +- .../Controller/UpdateDiscussionController.php | 2 +- src/Database/DatabaseMigrationRepository.php | 2 +- src/Discussion/DiscussionRepository.php | 2 +- .../Search/Fulltext/MySqlFulltextDriver.php | 2 +- src/Notification/NotificationSyncer.php | 2 +- src/Post/PostRepository.php | 4 +- src/Settings/DatabaseSettingsRepository.php | 2 +- src/User/User.php | 4 +- src/User/UserRepository.php | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index efdb49182..ffe0a7205 100644 --- a/composer.json +++ b/composer.json @@ -20,24 +20,24 @@ "docs": "http://flarum.org/docs" }, "require": { - "php": ">=5.6.0", + "php": ">=7.0", "dflydev/fig-cookies": "^1.0.2", "doctrine/dbal": "^2.5", "components/font-awesome": "^4.6", "franzl/whoops-middleware": "^0.4.0", - "illuminate/bus": "5.1.*", - "illuminate/cache": "5.1.*", - "illuminate/config": "5.1.*", - "illuminate/container": "5.1.*", - "illuminate/contracts": "5.1.*", - "illuminate/database": "^5.1.31", - "illuminate/events": "5.1.*", - "illuminate/filesystem": "5.1.*", - "illuminate/hashing": "5.1.*", - "illuminate/mail": "5.1.*", - "illuminate/support": "5.1.*", - "illuminate/validation": "5.1.*", - "illuminate/view": "5.1.*", + "illuminate/bus": "5.5.*", + "illuminate/cache": "5.5.*", + "illuminate/config": "5.5.*", + "illuminate/container": "5.5.*", + "illuminate/contracts": "5.5.*", + "illuminate/database": "5.5.*", + "illuminate/events": "5.5.*", + "illuminate/filesystem": "5.5.*", + "illuminate/hashing": "5.5.*", + "illuminate/mail": "5.5.*", + "illuminate/support": "5.5.*", + "illuminate/validation": "5.5.*", + "illuminate/view": "5.5.*", "intervention/image": "^2.3.0", "league/flysystem": "^1.0.11", "league/oauth2-client": "~1.0", @@ -46,10 +46,10 @@ "nikic/fast-route": "^0.6", "oyejorge/less.php": "~1.5", "psr/http-message": "^1.0", - "symfony/console": "^2.7", - "symfony/http-foundation": "^2.7", - "symfony/translation": "^2.7", - "symfony/yaml": "^2.7", + "symfony/console": "^3.3", + "symfony/http-foundation": "^3.3", + "symfony/translation": "^3.3", + "symfony/yaml": "^3.3", "s9e/text-formatter": "^0.8.1", "tobscure/json-api": "^0.3.0", "zendframework/zend-diactoros": "^1.1", @@ -57,7 +57,7 @@ }, "require-dev": { "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^6.0" }, "autoload": { "psr-4": { diff --git a/src/Api/Controller/CreatePostController.php b/src/Api/Controller/CreatePostController.php index fc7432530..1d7e9f5c2 100644 --- a/src/Api/Controller/CreatePostController.php +++ b/src/Api/Controller/CreatePostController.php @@ -83,7 +83,7 @@ class CreatePostController extends AbstractCreateController } $discussion = $post->discussion; - $discussion->posts = $discussion->postsVisibleTo($actor)->orderBy('time')->lists('id'); + $discussion->posts = $discussion->postsVisibleTo($actor)->orderBy('time')->pluck('id'); return $post; } diff --git a/src/Api/Controller/ListPostsController.php b/src/Api/Controller/ListPostsController.php index b506f814a..5c732bc6f 100644 --- a/src/Api/Controller/ListPostsController.php +++ b/src/Api/Controller/ListPostsController.php @@ -122,7 +122,7 @@ class ListPostsController extends AbstractListController $query->orderBy($field, $order); } - return $query->lists('id')->all(); + return $query->pluck('id')->all(); } /** diff --git a/src/Api/Controller/ShowDiscussionController.php b/src/Api/Controller/ShowDiscussionController.php index 4ee73d225..8cd8a2a06 100644 --- a/src/Api/Controller/ShowDiscussionController.php +++ b/src/Api/Controller/ShowDiscussionController.php @@ -117,7 +117,7 @@ class ShowDiscussionController extends AbstractShowController */ private function loadPostIds(Discussion $discussion, User $actor) { - return $discussion->postsVisibleTo($actor)->orderBy('time')->lists('id')->all(); + return $discussion->postsVisibleTo($actor)->orderBy('time')->pluck('id')->all(); } /** diff --git a/src/Api/Controller/UpdateDiscussionController.php b/src/Api/Controller/UpdateDiscussionController.php index 4cdd3a0a1..3fa1900f3 100644 --- a/src/Api/Controller/UpdateDiscussionController.php +++ b/src/Api/Controller/UpdateDiscussionController.php @@ -63,7 +63,7 @@ class UpdateDiscussionController extends AbstractShowController if ($posts = $discussion->getModifiedPosts()) { $posts = (new Collection($posts))->load('discussion', 'user'); - $discussionPosts = $discussion->postsVisibleTo($actor)->orderBy('time')->lists('id')->all(); + $discussionPosts = $discussion->postsVisibleTo($actor)->orderBy('time')->pluck('id')->all(); foreach ($discussionPosts as &$id) { foreach ($posts as $post) { diff --git a/src/Database/DatabaseMigrationRepository.php b/src/Database/DatabaseMigrationRepository.php index 49a1978e4..fdce0f00e 100755 --- a/src/Database/DatabaseMigrationRepository.php +++ b/src/Database/DatabaseMigrationRepository.php @@ -58,7 +58,7 @@ class DatabaseMigrationRepository implements MigrationRepositoryInterface return $this->table() ->where('extension', $extension) ->orderBy('migration', 'asc') - ->lists('migration'); + ->pluck('migration'); } /** diff --git a/src/Discussion/DiscussionRepository.php b/src/Discussion/DiscussionRepository.php index 11c64664a..b5dbcfcb4 100644 --- a/src/Discussion/DiscussionRepository.php +++ b/src/Discussion/DiscussionRepository.php @@ -53,7 +53,7 @@ class DiscussionRepository return Discussion::leftJoin('users_discussions', 'users_discussions.discussion_id', '=', 'discussions.id') ->where('user_id', $user->id) ->where('read_number', '>=', new Expression('last_post_number')) - ->lists('id') + ->pluck('id') ->all(); } diff --git a/src/Discussion/Search/Fulltext/MySqlFulltextDriver.php b/src/Discussion/Search/Fulltext/MySqlFulltextDriver.php index 0c1136297..f3e1a0be2 100644 --- a/src/Discussion/Search/Fulltext/MySqlFulltextDriver.php +++ b/src/Discussion/Search/Fulltext/MySqlFulltextDriver.php @@ -23,7 +23,7 @@ class MySqlFulltextDriver implements DriverInterface $discussionIds = Post::where('type', 'comment') ->whereRaw('MATCH (`content`) AGAINST (? IN BOOLEAN MODE)', [$string]) ->orderByRaw('MATCH (`content`) AGAINST (?) DESC', [$string]) - ->lists('discussion_id', 'id'); + ->pluck('discussion_id', 'id'); $relevantPostIds = []; diff --git a/src/Notification/NotificationSyncer.php b/src/Notification/NotificationSyncer.php index 7065c461d..5dc3a1843 100644 --- a/src/Notification/NotificationSyncer.php +++ b/src/Notification/NotificationSyncer.php @@ -106,7 +106,7 @@ class NotificationSyncer // removed from this collection by the above loop. Un-delete the // existing records that we want to keep. if (count($toDelete)) { - $this->setDeleted($toDelete->lists('id')->all(), true); + $this->setDeleted($toDelete->pluck('id')->all(), true); } if (count($toUndelete)) { diff --git a/src/Post/PostRepository.php b/src/Post/PostRepository.php index e6a38af03..06ba1db71 100644 --- a/src/Post/PostRepository.php +++ b/src/Post/PostRepository.php @@ -70,7 +70,7 @@ class PostRepository $query->orderBy($field, $order); } - $ids = $query->lists('id')->all(); + $ids = $query->pluck('id')->all(); return $this->findByIds($ids, $actor); } @@ -111,7 +111,7 @@ class PostRepository */ public function filterVisibleIds(array $ids, User $actor) { - return $this->queryIds($ids, $actor)->lists('id')->all(); + return $this->queryIds($ids, $actor)->pluck('id')->all(); } /** diff --git a/src/Settings/DatabaseSettingsRepository.php b/src/Settings/DatabaseSettingsRepository.php index 3179d23b9..943342d6b 100644 --- a/src/Settings/DatabaseSettingsRepository.php +++ b/src/Settings/DatabaseSettingsRepository.php @@ -24,7 +24,7 @@ class DatabaseSettingsRepository implements SettingsRepositoryInterface public function all() { - return $this->database->table('settings')->lists('value', 'key'); + return $this->database->table('settings')->pluck('value', 'key'); } public function get($key, $default = null) diff --git a/src/User/User.php b/src/User/User.php index 78858643e..e33c58493 100755 --- a/src/User/User.php +++ b/src/User/User.php @@ -650,7 +650,7 @@ class User extends AbstractModel // standard 'member' group, as well as any other groups they've been // assigned to. if ($this->is_activated) { - $groupIds = array_merge($groupIds, [Group::MEMBER_ID], $this->groups->lists('id')->all()); + $groupIds = array_merge($groupIds, [Group::MEMBER_ID], $this->groups->pluck('id')->all()); } event(new PrepareUserGroups($this, $groupIds)); @@ -665,7 +665,7 @@ class User extends AbstractModel */ public function getPermissions() { - return $this->permissions()->lists('permission')->all(); + return $this->permissions()->pluck('permission')->all(); } /** diff --git a/src/User/UserRepository.php b/src/User/UserRepository.php index bea76c55d..8619446b9 100644 --- a/src/User/UserRepository.php +++ b/src/User/UserRepository.php @@ -94,7 +94,7 @@ class UserRepository ->orderByRaw('username = ? desc', [$string]) ->orderByRaw('username like ? desc', [$string.'%']); - return $this->scopeVisibleTo($query, $actor)->lists('id'); + return $this->scopeVisibleTo($query, $actor)->pluck('id')->all(); } /**