From: Kunal Mehta <legoktm@gmail.com>
Date: Sun, 11 Jan 2015 04:17:36 +0000 (-0800)
Subject: Handle more cases in convertExtensionToRegistration.php
X-Git-Tag: 1.31.0-rc.0~12703
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=f6cc92c74b99449d31f1fce6f0ed48ec81760756;p=lhc%2Fweb%2Fwiklou.git

Handle more cases in convertExtensionToRegistration.php

* Handle constructs like $wgResourceModules += array(...)
* Support $wgMessagesDirs['FooBar'] = array(...)
* Handle stripping paths where it is the current directory
* Use FormatJson::ALL_OK when writing the file

Bug: T86311
Change-Id: I9434f6634fd6e460a5c2f6dac95c9065da35a51a
---

diff --git a/maintenance/convertExtensionToRegistration.php b/maintenance/convertExtensionToRegistration.php
index cbdc1ba9de..75500c2418 100644
--- a/maintenance/convertExtensionToRegistration.php
+++ b/maintenance/convertExtensionToRegistration.php
@@ -5,7 +5,7 @@ require_once __DIR__ . '/Maintenance.php';
 class ConvertExtensionToRegistration extends Maintenance {
 
 	protected $custom = array(
-		'MessagesDirs' => 'removeAbsolutePath',
+		'MessagesDirs' => 'handleMessagesDirs',
 		'ExtensionMessagesFiles' => 'removeAbsolutePath',
 		'AutoloadClasses' => 'removeAbsolutePath',
 		'ExtensionCredits' => 'handleCredits',
@@ -21,18 +21,33 @@ class ConvertExtensionToRegistration extends Maintenance {
 		$this->mDescription = 'Converts extension entry points to the new JSON registration format';
 	}
 
+	protected function getAllGlobals() {
+		$processor = new ReflectionClass( 'ExtensionProcessor' );
+		$settings = $processor->getProperty( 'globalSettings' );
+		$settings->setAccessible( true );
+		return $settings->getValue();
+	}
+
 	public function execute() {
+		// Extensions will do stuff like $wgResourceModules += array(...) which is a
+		// fatal unless an array is already set. So set an empty value.
+		foreach ( array_merge( $this->getAllGlobals(), array_keys( $this->custom ) ) as $var ) {
+			$var = 'wg' . $var;
+			$$var = array();
+		}
+		unset( $var );
 		require $this->getArg( 0 );
 		// Try not to create any local variables before this line
 		$vars = get_defined_vars();
 		unset( $vars['this'] );
 		$this->dir = dirname( realpath( $this->getArg( 0 ) ) );
 		$this->json = array();
-		$processor = new ReflectionClass( 'ExtensionProcessor' );
-		$settings = $processor->getProperty( 'globalSettings' );
-		$settings->setAccessible( true );
-		$globalSettings = $settings->getValue();
+		$globalSettings = $this->getAllGlobals();
 		foreach ( $vars as $name => $value ) {
+			// If an empty array, assume it's the default we set, so skip it
+			if ( is_array( $value ) && count( $value ) === 0 ) {
+				continue;
+			}
 			$realName = substr( $name, 2 ); // Strip 'wg'
 			if ( isset( $this->custom[$realName] ) ) {
 				call_user_func_array( array( $this, $this->custom[$realName] ), array( $realName, $value ) );
@@ -45,7 +60,7 @@ class ConvertExtensionToRegistration extends Maintenance {
 		}
 
 		$fname = "{$this->dir}/extension.json";
-		$prettyJSON = FormatJson::encode( $this->json, "\t" );
+		$prettyJSON = FormatJson::encode( $this->json, "\t", FormatJson::ALL_OK );
 		file_put_contents( $fname, $prettyJSON . "\n" );
 		$this->output( "Wrote output to $fname.\n" );
 	}
@@ -60,8 +75,18 @@ class ConvertExtensionToRegistration extends Maintenance {
 		$this->json[$realName] = $value;
 	}
 
+	protected function handleMessagesDirs( $realName, $value ) {
+		foreach ( $value as $key => $dirs ) {
+			foreach ( (array)$dirs as $dir ) {
+				$this->json[$realName][$key][] = $this->stripPath( $dir, $this->dir );
+			}
+		}
+	}
+
 	private function stripPath( $val, $dir ) {
-		if ( strpos( $val, $dir ) === 0 ) {
+		if ( $val === $dir ) {
+			$val = '';
+		} elseif ( strpos( $val, $dir ) === 0 ) {
 			// +1 is for the trailing / that won't be in $this->dir
 			$val = substr( $val, strlen( $dir ) + 1 );
 		}