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
1876645
..
aae5fc2
100644
(file)
--- a/
includes/registration/ExtensionRegistry.php
+++ b/
includes/registration/ExtensionRegistry.php
@@
-107,7
+107,7
@@
class ExtensionRegistry {
throw new Exception( "$path does not exist!" );
}
// @codeCoverageIgnoreStart
throw new Exception( "$path does not exist!" );
}
// @codeCoverageIgnoreStart
- if (
!$mtim
e ) {
+ if (
$mtime === fals
e ) {
$err = error_get_last();
throw new Exception( "Couldn't stat $path: {$err['message']}" );
// @codeCoverageIgnoreEnd
$err = error_get_last();
throw new Exception( "Couldn't stat $path: {$err['message']}" );
// @codeCoverageIgnoreEnd
@@
-202,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;
@@
-245,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
@@
-273,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