dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update RELEASE-NOTES-1.31
[lhc/web/wiklou.git]
/
includes
/
registration
/
ExtensionRegistry.php
diff --git
a/includes/registration/ExtensionRegistry.php
b/includes/registration/ExtensionRegistry.php
index
994de97
..
aae5fc2
100644
(file)
--- a/
includes/registration/ExtensionRegistry.php
+++ b/
includes/registration/ExtensionRegistry.php
@@
-20,9
+20,16
@@
class ExtensionRegistry {
/**
* Version of the highest supported manifest version
/**
* Version of the highest supported manifest version
+ * Note: Update MANIFEST_VERSION_MW_VERSION when changing this
*/
const MANIFEST_VERSION = 2;
*/
const MANIFEST_VERSION = 2;
+ /**
+ * MediaWiki version constraint representing what the current
+ * highest MANIFEST_VERSION is supported in
+ */
+ const MANIFEST_VERSION_MW_VERSION = '>= 1.29.0';
+
/**
* Version of the oldest supported manifest version
*/
/**
* Version of the oldest supported manifest version
*/
@@
-75,6
+82,7
@@
class ExtensionRegistry {
private static $instance;
/**
private static $instance;
/**
+ * @codeCoverageIgnore
* @return ExtensionRegistry
*/
public static function getInstance() {
* @return ExtensionRegistry
*/
public static function getInstance() {
@@
-98,9
+106,11
@@
class ExtensionRegistry {
} else {
throw new Exception( "$path does not exist!" );
}
} else {
throw new Exception( "$path does not exist!" );
}
- if ( !$mtime ) {
+ // @codeCoverageIgnoreStart
+ if ( $mtime === false ) {
$err = error_get_last();
throw new Exception( "Couldn't stat $path: {$err['message']}" );
$err = error_get_last();
throw new Exception( "Couldn't stat $path: {$err['message']}" );
+ // @codeCoverageIgnoreEnd
}
}
$this->queued[$path] = $mtime;
}
}
$this->queued[$path] = $mtime;
@@
-192,6
+202,7
@@
class ExtensionRegistry {
* @param array $queue keys are filenames, values are ignored
* @return array extracted info
* @throws Exception
* @param array $queue keys are filenames, values are ignored
* @return array extracted info
* @throws Exception
+ * @throws ExtensionDependencyError
*/
public function readFromQueue( array $queue ) {
global $wgVersion;
*/
public function readFromQueue( array $queue ) {
global $wgVersion;
@@
-235,6
+246,7
@@
class ExtensionRegistry {
}
if ( isset( $info['AutoloadNamespaces'] ) ) {
$autoloadNamespaces += $this->processAutoLoader( $dir, $info['AutoloadNamespaces'] );
}
if ( isset( $info['AutoloadNamespaces'] ) ) {
$autoloadNamespaces += $this->processAutoLoader( $dir, $info['AutoloadNamespaces'] );
+ AutoLoader::$psr4Namespaces += $autoloadNamespaces;
}
// get all requirements/dependencies for this extension
}
// get all requirements/dependencies for this extension
@@
-263,11
+275,7
@@
class ExtensionRegistry {
);
if ( $incompatible ) {
);
if ( $incompatible ) {
- if ( count( $incompatible ) === 1 ) {
- throw new Exception( $incompatible[0] );
- } else {
- throw new Exception( implode( "\n", $incompatible ) );
- }
+ throw new ExtensionDependencyError( $incompatible );
}
// Need to set this so we can += to it later
}
// Need to set this so we can += to it later
@@
-291,7
+299,7
@@
class ExtensionRegistry {
// Optimistic: If the global is not set, or is an empty array, replace it entirely.
// Will be O(1) performance.
// Optimistic: If the global is not set, or is an empty array, replace it entirely.
// Will be O(1) performance.
- if ( !
isset( $GLOBALS[$key]
) || ( is_array( $GLOBALS[$key] ) && !$GLOBALS[$key] ) ) {
+ if ( !
array_key_exists( $key, $GLOBALS
) || ( is_array( $GLOBALS[$key] ) && !$GLOBALS[$key] ) ) {
$GLOBALS[$key] = $val;
continue;
}
$GLOBALS[$key] = $val;
continue;
}
@@
-323,7
+331,7
@@
class ExtensionRegistry {
}
if ( isset( $info['autoloaderNS'] ) ) {
}
if ( isset( $info['autoloaderNS'] ) ) {
- Auto
l
oader::$psr4Namespaces += $info['autoloaderNS'];
+ Auto
L
oader::$psr4Namespaces += $info['autoloaderNS'];
}
foreach ( $info['defines'] as $name => $val ) {
}
foreach ( $info['defines'] as $name => $val ) {
@@
-399,16
+407,6
@@
class ExtensionRegistry {
return $this->loaded;
}
return $this->loaded;
}
- /**
- * Mark a thing as loaded
- *
- * @param string $name
- * @param array $credits
- */
- protected function markLoaded( $name, array $credits ) {
- $this->loaded[$name] = $credits;
- }
-
/**
* Fully expand autoloader paths
*
/**
* Fully expand autoloader paths
*