Merge "Document SearchDatabase::doSearchTextInDB to return null"

diff --combined includes/search/SearchDatabase.php
index 0c5d4da,c444958..a057aa8
--- 1/includes/search/SearchDatabase.php
--- 2/includes/search/SearchDatabase.php
+++ b/includes/search/SearchDatabase.php
@@@ -51,7 -51,7 +51,7 @@@ abstract class SearchDatabase extends S
  
        /**
         * @param string $term
 -       * @return SearchResultSet|Status|null
 +       * @return ISearchResultSet|Status|null
         */
        final public function doSearchText( $term ) {
                return $this->doSearchTextInDB( $this->extractNamespacePrefix( $term ) );
@@@ -61,13 -61,13 +61,13 @@@
         * Perform a full text search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        abstract protected function doSearchTextInDB( $term );
  
        /**
         * @param string $term
 -       * @return SearchResultSet|null
 +       * @return ISearchResultSet|null
         */
        final public function doSearchTitle( $term ) {
                return $this->doSearchTitleInDB( $this->extractNamespacePrefix( $term ) );
@@@ -77,7 -77,7 +77,7 @@@
         * Perform a title-only search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        abstract protected function doSearchTitleInDB( $term );
  

diff --combined includes/search/SearchOracle.php
index 7240e81,e8c0eb6..d0869bc
--- 1/includes/search/SearchOracle.php
--- 2/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@@ -64,11 -64,11 +64,11 @@@ class SearchOracle extends SearchDataba
         * Perform a full text search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        protected function doSearchTextInDB( $term ) {
                if ( $term == '' ) {
-                       return new SqlSearchResultSet( false, '' );
+                       return null;
                }
  
                $dbr = $this->lb->getConnectionRef( DB_REPLICA );
@@@ -80,11 -80,11 +80,11 @@@
         * Perform a title-only search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        protected function doSearchTitleInDB( $term ) {
                if ( $term == '' ) {
-                       return new SqlSearchResultSet( false, '' );
+                       return null;
                }
  
                $dbr = $this->lb->getConnectionRef( DB_REPLICA );
@@@ -240,7 -240,7 +240,7 @@@
         * @param string $text
         */
        function update( $id, $title, $text ) {
 -              $dbw = $this->lb->getConnection( DB_MASTER );
 +              $dbw = $this->lb->getMaintenanceConnectionRef( DB_MASTER );
                $dbw->replace( 'searchindex',
                        [ 'si_page' ],
                        [

diff --combined includes/search/SearchSqlite.php
index dedcdff,459a229..9375ef2
--- 1/includes/search/SearchSqlite.php
--- 2/includes/search/SearchSqlite.php
+++ b/includes/search/SearchSqlite.php
@@@ -33,15 -33,11 +33,15 @@@ class SearchSqlite extends SearchDataba
         * Whether fulltext search is supported by current schema
         * @return bool
         */
 -      function fulltextSearchSupported() {
 +      private function fulltextSearchSupported() {
 +              // Avoid getConnectionRef() in order to get DatabaseSqlite specifically
                /** @var DatabaseSqlite $dbr */
                $dbr = $this->lb->getConnection( DB_REPLICA );
 -
 -              return $dbr->checkForEnabledSearch();
 +              try {
 +                      return $dbr->checkForEnabledSearch();
 +              } finally {
 +                      $this->lb->reuseConnection( $dbr );
 +              }
        }
  
        /**
@@@ -165,7 -161,7 +165,7 @@@
         * Perform a full text search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        protected function doSearchTextInDB( $term ) {
                return $this->searchInternal( $term, true );
@@@ -175,7 -171,7 +175,7 @@@
         * Perform a title-only search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        protected function doSearchTitleInDB( $term ) {
                return $this->searchInternal( $term, false );
@@@ -289,7 -285,7 +289,7 @@@
         * @param string $title
         * @param string $text
         */
 -      function update( $id, $title, $text ) {
 +      public function update( $id, $title, $text ) {
                if ( !$this->fulltextSearchSupported() ) {
                        return;
                }
@@@ -312,7 -308,7 +312,7 @@@
         * @param int $id
         * @param string $title
         */
 -      function updateTitle( $id, $title ) {
 +      public function updateTitle( $id, $title ) {
                if ( !$this->fulltextSearchSupported() ) {
                        return;
                }