jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372888 )
Change subject: Use namespaced ScopedCallback
......................................................................
Use namespaced ScopedCallback
The non-namespaced version is deprecated since 1.28
Change-Id: Ib9a1496df79a139ee6202440ff2aac4f9e647e79
---
M includes/Handlers/Xml/XmlHandler.php
M includes/Jobs/UploadMediafileJob.php
M includes/Jobs/UploadMetadataJob.php
3 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Handlers/Xml/XmlHandler.php
b/includes/Handlers/Xml/XmlHandler.php
index af35ce2..628226a 100644
--- a/includes/Handlers/Xml/XmlHandler.php
+++ b/includes/Handlers/Xml/XmlHandler.php
@@ -13,6 +13,7 @@
use GWToolset\Helpers\GWTFileBackend;
use Html;
use MWException;
+use Wikimedia\ScopedCallback;
use XMLReader;
abstract class XmlHandler {
@@ -130,7 +131,7 @@
}
// Make sure close() is called if exceptions occur
- $xmlCloser = new \ScopedCallback( function () use ( $XMLReader
) {
+ $xmlCloser = new ScopedCallback( function () use ( $XMLReader )
{
$XMLReader->close();
} );
@@ -170,7 +171,7 @@
);
}
- \ScopedCallback::cancel( $xmlCloser ); // done already
+ ScopedCallback::cancel( $xmlCloser ); // done already
return $result;
}
diff --git a/includes/Jobs/UploadMediafileJob.php
b/includes/Jobs/UploadMediafileJob.php
index ceb3424..7ffeeb3 100755
--- a/includes/Jobs/UploadMediafileJob.php
+++ b/includes/Jobs/UploadMediafileJob.php
@@ -19,10 +19,10 @@
use GWToolset\Models\Metadata;
use GWToolset\Utils;
use Job;
-use ScopedCallback;
use Title;
use User;
use RequestContext;
+use Wikimedia\ScopedCallback;
class UploadMediafileJob extends Job {
diff --git a/includes/Jobs/UploadMetadataJob.php
b/includes/Jobs/UploadMetadataJob.php
index 5577bcc..2ade543 100644
--- a/includes/Jobs/UploadMetadataJob.php
+++ b/includes/Jobs/UploadMetadataJob.php
@@ -21,7 +21,7 @@
use Title;
use User;
use RequestContext;
-use ScopedCallback;
+use Wikimedia\ScopedCallback;
/**
* runs the MetadataMappingHandler with the originally $_POST’ed form fields
when
--
To view, visit https://gerrit.wikimedia.org/r/372888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9a1496df79a139ee6202440ff2aac4f9e647e79
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
