Merge "Http::getProxy() method to get proxy configuration"

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

diff --git a/includes/TitleArray.php b/includes/TitleArray.php
index eac9211..5a28b85 100644 (file)
--- a/includes/TitleArray.php
+++ b/includes/TitleArray.php
@@ -30,14 +30,14 @@
  */
 abstract class TitleArray implements Iterator {
        /**
-        * @param $res ResultWrapper A SQL result including at least page_namespace and
+        * @param ResultWrapper $res A SQL result including at least page_namespace and
         *   page_title -- also can have page_id, page_len, page_is_redirect,
         *   page_latest (if those will be used).  See Title::newFromRow.
         * @return TitleArrayFromResult
         */
        static function newFromResult( $res ) {
                $array = null;
-               if ( !wfRunHooks( 'TitleArrayFromResult', array( &$array, $res ) ) ) {
+               if ( !Hooks::run( 'TitleArrayFromResult', [ &$array, $res ] ) ) {
                        return null;
                }
                if ( $array === null ) {
@@ -47,7 +47,7 @@ abstract class TitleArray implements Iterator {
        }
 
        /**
-        * @param $res ResultWrapper
+        * @param ResultWrapper $res
         * @return TitleArrayFromResult
         */
        protected static function newFromResult_internal( $res ) {