Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97318
Change subject: Remove leading underscore from method name
......................................................................
Remove leading underscore from method name
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(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/18/97318/1
diff --git a/includes/filebackend/FSFileBackend.php
b/includes/filebackend/FSFileBackend.php
index 993e2ba..8438919 100644
--- a/includes/filebackend/FSFileBackend.php
+++ b/includes/filebackend/FSFileBackend.php
@@ -229,7 +229,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
@@ -276,7 +276,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
@@ -340,7 +340,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
@@ -397,7 +397,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
@@ -445,7 +445,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
@@ -712,7 +712,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 5c9fdc2..a1521dd 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -309,7 +309,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 ) {
@@ -397,7 +397,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 ) {
@@ -472,7 +472,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
@@ -548,7 +548,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
@@ -597,7 +597,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 ) {
@@ -1364,7 +1364,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: newchange
Gerrit-Change-Id: I6cf0fccb47a7e1070999ee510b4d3e0112c41cea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits