Platonides has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97329
Change subject: Make checkPHPExtension() load the extension when it's available.
......................................................................
Make checkPHPExtension() load the extension when it's available.
This was standard behavior until d0c8ba037c removed wfDl()
and made tests just check if it was already loaded.
Change-Id: I6b71c30a0af1deb7a2709e6461da62522fa2dd8f
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 14 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/97329/1
diff --git a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index 7a7ec8f..0ce9aa5 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -932,12 +932,23 @@
* @since 1.21
*/
protected function checkPHPExtension( $extName ) {
- $loaded = extension_loaded( $extName );
- if ( !$loaded ) {
+ static $loadedExtensions = array();
+
+ if ( !isset( $loadedExtensions[$extName] ) ) {
+ $loaded = extension_loaded( $extName );
+ if ( !$loaded ) {
+ wfSuppressWarnings();
+ $loaded = dl( $extName . '.' . PHP_SHLIB_SUFFIX
);
+ wfRestoreWarnings();
+ }
+ $loadedExtensions[$extName] = $loaded;
+ }
+
+ if ( !$loadedExtensions[$extName] ) {
$this->markTestSkipped( "PHP extension '$extName' is
not loaded, skipping." );
}
- return $loaded;
+ return $loadedExtensions[$extName];
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/97329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b71c30a0af1deb7a2709e6461da62522fa2dd8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
