Merge "Break the cyclic dependency between SearchEngine and SearchResult"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 9a4aeb3..6e78948 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -345,6 +345,9 @@ because of Phabricator reports.
   dropped.
 * MessageCache::destroyInstance() has been removed. Instead, call
   MediaWikiTestCase::resetServices().
+* SearchResult protected field $searchEngine is removed and no longer
+  initialized after calling SearchResult::initFromTitle().
+* …
 
 === Deprecations in 1.34 ===
 * The MWNamespace class is deprecated. Use NamespaceInfo.

diff --git a/includes/search/SearchResult.php b/includes/search/SearchResult.php
index b924b29..1954e85 100644 (file)
--- a/includes/search/SearchResult.php
+++ b/includes/search/SearchResult.php
@@ -51,11 +51,6 @@ class SearchResult {
         */
        protected $mText;
 
-       /**
-        * @var SearchEngine
-        */
-       protected $searchEngine;
-
        /**
         * A function returning a set of extension data.
         * @var Closure|null
@@ -96,7 +91,6 @@ class SearchResult {
                                $this->mImage = $services->getRepoGroup()->findFile( $this->mTitle );
                        }
                }
-               $this->searchEngine = $services->newSearchEngine();
        }
 
        /**