Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393375 )
Change subject: Append \ to fix many object namespace issues
......................................................................
Append \ to fix many object namespace issues
Some more ok -> isOK()
Bug: T180882
Change-Id: I749e86288d071b9909b3966d371c1190f4461e75
---
M includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
M includes/Forms/MetadataDetectForm.php
M includes/Forms/MetadataMappingForm.php
M includes/Handlers/Forms/FormHandler.php
M includes/Handlers/Forms/MetadataDetectHandler.php
M includes/Handlers/Forms/MetadataMappingHandler.php
M includes/Handlers/UploadHandler.php
M includes/Handlers/Xml/XmlDetectHandler.php
M includes/Handlers/Xml/XmlHandler.php
M includes/Handlers/Xml/XmlMappingHandler.php
M includes/Helpers/FileChecks.php
M includes/Helpers/GWTFileBackend.php
M includes/Hooks/Hooks.php
M includes/Jobs/GWTFileBackendCleanupJob.php
M includes/Models/Mapping.php
M includes/Specials/SpecialGWToolset.php
16 files changed, 44 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset
refs/changes/75/393375/1
diff --git a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
index 2fea594..e56ff6e 100644
--- a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
+++ b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
@@ -101,7 +101,7 @@
* format -- {"parameter name":""}
*
* @param Title $Title
- * @throws MWException
+ * @throws \MWException
* @return null|string
* null or a JSON representation of the MediaWiki template parameters
*/
diff --git a/includes/Forms/MetadataDetectForm.php
b/includes/Forms/MetadataDetectForm.php
index 100e1d8..0796fdc 100644
--- a/includes/Forms/MetadataDetectForm.php
+++ b/includes/Forms/MetadataDetectForm.php
@@ -66,8 +66,7 @@
*
* @param SpecialPage $SpecialPage
*
- * @return string
- * an html form
+ * @return string an html form
*/
public static function getForm( SpecialPage $SpecialPage ) {
$namespace = Utils::getNamespaceName(
Config::$metadata_namespace );
diff --git a/includes/Forms/MetadataMappingForm.php
b/includes/Forms/MetadataMappingForm.php
index 45f8a8e..410aa89 100644
--- a/includes/Forms/MetadataMappingForm.php
+++ b/includes/Forms/MetadataMappingForm.php
@@ -20,7 +20,7 @@
/**
* returns an html form for step 2 : Metadata Mapping
*
- * @param GWToolset\Handlers\Forms\FormHandler $Handler
+ * @param \GWToolset\Handlers\Forms\FormHandler $Handler
*
* @param array &$user_options
* an array of user options that was submitted in the html form
diff --git a/includes/Handlers/Forms/FormHandler.php
b/includes/Handlers/Forms/FormHandler.php
index b646ea8..1e59e02 100644
--- a/includes/Handlers/Forms/FormHandler.php
+++ b/includes/Handlers/Forms/FormHandler.php
@@ -165,7 +165,7 @@
public function execute() {
$result = WikiChecks::doesEditTokenMatch( $this->SpecialPage );
- if ( !$result->ok ) {
+ if ( !$result->isOK() ) {
$result =
Html::rawElement(
'h2',
diff --git a/includes/Handlers/Forms/MetadataDetectHandler.php
b/includes/Handlers/Forms/MetadataDetectHandler.php
index 0c02f67..81696a3 100644
--- a/includes/Handlers/Forms/MetadataDetectHandler.php
+++ b/includes/Handlers/Forms/MetadataDetectHandler.php
@@ -41,22 +41,22 @@
];
/**
- * @var GWToolset\Helpers\GWTFileBackend
+ * @var \GWToolset\Helpers\GWTFileBackend
*/
protected $_GWTFileBackend;
/**
- * @var GWToolset\Models\Mapping
+ * @var \GWToolset\Models\Mapping
*/
protected $_Mapping;
/**
- * @var GWToolset\Models\MediawikiTemplate
+ * @var \GWToolset\Models\MediawikiTemplate
*/
protected $_MediawikiTemplate;
/**
- * @var GWToolset\Handlers\UploadHandler
+ * @var \GWToolset\Handlers\UploadHandler
*/
protected $_UploadHandler;
@@ -66,7 +66,7 @@
protected $_whitelisted_post;
/**
- * @var GWToolset\Handlers\Xml\XmlDetectHandler
+ * @var \GWToolset\Handlers\Xml\XmlDetectHandler
*/
public $XmlDetectHandler;
diff --git a/includes/Handlers/Forms/MetadataMappingHandler.php
b/includes/Handlers/Forms/MetadataMappingHandler.php
index 9ff2f12..41eb492 100644
--- a/includes/Handlers/Forms/MetadataMappingHandler.php
+++ b/includes/Handlers/Forms/MetadataMappingHandler.php
@@ -68,22 +68,22 @@
];
/**
- * @var GWToolset\Models\Mapping
+ * @var \GWToolset\Models\Mapping
*/
protected $_Mapping;
/**
- * @var GWToolset\Models\MediawikiTemplate
+ * @var \GWToolset\Models\MediawikiTemplate
*/
protected $_MediawikiTemplate;
/**
- * @var GWToolset\Models\Metadata
+ * @var \GWToolset\Models\Metadata
*/
protected $_Metadata;
/**
- * @var GWToolset\Handlers\UploadHandler
+ * @var \GWToolset\Handlers\UploadHandler
*/
protected $_UploadHandler;
@@ -93,7 +93,7 @@
protected $_whitelisted_post;
/**
- * @var GWToolset\Handlers\XmlMappingHandler
+ * @var \GWToolset\Handlers\XmlMappingHandler
*/
protected $_XmlMappingHandler;
diff --git a/includes/Handlers/UploadHandler.php
b/includes/Handlers/UploadHandler.php
index 39754fb..901abde 100644
--- a/includes/Handlers/UploadHandler.php
+++ b/includes/Handlers/UploadHandler.php
@@ -31,12 +31,12 @@
class UploadHandler {
/**
- * @var Php\File
+ * @var \Php\File
*/
protected $_File;
/**
- * @var GWToolset\Helpers\GWTFileBackend
+ * @var \GWToolset\Helpers\GWTFileBackend
*/
protected $_GWTFileBackend;
@@ -51,12 +51,12 @@
protected $_item_specific_categories;
/**
- * @var GWToolset\Modles\Mapping
+ * @var \GWToolset\Models\Mapping
*/
protected $_Mapping;
/**
- * @var GWToolset\Models\MediawikiTemplate
+ * @var \GWToolset\Models\MediawikiTemplate
*/
protected $_MediawikiTemplate;
@@ -332,7 +332,7 @@
$Http = MWHttpRequest::factory( $url, $options );
$Status = $Http->execute();
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
throw new GWTException(
[
'gwtoolset-mapping-media-file-url-bad'
=> [ $url, $Status->getMessage() ]
@@ -635,7 +635,7 @@
$this->_File->populate( $metadata_file_upload );
$Status = FileChecks::isUploadedFileValid( $this->_File,
Config::$accepted_metadata_types );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
throw new GWTException( $Status->getMessage() );
}
diff --git a/includes/Handlers/Xml/XmlDetectHandler.php
b/includes/Handlers/Xml/XmlDetectHandler.php
index e82f67f..3541cfb 100644
--- a/includes/Handlers/Xml/XmlDetectHandler.php
+++ b/includes/Handlers/Xml/XmlDetectHandler.php
@@ -25,7 +25,7 @@
class XmlDetectHandler extends XmlHandler {
/**
- * @var GWToolset\Helpers\GWTFileBackend
+ * @var \GWToolset\Helpers\GWTFileBackend
*/
protected $_GWTFileBackend;
@@ -51,7 +51,7 @@
protected $_metadata_as_options;
/**
- * @var SpecialPage
+ * @var \SpecialPage
*/
protected $_SpecialPage;
diff --git a/includes/Handlers/Xml/XmlHandler.php
b/includes/Handlers/Xml/XmlHandler.php
index e9ce974..072d575 100644
--- a/includes/Handlers/Xml/XmlHandler.php
+++ b/includes/Handlers/Xml/XmlHandler.php
@@ -19,7 +19,7 @@
abstract class XmlHandler {
/**
- * @var GWToolset\Helpers\GWTFileBackend
+ * @var \GWToolset\Helpers\GWTFileBackend
*/
protected $_GWTFileBackend;
@@ -52,7 +52,7 @@
/**
* a debug method
*
- * @param DOMNode $DOMNode
+ * @param \DOMNode $DOMNode
* @return string
*/
protected function getNodesInfo( $DOMNode ) {
diff --git a/includes/Handlers/Xml/XmlMappingHandler.php
b/includes/Handlers/Xml/XmlMappingHandler.php
index 5dcbcd6..df964e7 100644
--- a/includes/Handlers/Xml/XmlMappingHandler.php
+++ b/includes/Handlers/Xml/XmlMappingHandler.php
@@ -18,27 +18,27 @@
class XmlMappingHandler extends XmlHandler {
/**
- * @var GWToolset\Helpers\GWTFileBackend
+ * @var \GWToolset\Helpers\GWTFileBackend
*/
protected $_GWTFileBackend;
/**
- * @var GWToolset\Models\Mapping
+ * @var \GWToolset\Models\Mapping
*/
protected $_Mapping;
/**
- * @var GWToolset\Handlers\Forms\MetadataMappingHandler
+ * @var \GWToolset\Handlers\Forms\MetadataMappingHandler
*/
protected $_MappingHandler;
/**
- * @var GWToolset\Models\MediawikiTemplate
+ * @var \GWToolset\Models\MediawikiTemplate
*/
protected $_MediawikiTemplate;
/**
- * @var SpecialPage
+ * @var \SpecialPage
*/
protected $_SpecialPage;
diff --git a/includes/Helpers/FileChecks.php b/includes/Helpers/FileChecks.php
index 562376b..26e5a5a 100644
--- a/includes/Helpers/FileChecks.php
+++ b/includes/Helpers/FileChecks.php
@@ -244,34 +244,34 @@
}
$Status = self::isFileEmpty( $File );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
return $Status;
}
$Status = self::noFileErrors( $File );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
return $Status;
}
$Status = self::fileWasUploaded( $File );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
return $Status;
}
$Status = self::isAcceptedFileExtension(
$File, self::getAcceptedExtensions( $accepted_types )
);
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
return $Status;
}
$Status = self::isAcceptedMimeType( $File,
self::getAcceptedMimeTypes( $accepted_types ) );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
return $Status;
}
$Status = self::mimeTypeAndExtensionMatch( $File );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
return $Status;
}
diff --git a/includes/Helpers/GWTFileBackend.php
b/includes/Helpers/GWTFileBackend.php
index 097fdbe..020478c 100644
--- a/includes/Helpers/GWTFileBackend.php
+++ b/includes/Helpers/GWTFileBackend.php
@@ -24,7 +24,7 @@
class GWTFileBackend {
/**
- * @var FileBackend
+ * @var \FileBackend
*/
public $FileBackend;
@@ -399,7 +399,7 @@
$this->setFileExtension( $File->pathinfo['extension'] );
$Status = $this->prepare();
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
throw new MWException(
wfMessage( 'gwtoolset-developer-issue' )
->params( __METHOD__ . ': ' .
$Status->getMessage() )
@@ -409,7 +409,7 @@
$Status = $this->quickStore( $File->tmp_name );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
throw new MWException(
wfMessage( 'gwtoolset-developer-issue' )
->params( __METHOD__ . ': ' .
$Status->getMessage() )
diff --git a/includes/Hooks/Hooks.php b/includes/Hooks/Hooks.php
index f5e4a52..f9d8c79 100644
--- a/includes/Hooks/Hooks.php
+++ b/includes/Hooks/Hooks.php
@@ -34,7 +34,7 @@
* Declares JSON as the code editor language for GWToolset: pages.
*
* This hook only runs if the CodeEditor extension is enabled.
- * @param Title $title
+ * @param \Title $title
* @param string &$lang Page language.
* @return bool
*/
diff --git a/includes/Jobs/GWTFileBackendCleanupJob.php
b/includes/Jobs/GWTFileBackendCleanupJob.php
index 94183c4..91b79ba 100644
--- a/includes/Jobs/GWTFileBackendCleanupJob.php
+++ b/includes/Jobs/GWTFileBackendCleanupJob.php
@@ -18,7 +18,7 @@
class GWTFileBackendCleanupJob extends Job {
/**
- * @param Title $title
+ * @param \Title $title
* @param bool|array $params
* @param int $id
*/
@@ -45,7 +45,7 @@
$this->params['gwtoolset-metadata-file-relative-path']
);
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
$this->setLastError( __METHOD__ . ': ' .
$Status->getMessage() );
$result = false;
}
diff --git a/includes/Models/Mapping.php b/includes/Models/Mapping.php
index 2c01f77..3d2aa03 100644
--- a/includes/Models/Mapping.php
+++ b/includes/Models/Mapping.php
@@ -156,7 +156,7 @@
*
* @param array &$options
* @throws GWTException
- * @return null|Title
+ * @return null|\Title
*/
protected function getMappingTitle( array &$options ) {
$result = null;
diff --git a/includes/Specials/SpecialGWToolset.php
b/includes/Specials/SpecialGWToolset.php
index 275e016..7afaca8 100644
--- a/includes/Specials/SpecialGWToolset.php
+++ b/includes/Specials/SpecialGWToolset.php
@@ -25,7 +25,7 @@
public $module_key;
/**
- * @var GWToolset\Handlers\Forms\FormHandler
+ * @var \GWToolset\Handlers\Forms\FormHandler
*/
protected $_Handler;
@@ -195,7 +195,7 @@
protected function wikiChecks() {
$Status = WikiChecks::pageIsReadyForThisUser( $this );
- if ( !$Status->ok ) {
+ if ( !$Status->isOK() ) {
$this->getOutput()->addHTML(
Html::rawElement(
'h2',
--
To view, visit https://gerrit.wikimedia.org/r/393375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I749e86288d071b9909b3966d371c1190f4461e75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
