jenkins-bot has submitted this change and it was merged.
Change subject: Remove leading underscore from methods _getResponse*
......................................................................
Remove leading underscore from methods _getResponse*
Resolves CodeSniffer warning PSR2.Methods.MethodDeclaration.Underscore
Change-Id: I6cf0fccb47a7e1070999ee510b4d3e0112c41cea
---
M includes/filebackend/FSFileBackend.php
M includes/filebackend/SwiftFileBackend.php
2 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/FSFileBackend.php
b/includes/filebackend/FSFileBackend.php
index 6d64216..9b8c138 100644
--- a/includes/filebackend/FSFileBackend.php
+++ b/includes/filebackend/FSFileBackend.php
@@ -214,7 +214,7 @@
/**
* @see FSFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseCreate( $errors, Status $status, array
$params, $cmd ) {
+ protected function getResponseCreate( $errors, Status $status, array
$params, $cmd ) {
if ( $errors !== '' && !( wfIsWindows() && $errors[0] === " " )
) {
$status->fatal( 'backend-fail-create', $params['dst'] );
trigger_error( "$cmd\n$errors", E_USER_WARNING ); //
command output
@@ -259,7 +259,7 @@
/**
* @see FSFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseStore( $errors, Status $status, array
$params, $cmd ) {
+ protected function getResponseStore( $errors, Status $status, array
$params, $cmd ) {
if ( $errors !== '' && !( wfIsWindows() && $errors[0] === " " )
) {
$status->fatal( 'backend-fail-store', $params['src'],
$params['dst'] );
trigger_error( "$cmd\n$errors", E_USER_WARNING ); //
command output
@@ -319,7 +319,7 @@
/**
* @see FSFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseCopy( $errors, Status $status, array
$params, $cmd ) {
+ protected function getResponseCopy( $errors, Status $status, array
$params, $cmd ) {
if ( $errors !== '' && !( wfIsWindows() && $errors[0] === " " )
) {
$status->fatal( 'backend-fail-copy', $params['src'],
$params['dst'] );
trigger_error( "$cmd\n$errors", E_USER_WARNING ); //
command output
@@ -372,7 +372,7 @@
/**
* @see FSFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseMove( $errors, Status $status, array
$params, $cmd ) {
+ protected function getResponseMove( $errors, Status $status, array
$params, $cmd ) {
if ( $errors !== '' && !( wfIsWindows() && $errors[0] === " " )
) {
$status->fatal( 'backend-fail-move', $params['src'],
$params['dst'] );
trigger_error( "$cmd\n$errors", E_USER_WARNING ); //
command output
@@ -417,7 +417,7 @@
/**
* @see FSFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseDelete( $errors, Status $status, array
$params, $cmd ) {
+ protected function getResponseDelete( $errors, Status $status, array
$params, $cmd ) {
if ( $errors !== '' && !( wfIsWindows() && $errors[0] === " " )
) {
$status->fatal( 'backend-fail-delete', $params['src'] );
trigger_error( "$cmd\n$errors", E_USER_WARNING ); //
command output
@@ -662,7 +662,7 @@
foreach ( $fileOpHandles as $index => $fileOpHandle ) {
$status = Status::newGood();
- $function = '_getResponse' . $fileOpHandle->call;
+ $function = 'getResponse' . $fileOpHandle->call;
$this->$function( $errs[$index], $status,
$fileOpHandle->params, $fileOpHandle->cmd );
$statuses[$index] = $status;
if ( $status->isOK() && $fileOpHandle->chmodPath ) {
diff --git a/includes/filebackend/SwiftFileBackend.php
b/includes/filebackend/SwiftFileBackend.php
index 1787d66..037a8a2 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -279,7 +279,7 @@
/**
* @see SwiftFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseCreate( CF_Async_Op $cfOp, Status
$status, array $params ) {
+ protected function getResponseCreate( CF_Async_Op $cfOp, Status
$status, array $params ) {
try {
$cfOp->getLastResponse();
} catch ( BadContentTypeException $e ) {
@@ -363,7 +363,7 @@
/**
* @see SwiftFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseStore( CF_Async_Op $cfOp, Status
$status, array $params ) {
+ protected function getResponseStore( CF_Async_Op $cfOp, Status $status,
array $params ) {
try {
$cfOp->getLastResponse();
} catch ( BadContentTypeException $e ) {
@@ -434,7 +434,7 @@
/**
* @see SwiftFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseCopy( CF_Async_Op $cfOp, Status $status,
array $params ) {
+ protected function getResponseCopy( CF_Async_Op $cfOp, Status $status,
array $params ) {
try {
$cfOp->getLastResponse();
} catch ( NoSuchObjectException $e ) { // source object does
not exist
@@ -506,7 +506,7 @@
/**
* @see SwiftFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseMove( CF_Async_Op $cfOp, Status $status,
array $params ) {
+ protected function getResponseMove( CF_Async_Op $cfOp, Status $status,
array $params ) {
try {
$cfOp->getLastResponse();
} catch ( NoSuchObjectException $e ) { // source object does
not exist
@@ -554,7 +554,7 @@
/**
* @see SwiftFileBackend::doExecuteOpHandlesInternal()
*/
- protected function _getResponseDelete( CF_Async_Op $cfOp, Status
$status, array $params ) {
+ protected function getResponseDelete( CF_Async_Op $cfOp, Status
$status, array $params ) {
try {
$cfOp->getLastResponse();
} catch ( NoSuchContainerException $e ) {
@@ -1290,7 +1290,7 @@
$cfOps = $batch->execute();
foreach ( $cfOps as $index => $cfOp ) {
$status = Status::newGood();
- $function = '_getResponse' .
$fileOpHandles[$index]->call;
+ $function = 'getResponse' .
$fileOpHandles[$index]->call;
try { // catch exceptions; update status
$this->$function( $cfOp, $status,
$fileOpHandles[$index]->params );
$this->purgeCDNCache(
$fileOpHandles[$index]->affectedObjects );
--
To view, visit https://gerrit.wikimedia.org/r/97318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cf0fccb47a7e1070999ee510b4d3e0112c41cea
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
