[MediaWiki-commits] [Gerrit] mediawiki...GWToolset[master]: Append \ to fix many object namespace issues
jenkins-bot has submitted this change and it was merged. (
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(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
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;
[MediaWiki-commits] [Gerrit] mediawiki...GWToolset[master]: Append \ to fix many object namespace issues
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
