Merge "Begin exposing SiteConfiguration via site contexts"

diff --combined includes/context/ContextSource.php
index 0a3f18f,1e90013..186b8e6
--- 1/includes/context/ContextSource.php
--- 2/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@@ -41,11 -41,9 +41,11 @@@ abstract class ContextSource implement
        public function getContext() {
                if ( $this->context === null ) {
                        $class = get_class( $this );
 -                      wfDebug( __METHOD__ . " ($class): called and \$context is null. Using RequestContext::getMain() for sanity\n" );
 +                      wfDebug( __METHOD__ . " ($class): called and \$context is null. " .
 +                              "Using RequestContext::getMain() for sanity\n" );
                        $this->context = RequestContext::getMain();
                }
 +
                return $this->context;
        }
  
@@@ -59,6 -57,16 +59,16 @@@
                $this->context = $context;
        }
  
+       /**
+        * Get the SiteConfiguration object
+        *
+        * @since 1.23
+        * @return SiteConfiguration
+        */
+       public function getConfig() {
+               return $this->getContext()->getConfig();
+       }
+ 
        /**
         * Get the WebRequest object
         *
@@@ -132,7 -140,6 +142,7 @@@
         */
        public function getLang() {
                wfDeprecated( __METHOD__, '1.19' );
 +
                return $this->getLanguage();
        }
  
@@@ -165,7 -172,6 +175,7 @@@
         */
        public function msg( /* $args */ ) {
                $args = func_get_args();
 +
                return call_user_func_array( array( $this->getContext(), 'msg' ), $args );
        }
  

diff --combined includes/context/DerivativeContext.php
index e96269d,2b2d9c5..1e3fbf2
--- 1/includes/context/DerivativeContext.php
--- 2/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@@ -65,6 -65,11 +65,11 @@@ class DerivativeContext extends Context
         */
        private $skin;
  
+       /**
+        * @var SiteConfiguration
+        */
+       private $config;
+ 
        /**
         * Constructor
         * @param IContextSource $context Context to inherit from
@@@ -73,6 -78,28 +78,28 @@@
                $this->setContext( $context );
        }
  
+       /**
+        * Set the SiteConfiguration object
+        *
+        * @param SiteConfiguration $c
+        */
+       public function setConfig( SiteConfiguration $s ) {
+               $this->config = $s;
+       }
+ 
+       /**
+        * Get the SiteConfiguration object
+        *
+        * @return SiteConfiguration
+        */
+       public function getConfig() {
+               if ( !is_null( $this->config ) ) {
+                       return $this->config;
+               } else {
+                       return $this->getContext()->getConfig();
+               }
+       }
+ 
        /**
         * Set the WebRequest object
         *
@@@ -99,7 -126,6 +126,7 @@@
         * Set the Title object
         *
         * @param Title $t
 +       * @throws MWException
         */
        public function setTitle( $t ) {
                if ( $t !== null && !$t instanceof Title ) {
@@@ -299,7 -325,6 +326,7 @@@
         */
        public function msg() {
                $args = func_get_args();
 +
                return call_user_func_array( 'wfMessage', $args )->setContext( $this );
        }
  }

diff --combined includes/context/RequestContext.php
index 04879e2,2822c48..5f91731
--- 1/includes/context/RequestContext.php
--- 2/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@@ -63,6 -63,33 +63,33 @@@ class RequestContext implements IContex
         */
        private $skin;
  
+       /**
+        * @var SiteConfiguration
+        */
+       private $config;
+ 
+       /**
+        * Set the SiteConfiguration object
+        *
+        * @param SiteConfiguration $c
+        */
+       public function setConfig( SiteConfiguration $c ) {
+               $this->config = $c;
+       }
+ 
+       /**
+        * Get the SiteConfiguration object
+        *
+        * @return SiteConfiguration
+        */
+       public function getConfig() {
+               if ( $this->config === null ) {
+                       global $wgConf;
+                       $this->config = $wgConf;
+               }
+               return $this->config;
+       }
+ 
        /**
         * Set the WebRequest object
         *
@@@ -82,7 -109,6 +109,7 @@@
                        global $wgRequest; # fallback to $wg till we can improve this
                        $this->request = $wgRequest;
                }
 +
                return $this->request;
        }
  
@@@ -90,7 -116,6 +117,7 @@@
         * Set the Title object
         *
         * @param Title $t
 +       * @throws MWException
         */
        public function setTitle( $t ) {
                if ( $t !== null && !$t instanceof Title ) {
@@@ -111,7 -136,6 +138,7 @@@
                        global $wgTitle; # fallback to $wg till we can improve this
                        $this->title = $wgTitle;
                }
 +
                return $this->title;
        }
  
@@@ -172,7 -196,6 +199,7 @@@
                        }
                        $this->wikipage = WikiPage::factory( $title );
                }
 +
                return $this->wikipage;
        }
  
@@@ -192,7 -215,6 +219,7 @@@
                if ( $this->output === null ) {
                        $this->output = new OutputPage( $this );
                }
 +
                return $this->output;
        }
  
@@@ -214,7 -236,6 +241,7 @@@
                if ( $this->user === null ) {
                        $this->user = User::newFromSession( $this->getRequest() );
                }
 +
                return $this->user;
        }
  
@@@ -275,7 -296,6 +302,7 @@@
         */
        public function getLang() {
                wfDeprecated( __METHOD__, '1.19' );
 +
                return $this->getLanguage();
        }
  
@@@ -371,7 -391,6 +398,7 @@@
                        $this->skin->setContext( $this );
                        wfProfileOut( __METHOD__ . '-createskin' );
                }
 +
                return $this->skin;
        }
  
@@@ -385,7 -404,6 +412,7 @@@
         */
        public function msg() {
                $args = func_get_args();
 +
                return call_user_func_array( 'wfMessage', $args )->setContext( $this );
        }
  
@@@ -401,7 -419,6 +428,7 @@@
                if ( $instance === null ) {
                        $instance = new self;
                }
 +
                return $instance;
        }
  
@@@ -456,7 -473,7 +483,7 @@@
                        $user = User::newFromName( $params['ip'], false );
                }
  
 -              $importSessionFunction = function( User $user, array $params ) {
 +              $importSessionFunction = function ( User $user, array $params ) {
                        global $wgRequest, $wgUser;
  
                        $context = RequestContext::getMain();
@@@ -492,7 -509,7 +519,7 @@@
                $importSessionFunction( $user, $params );
  
                // Set callback to save and close the new session and reload the old one
 -              return new ScopedCallback( function() use ( $importSessionFunction, $oUser, $oParams ) {
 +              return new ScopedCallback( function () use ( $importSessionFunction, $oUser, $oParams ) {
                        $importSessionFunction( $oUser, $oParams );
                } );
        }
@@@ -520,7 -537,6 +547,7 @@@
                        $context->setRequest( new FauxRequest( $request ) );
                }
                $context->user = User::newFromName( '127.0.0.1', false );
 +
                return $context;
        }
  }