Dan-nl has submitted this change and it was merged.
Change subject: Remove numerous unused variables, parameters etc
......................................................................
Remove numerous unused variables, parameters etc
Change-Id: I8bbb7d3541f3d55b16ef77be42ce1adde848b63e
---
M GWToolset.php
M includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
M includes/Forms/MetadataMappingForm.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/Helpers/WikiChecks.php
M includes/Jobs/UploadMediafileJob.php
M includes/Jobs/UploadMetadataJob.php
M includes/Models/Mapping.php
M includes/Utils.php
16 files changed, 15 insertions(+), 51 deletions(-)
Approvals:
Dan-nl: Verified; Looks good to me, approved
diff --git a/GWToolset.php b/GWToolset.php
index 330a842..636589e 100644
--- a/GWToolset.php
+++ b/GWToolset.php
@@ -8,7 +8,6 @@
*/
namespace GWToolset;
-use GWToolset\Helpers\WikiChecks;
if ( !defined( 'MEDIAWIKI' ) ) {
echo 'This file is part of a MediaWiki extension; it is not a valid
entry point. To install this extension, follow the instructions in the INSTALL
file.';
diff --git a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
index 1a64b4a..3fa1413 100644
--- a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
+++ b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
@@ -98,7 +98,7 @@
*/
protected function retrieveTemplateData( Title $Title ) {
$result = null;
- $api_result = array();
+
global $wgRequest;
$Api = new ApiMain(
diff --git a/includes/Forms/MetadataMappingForm.php
b/includes/Forms/MetadataMappingForm.php
index 3933fa7..d98888f 100644
--- a/includes/Forms/MetadataMappingForm.php
+++ b/includes/Forms/MetadataMappingForm.php
@@ -298,7 +298,7 @@
Html::rawElement(
'tbody',
array(),
-
$Handler->getMetadataAsHtmlSelectsInTableRows( $user_options )
+
$Handler->getMetadataAsHtmlSelectsInTableRows()
)
) .
diff --git a/includes/Handlers/Forms/MetadataDetectHandler.php
b/includes/Handlers/Forms/MetadataDetectHandler.php
index e0168bd..712bd35 100644
--- a/includes/Handlers/Forms/MetadataDetectHandler.php
+++ b/includes/Handlers/Forms/MetadataDetectHandler.php
@@ -82,19 +82,15 @@
* mediawiki template parameters with metadata elements in the
* <select>s
*
- * @param {array} $user_options
- * an array of user options that was submitted in the html form
- *
* @return {string}
* the values within the table rows have been filtered
*/
- public function getMetadataAsHtmlSelectsInTableRows( array
&$user_options ) {
+ public function getMetadataAsHtmlSelectsInTableRows() {
$result = null;
foreach ( $this->_MediawikiTemplate->mediawiki_template_array
as $parameter => $value ) {
$result .=
$this->XmlDetectHandler->getMetadataAsTableCells(
$parameter,
- $this->_MediawikiTemplate,
$this->_Mapping
);
}
diff --git a/includes/Handlers/Forms/MetadataMappingHandler.php
b/includes/Handlers/Forms/MetadataMappingHandler.php
index 98a5504..70762cf 100644
--- a/includes/Handlers/Forms/MetadataMappingHandler.php
+++ b/includes/Handlers/Forms/MetadataMappingHandler.php
@@ -31,6 +31,8 @@
class MetadataMappingHandler extends FormHandler {
+ protected $_GWTFileBackend;
+
/**
* @var {array}
*/
@@ -95,8 +97,6 @@
* the html string has been escaped and parsed by wfMessage
*/
protected function createMetadataBatchJob() {
- $result = false;
-
$job = new UploadMetadataJob(
Title::newFromText(
$this->User->getName() . '/' .
@@ -333,8 +333,6 @@
* an array of mediafile Title(s)
*/
protected function processMetadata( array &$user_options ) {
- $result = array();
-
$this->_Mapping = new Mapping( new MappingPhpAdapter() );
$this->_Mapping->mapping_array =
$this->_MediawikiTemplate->getMappingFromArray(
$this->_whitelisted_post );
@@ -481,7 +479,6 @@
*/
public function processRequest( array $original_post = array() ) {
$result = null;
- $mediafile_titles = array();
if ( empty( $original_post ) ) {
$original_post = $_POST;
diff --git a/includes/Handlers/UploadHandler.php
b/includes/Handlers/UploadHandler.php
index e3e6825..d5adf4f 100644
--- a/includes/Handlers/UploadHandler.php
+++ b/includes/Handlers/UploadHandler.php
@@ -171,7 +171,6 @@
* the resulting wiki text is filtered
*/
protected function addItemSpecificCategories() {
- $category_count = 0;
$phrase = null;
$metadata = null;
$result = null;
@@ -243,7 +242,6 @@
*/
protected function evaluateMediafileUrl( $url ) {
$result = array( 'content-type' => null, 'extension' => null,
'url' => null );
- $pathinfo = array();
if ( empty( $url ) ) {
throw new GWTException( 'gwtoolset-no-url-to-evaluate'
);
@@ -500,7 +498,6 @@
public function saveMediafileViaJob(
array $user_options, array $options, array $whitelisted_post
) {
- $result = false;
if ( count( $this->mediafile_jobs ) >
(int)$user_options['gwtoolset-mediafile-throttle'] ) {
throw new MWException(
@@ -532,9 +529,7 @@
);
$this->mediafile_jobs[] = $job;
- $result = true;
-
- return $result;
+ return true;
}
/**
diff --git a/includes/Handlers/Xml/XmlDetectHandler.php
b/includes/Handlers/Xml/XmlDetectHandler.php
index 96365ae..c60aec4 100644
--- a/includes/Handlers/Xml/XmlDetectHandler.php
+++ b/includes/Handlers/Xml/XmlDetectHandler.php
@@ -365,15 +365,12 @@
* @param {string} $parameter
* a mediawiki template parameter, e.g. in Template:Artwork, artist
*
- * @param {MediawikiTemplate} $MediawikiTemplate
* @param {Mapping} $Mapping
*
* @return {string}
* the values within the table row have been filtered
*/
- public function getMetadataAsTableCells(
- $parameter, MediawikiTemplate $MediawikiTemplate, Mapping
$Mapping
- ) {
+ public function getMetadataAsTableCells( $parameter, Mapping $Mapping )
{
$result = null;
$selected_options = array();
$parameter_as_id = Utils::normalizeSpace( $parameter );
diff --git a/includes/Handlers/Xml/XmlHandler.php
b/includes/Handlers/Xml/XmlHandler.php
index 5cc9266..c7c3932 100644
--- a/includes/Handlers/Xml/XmlHandler.php
+++ b/includes/Handlers/Xml/XmlHandler.php
@@ -104,7 +104,6 @@
array &$user_options, $file_path_local = null, $callback = null
) {
$result = array();
- $read_result = array( 'Title' => null, 'stop-reading' => false
);
if ( empty( $callback ) ) {
throw new MWException(
diff --git a/includes/Handlers/Xml/XmlMappingHandler.php
b/includes/Handlers/Xml/XmlMappingHandler.php
index e0354f9..cc4aeba 100644
--- a/includes/Handlers/Xml/XmlMappingHandler.php
+++ b/includes/Handlers/Xml/XmlMappingHandler.php
@@ -142,9 +142,7 @@
* values provided by the DOMElement
*/
protected function getDOMElementMapped( DOMElement $DOMElement ) {
-
$elements_mapped = array();
- $is_url = false;
$DOMNodeList = $DOMElement->getElementsByTagName( '*' );
// cycle over all of the elements in the record element provided
diff --git a/includes/Helpers/FileChecks.php b/includes/Helpers/FileChecks.php
index f42030a..ac56db2 100644
--- a/includes/Helpers/FileChecks.php
+++ b/includes/Helpers/FileChecks.php
@@ -255,7 +255,7 @@
return $Status;
}
- $Status = self::mimeTypeAndExtensionMatch( $File,
$accepted_types );
+ $Status = self::mimeTypeAndExtensionMatch( $File );
if ( !$Status->ok ) {
return $Status;
}
@@ -269,7 +269,7 @@
* @param {File} $File
* @return {Status}
*/
- public static function mimeTypeAndExtensionMatch( File $File, array
$accepted_types = array() ) {
+ public static function mimeTypeAndExtensionMatch( File $File ) {
if ( !isset( $File->pathinfo['extension'] ) || empty(
$File->pathinfo['extension'] ) ) {
return Status::newFatal(
'gwtoolset-unaccepted-extension' );
}
diff --git a/includes/Helpers/GWTFileBackend.php
b/includes/Helpers/GWTFileBackend.php
index 6bb632a..dab9dca 100644
--- a/includes/Helpers/GWTFileBackend.php
+++ b/includes/Helpers/GWTFileBackend.php
@@ -65,8 +65,6 @@
* @return {bool}
*/
public function createCleanupJob( $mwstore_relative_path = null ) {
- $result = false;
-
if ( empty( $mwstore_relative_path ) ) {
throw new MWException(
wfMessage( 'gwtoolset-developer-issue' )
@@ -115,8 +113,6 @@
* @return {Status}
*/
public function deleteFile( $mwstore_complete_file_path = null ) {
- $result = Status::newGood();
-
if ( empty( $mwstore_complete_file_path ) ) {
throw new MWException(
wfMessage( 'gwtoolset-developer-issue' )
diff --git a/includes/Helpers/WikiChecks.php b/includes/Helpers/WikiChecks.php
index 19dae44..3cb4141 100644
--- a/includes/Helpers/WikiChecks.php
+++ b/includes/Helpers/WikiChecks.php
@@ -110,7 +110,7 @@
* @param {string} $memory_limit
*/
public static function checkMemoryLimit( $memory_limit = null ) {
- global $wgMemoryLimit, $wgUseImageMagick;
+ global $wgUseImageMagick;
if ( empty( $memory_limit ) ) {
$memory_limit = Config::$memory_limit;
diff --git a/includes/Jobs/UploadMediafileJob.php
b/includes/Jobs/UploadMediafileJob.php
index 21d8b47..cb5bd8c 100644
--- a/includes/Jobs/UploadMediafileJob.php
+++ b/includes/Jobs/UploadMediafileJob.php
@@ -42,8 +42,6 @@
* @return {bool|Title}
*/
protected function processMetadata() {
- $result = false;
-
$MediawikiTemplate = new MediawikiTemplate( new
MediawikiTemplatePhpAdapter() );
$MediawikiTemplate->getMediaWikiTemplate(
$this->params['user-options']['gwtoolset-mediawiki-template-name']
@@ -77,9 +75,7 @@
$Metadata->metadata_raw =
$this->params['options']['metadata-raw'];
$Metadata->metadata_as_array =
$this->params['options']['metadata-as-array'];
- $result = $UploadHandler->saveMediafileAsContent(
$this->params['user-options'] );
-
- return $result;
+ return $UploadHandler->saveMediafileAsContent(
$this->params['user-options'] );
}
/**
diff --git a/includes/Jobs/UploadMetadataJob.php
b/includes/Jobs/UploadMetadataJob.php
index b03f132..7c951aa 100644
--- a/includes/Jobs/UploadMetadataJob.php
+++ b/includes/Jobs/UploadMetadataJob.php
@@ -48,15 +48,11 @@
* @return {bool|Title}
*/
protected function processMetadata() {
- $result = false;
-
$MetadataMappingHandler = new MetadataMappingHandler(
array( 'User' => User::newFromName(
$this->params['user-name'] ) )
);
- $result = $MetadataMappingHandler->processRequest(
$this->params['whitelisted-post'] );
-
- return $result;
+ return $MetadataMappingHandler->processRequest(
$this->params['whitelisted-post'] );
}
/**
diff --git a/includes/Models/Mapping.php b/includes/Models/Mapping.php
index 4324398..b08b40b 100644
--- a/includes/Models/Mapping.php
+++ b/includes/Models/Mapping.php
@@ -12,7 +12,6 @@
GWtoolset\Config,
GWToolset\GWTException,
GWToolset\Utils,
- GWToolset\Helpers\WikiPages,
Linker;
class Mapping implements ModelInterface {
@@ -80,8 +79,6 @@
* the keys and values within the array are not filtered
*/
public function getJsonAsArray( array &$options = array() ) {
- $result = array();
-
try {
$result = json_decode( $this->mapping_json, true );
Utils::jsonCheckForError();
@@ -238,7 +235,7 @@
}
public function setTargetElements() {
- foreach ( $this->mapping_array as $key => $value ) {
+ foreach ( $this->mapping_array as $value ) {
foreach ( $value as $item ) {
if ( !in_array( $item,
$this->target_dom_elements ) && !empty( $item ) ) {
$this->target_dom_elements[] = $item;
diff --git a/includes/Utils.php b/includes/Utils.php
index 823b6bc..2cf97d8 100644
--- a/includes/Utils.php
+++ b/includes/Utils.php
@@ -9,7 +9,6 @@
namespace GWToolset;
use
-GWToolset\MediaWiki\Api\Client,
Language,
MWException,
Title;
@@ -26,7 +25,7 @@
$values = array();
foreach ( $array as $keys ) {
- foreach ( $keys as $key => $value ) {
+ foreach ( $keys as $value ) {
$values[] = $value;
}
}
@@ -338,8 +337,7 @@
);
}
- $result = trim( $string );
- $result = filter_var( $string, FILTER_SANITIZE_STRING );
+ $result = filter_var( trim( $string ), FILTER_SANITIZE_STRING );
if ( !$result ) {
$result = null;
--
To view, visit https://gerrit.wikimedia.org/r/102359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bbb7d3541f3d55b16ef77be42ce1adde848b63e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Dan-nl <d_ent...@yahoo.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
