Merge "resourceloader: Don't call wfExpandUrl() on load.php urls"

[lhc/web/wiklou.git] / includes / WebRequest.php

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index e098fea..850f101 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1324,14 +1324,6 @@ class FauxRequest extends WebRequest {
                $this->protocol = $protocol;
        }
 
-       /**
-        * @param string $method
-        * @throws MWException
-        */
-       private function notImplemented( $method ) {
-               throw new MWException( "{$method}() not implemented" );
-       }
-
        /**
         * @param string $name
         * @param string $default
@@ -1381,6 +1373,7 @@ class FauxRequest extends WebRequest {
        }
 
        /**
+        * @since 1.26
         * @param string $name Unprefixed name of the cookie to set
         * @param string|null $value Value of the cookie to set
         * @param string|null $prefix Cookie prefix. Defaults to $wgCookiePrefix
@@ -1390,6 +1383,7 @@ class FauxRequest extends WebRequest {
        }
 
        /**
+        * @since 1.26
         * @param array $cookies
         * @param string|null $prefix Cookie prefix. Defaults to $wgCookiePrefix
         */
@@ -1423,10 +1417,6 @@ class FauxRequest extends WebRequest {
                return $this->protocol;
        }
 
-       private function initHeaders() {
-               return;
-       }
-
        /**
         * @param string $name
         * @param string $val
@@ -1436,6 +1426,7 @@ class FauxRequest extends WebRequest {
        }
 
        /**
+        * @since 1.26
         * @param array $headers
         */
        public function setHeaders( $headers ) {