Merge "Pass delimiter to preg_quote"

[lhc/web/wiklou.git] / tests / phpunit / mocks / search / MockSearchResultSet.php

diff --git a/tests/phpunit/mocks/search/MockSearchResultSet.php b/tests/phpunit/mocks/search/MockSearchResultSet.php
index 99f093f..38f6731 100644 (file)
--- a/tests/phpunit/mocks/search/MockSearchResultSet.php
+++ b/tests/phpunit/mocks/search/MockSearchResultSet.php
@@ -8,11 +8,12 @@ class MockSearchResultSet extends SearchResultSet {
        private $interwikiResults;
 
        /**
-        * @param SearchResult[] $results
-        * @param SearchResultSet[][] $interwikiResults Map from result type
+        * @param SearchResult[]|callable[] $results
+        * @param SearchResultSet[][]|callable[][] $interwikiResults Map from result type
         *  to list of results for that type.
         */
        public function __construct( array $results, array $interwikiResults = [] ) {
+               parent::__construct( false, false );
                $this->results = $results;
                $this->interwikiResults = $interwikiResults;
        }
@@ -26,6 +27,19 @@ class MockSearchResultSet extends SearchResultSet {
                        count( $this->interwikiResults[$type] ) > 0;
        }
 
+       public function extractResults() {
+               $results = parent::extractResults();
+
+               foreach ( $results as &$result ) {
+                       // Resolve deferred results; needed to work around T203279
+                       if ( is_callable( $result ) ) {
+                               $result = $result();
+                       }
+               }
+
+               return $results;
+       }
+
        public function getInterwikiResults( $type = self::SECONDARY_RESULTS ) {
                if ( $this->hasInterwikiResults( $type ) ) {
                        return $this->interwikiResults[$type];