Merge branch 'mw-1.26'

1 files changed, 18 insertions, 2 deletions

diff --git a/includes/registration/Processor.php b/includes/registration/Processor.php
index e930fd3e..e5669d27 100644
--- a/includes/registration/Processor.php
+++ b/includes/registration/Processor.php
@@ -16,12 +16,28 @@ interface Processor {
 	 *
 	 * @param string $path Absolute path of JSON file
 	 * @param array $info
+	 * @param int $version manifest_version for info
 	 * @return array "credits" information to store
 	 */
-	public function extractInfo( $path, array $info );
+	public function extractInfo( $path, array $info, $version );
 
 	/**
-	 * @return array With 'globals', 'defines', 'callbacks', 'credits' keys.
+	 * @return array With following keys:
+	 * 		'globals' - variables to be set to $GLOBALS
+	 * 		'defines' - constants to define
+	 * 		'callbacks' - functions to be executed by the registry
+	 * 		'credits' - metadata to be stored by registry
+	 * 		'attributes' - registration info which isn't a global variable
 	 */
 	public function getExtractedInfo();
+
+	/**
+	 * Get the requirements for the provided info
+	 *
+	 * @since 1.26
+	 * @param array $info
+	 * @return array Where keys are the name to have a constraint on,
+	 * 		like 'MediaWiki'. Values are a constraint string like "1.26.1".
+	 */
+	public function getRequirements( array $info );
 }