Merge "Document SearchDatabase::doSearchTextInDB to return null"

diff --git a/includes/search/SearchDatabase.php b/includes/search/SearchDatabase.php
index 0c5d4da..a057aa8 100644 (file)
--- a/includes/search/SearchDatabase.php
+++ b/includes/search/SearchDatabase.php
@@ -61,7 +61,7 @@ abstract class SearchDatabase extends SearchEngine {
         * 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 );
 
@@ -77,7 +77,7 @@ abstract class SearchDatabase extends SearchEngine {
         * 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 --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index 6a23bb3..3c0675f 100644 (file)
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -33,7 +33,7 @@ class SearchMssql extends SearchDatabase {
         * 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 ) {
                $dbr = $this->lb->getConnectionRef( DB_REPLICA );
@@ -46,7 +46,7 @@ class SearchMssql extends SearchDatabase {
         * 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 ) {
                $dbr = $this->lb->getConnectionRef( DB_REPLICA );

diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php
index 4a6b93b..ff21367 100644 (file)
--- a/includes/search/SearchMySQL.php
+++ b/includes/search/SearchMySQL.php
@@ -163,7 +163,7 @@ class SearchMySQL extends SearchDatabase {
         * 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 );
@@ -173,7 +173,7 @@ class SearchMySQL extends SearchDatabase {
         * 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 );

diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 7240e81..d0869bc 100644 (file)
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -64,11 +64,11 @@ class SearchOracle extends SearchDatabase {
         * 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 @@ class SearchOracle extends SearchDatabase {
         * 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 );

diff --git a/includes/search/SearchSqlite.php b/includes/search/SearchSqlite.php
index dedcdff..9375ef2 100644 (file)
--- a/includes/search/SearchSqlite.php
+++ b/includes/search/SearchSqlite.php
@@ -165,7 +165,7 @@ class SearchSqlite extends SearchDatabase {
         * 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 +175,7 @@ class SearchSqlite extends SearchDatabase {
         * 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 );