DI for CommentStore in WatchedItemQueryService

[lhc/web/wiklou.git] / includes / watcheditem / WatchedItemQueryService.php

diff --git a/includes/watcheditem/WatchedItemQueryService.php b/includes/watcheditem/WatchedItemQueryService.php
index 3478b08..abe9b89 100644 (file)
--- a/includes/watcheditem/WatchedItemQueryService.php
+++ b/includes/watcheditem/WatchedItemQueryService.php
@@ -56,12 +56,15 @@ class WatchedItemQueryService {
        /** @var WatchedItemQueryServiceExtension[]|null */
        private $extensions = null;
 
-       /**
-        * @var CommentStore|null */
-       private $commentStore = null;
+       /** @var CommentStore */
+       private $commentStore;
 
-       public function __construct( LoadBalancer $loadBalancer ) {
+       public function __construct(
+               LoadBalancer $loadBalancer,
+               CommentStore $commentStore
+       ) {
                $this->loadBalancer = $loadBalancer;
+               $this->commentStore = $commentStore;
        }
 
        /**
@@ -83,13 +86,6 @@ class WatchedItemQueryService {
                return $this->loadBalancer->getConnectionRef( DB_REPLICA, [ 'watchlist' ] );
        }
 
-       private function getCommentStore() {
-               if ( !$this->commentStore ) {
-                       $this->commentStore = new CommentStore( 'rc_comment' );
-               }
-               return $this->commentStore;
-       }
-
        /**
         * @param User $user
         * @param array $options Allowed keys:
@@ -334,7 +330,7 @@ class WatchedItemQueryService {
                        $tables[] = 'page';
                }
                if ( in_array( self::INCLUDE_COMMENT, $options['includeFields'] ) ) {
-                       $tables += $this->getCommentStore()->getJoin()['tables'];
+                       $tables += $this->commentStore->getJoin( 'rc_comment' )['tables'];
                }
                if ( in_array( self::INCLUDE_TAGS, $options['includeFields'] ) ) {
                        $tables[] = 'tag_summary';
@@ -377,7 +373,7 @@ class WatchedItemQueryService {
                        $fields[] = 'rc_user';
                }
                if ( in_array( self::INCLUDE_COMMENT, $options['includeFields'] ) ) {
-                       $fields += $this->getCommentStore()->getJoin()['fields'];
+                       $fields += $this->commentStore->getJoin( 'rc_comment' )['fields'];
                }
                if ( in_array( self::INCLUDE_PATROL_INFO, $options['includeFields'] ) ) {
                        $fields = array_merge( $fields, [ 'rc_patrolled', 'rc_log_type' ] );
@@ -684,7 +680,7 @@ class WatchedItemQueryService {
                        $joinConds['page'] = [ 'LEFT JOIN', 'rc_cur_id=page_id' ];
                }
                if ( in_array( self::INCLUDE_COMMENT, $options['includeFields'] ) ) {
-                       $joinConds += $this->getCommentStore()->getJoin()['joins'];
+                       $joinConds += $this->commentStore->getJoin( 'rc_comment' )['joins'];
                }
                if ( in_array( self::INCLUDE_TAGS, $options['includeFields'] ) ) {
                        $joinConds['tag_summary'] = [ 'LEFT JOIN', [ 'rc_id=ts_rc_id' ] ];