Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a couple of Generic.Files.OneObjectStructurePerFile.MultipleFound in api

Browse source 
Change-Id: Ibb6b324b286f62153ce5d08a66454e0b05a0ef78
This commit is contained in:
Reedy 2019-04-14 00:27:04 +01:00
parent c81654bcdd
commit 821a4e84dd
6 changed files with 101 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.phpcs.xml
View file

@ -208,8 +208,6 @@
<exclude-pattern>*/includes/api/ApiErrorFormatter\.php</exclude-pattern>
<exclude-pattern>*/includes/api/ApiImport\.php</exclude-pattern>
<exclude-pattern>*/includes/api/ApiMessage\.php</exclude-pattern>
<exclude-pattern>*/includes/api/ApiOpenSearch\.php</exclude-pattern>
<exclude-pattern>*/includes/api/ApiRsd\.php</exclude-pattern>
<exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
<exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
<exclude-pattern>*/includes/Feed\.php</exclude-pattern>

4
autoload.php
View file

@ -52,7 +52,7 @@ $wgAutoloadLocalClasses = [
'ApiFormatPhp' => __DIR__ . '/includes/api/ApiFormatPhp.php',
'ApiFormatRaw' => __DIR__ . '/includes/api/ApiFormatRaw.php',
'ApiFormatXml' => __DIR__ . '/includes/api/ApiFormatXml.php',
'ApiFormatXmlRsd' => __DIR__ . '/includes/api/ApiRsd.php',
'ApiFormatXmlRsd' => __DIR__ . '/includes/api/ApiFormatXmlRsd.php',
'ApiHelp' => __DIR__ . '/includes/api/ApiHelp.php',
'ApiHelpParamValueMessage' => __DIR__ . '/includes/api/ApiHelpParamValueMessage.php',
'ApiImageRotate' => __DIR__ . '/includes/api/ApiImageRotate.php',
@ -69,7 +69,7 @@ $wgAutoloadLocalClasses = [
'ApiModuleManager' => __DIR__ . '/includes/api/ApiModuleManager.php',
'ApiMove' => __DIR__ . '/includes/api/ApiMove.php',
'ApiOpenSearch' => __DIR__ . '/includes/api/ApiOpenSearch.php',
'ApiOpenSearchFormatJson' => __DIR__ . '/includes/api/ApiOpenSearch.php',
'ApiOpenSearchFormatJson' => __DIR__ . '/includes/api/ApiOpenSearchFormatJson.php',
'ApiOptions' => __DIR__ . '/includes/api/ApiOptions.php',
'ApiPageSet' => __DIR__ . '/includes/api/ApiPageSet.php',
'ApiParamInfo' => __DIR__ . '/includes/api/ApiParamInfo.php',

38
includes/api/ApiFormatXmlRsd.php Normal file
View file

@ -0,0 +1,38 @@
<?php
/**
* Copyright © 2010 Bryan Tong Minh and Brion Vibber
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
class ApiFormatXmlRsd extends ApiFormatXml {
public function __construct( ApiMain $main, $format ) {
parent::__construct( $main, $format );
$this->setRootElement( 'rsd' );
}
public function getMimeType() {
return 'application/rsd+xml';
}
public static function recXmlPrint( $name, $value, $indent, $attributes = [] ) {
unset( $attributes['_idx'] );
return parent::recXmlPrint( $name, $value, $indent, $attributes );
}
}

38
includes/api/ApiOpenSearch.php
View file

@ -379,41 +379,3 @@ class ApiOpenSearch extends ApiBase {
}
}
}
/**
* @ingroup API
*/
class ApiOpenSearchFormatJson extends ApiFormatJson {
private $warningsAsError = false;
public function __construct( ApiMain $main, $fm, $warningsAsError ) {
parent::__construct( $main, "json$fm" );
$this->warningsAsError = $warningsAsError;
}
public function execute() {
$result = $this->getResult();
if ( !$result->getResultData( 'error' ) && !$result->getResultData( 'errors' ) ) {
// Ignore warnings or treat as errors, as requested
$warnings = $result->removeValue( 'warnings', null );
if ( $this->warningsAsError && $warnings ) {
$this->dieWithError(
'apierror-opensearch-json-warnings',
'warnings',
[ 'warnings' => $warnings ]
);
}
// Ignore any other unexpected keys (e.g. from $wgDebugToolbar)
$remove = array_keys( array_diff_key(
$result->getResultData(),
[ 0 => 'search', 1 => 'terms', 2 => 'descriptions', 3 => 'urls' ]
) );
foreach ( $remove as $key ) {
$result->removeValue( $key, null );
}
}
parent::execute();
}
}

61
includes/api/ApiOpenSearchFormatJson.php Normal file
View file

@ -0,0 +1,61 @@
<?php
/**
* Copyright © 2006 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
* Copyright © 2008 Brion Vibber <brion@wikimedia.org>
* Copyright © 2014 Wikimedia Foundation and contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
/**
* @ingroup API
*/
class ApiOpenSearchFormatJson extends ApiFormatJson {
private $warningsAsError = false;
public function __construct( ApiMain $main, $fm, $warningsAsError ) {
parent::__construct( $main, "json$fm" );
$this->warningsAsError = $warningsAsError;
}
public function execute() {
$result = $this->getResult();
if ( !$result->getResultData( 'error' ) && !$result->getResultData( 'errors' ) ) {
// Ignore warnings or treat as errors, as requested
$warnings = $result->removeValue( 'warnings', null );
if ( $this->warningsAsError && $warnings ) {
$this->dieWithError(
'apierror-opensearch-json-warnings',
'warnings',
[ 'warnings' => $warnings ]
);
}
// Ignore any other unexpected keys (e.g. from $wgDebugToolbar)
$remove = array_keys( array_diff_key(
$result->getResultData(),
[ 0 => 'search', 1 => 'terms', 2 => 'descriptions', 3 => 'urls' ]
) );
foreach ( $remove as $key ) {
$result->removeValue( $key, null );
}
}
parent::execute();
}
}

16
includes/api/ApiRsd.php
View file

@ -149,19 +149,3 @@ class ApiRsd extends ApiBase {
return $outputData;
}
}
class ApiFormatXmlRsd extends ApiFormatXml {
public function __construct( ApiMain $main, $format ) {
parent::__construct( $main, $format );
$this->setRootElement( 'rsd' );
}
public function getMimeType() {
return 'application/rsd+xml';
}
public static function recXmlPrint( $name, $value, $indent, $attributes = [] ) {
unset( $attributes['_idx'] );
return parent::recXmlPrint( $name, $value, $indent, $attributes );
}
}