Merge "registration: Remove unused variable"

diff --combined includes/registration/ExtensionRegistry.php
index 1c36407,df9227a..e46c753
--- 1/includes/registration/ExtensionRegistry.php
--- 2/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@@ -11,16 -11,6 +11,16 @@@
   */
  class ExtensionRegistry {
  
 +      /**
 +       * Version of the highest supported manifest version
 +       */
 +      const MANIFEST_VERSION = 1;
 +
 +      /**
 +       * Version of the oldest supported manifest version
 +       */
 +      const OLDEST_MANIFEST_VERSION = 1;
 +
        /**
         * @var BagOStuff
         */
@@@ -126,7 -116,6 +126,6 @@@
         * @throws Exception
         */
        public function readFromQueue( array $queue ) {
-               $data = array( 'globals' => array( 'wgAutoloadClasses' => array() ) );
                $autoloadClasses = array();
                $processor = new ExtensionProcessor();
                foreach ( $queue as $path => $mtime ) {
@@@ -138,19 -127,11 +137,19 @@@
                        if ( !is_array( $info ) ) {
                                throw new Exception( "$path is not a valid JSON file." );
                        }
 +                      if ( !isset( $info['manifest_version' ] ) ) {
 +                              // For backwards-compatability, assume a version of 1
 +                              $info['manifest_version'] = 1;
 +                      }
 +                      $version = $info['manifest_version'];
 +                      if ( $version < self::OLDEST_MANIFEST_VERSION || $version > self::MANIFEST_VERSION ) {
 +                              throw new Exception( "$path: unsupported manifest_version: {$version}" );
 +                      }
                        $autoload = $this->processAutoLoader( dirname( $path ), $info );
                        // Set up the autoloader now so custom processors will work
                        $GLOBALS['wgAutoloadClasses'] += $autoload;
                        $autoloadClasses += $autoload;
 -                      $processor->extractInfo( $path, $info );
 +                      $processor->extractInfo( $path, $info, $version );
                }
                $data = $processor->getExtractedInfo();
                // Need to set this so we can += to it later