jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347524 )
Change subject: Use constants for HTTP status codes
......................................................................
Use constants for HTTP status codes
Change-Id: I4325d080631c85c6187001487796ec0aa56b5593
---
M Core/Http/HttpStatusValidator.php
M Core/Http/RequestHandler.php
M Core/Listeners/RestListener.php
M PaymentProviders/Ingenico/RestResponseValidator.php
M PaymentProviders/PayPal/Listener.php
5 files changed, 19 insertions(+), 17 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Core/Http/HttpStatusValidator.php
b/Core/Http/HttpStatusValidator.php
index 68c6859..7a88f0b 100644
--- a/Core/Http/HttpStatusValidator.php
+++ b/Core/Http/HttpStatusValidator.php
@@ -3,6 +3,7 @@
namespace SmashPig\Core\Http;
use SmashPig\Core\Logging\Logger;
+use Symfony\Component\HttpFoundation\Response;
/**
* Determines whether to retry HTTP requests based on status code
@@ -19,12 +20,12 @@
$body = $parsedResponse['body'];
switch ( $statusCode ) {
- case 400: // Oh noes! Bad request.. BAD CODE, BAD BAD
CODE!
+ case Response::HTTP_BAD_REQUEST: // Oh noes! Bad
request.. BAD CODE, BAD BAD CODE!
$continue = false;
Logger::error( "Request returned (400) BAD
REQUEST: $body" );
break;
- case 403: // Hmm, forbidden? Maybe if we ask it
nicely again...
+ case Response::HTTP_FORBIDDEN: // Hmm, forbidden?
Maybe if we ask it nicely again...
$continue = true;
Logger::alert( "Request returned (403)
FORBIDDEN: $body" );
break;
@@ -39,8 +40,8 @@
protected function getSuccessCodes() {
return array(
- 200, // Everything is AWESOME
- 201 // Also fine, and we created a thing
+ Response::HTTP_OK, // Everything is AWESOME
+ Response::HTTP_CREATED // Also fine, and we created a
thing
);
}
}
diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index 5036a69..4744e38 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -36,7 +36,7 @@
if ( count( $parts ) < 2 ) {
$response->setStatusCode(
- 403,
+ Response::HTTP_FORBIDDEN,
'Cannot process this request: bad URI format. A
configuration node and an action is required'
);
return $response;
@@ -57,7 +57,7 @@
if ( $config->nodeExists( 'disabled' ) && $config->val(
'disabled' ) ) {
Logger::debug( '403 will be given for disabled view.',
$uri );
- $response->setStatusCode( 403, "View '$view' disabled.
Cannot continue." );
+ $response->setStatusCode( Response::HTTP_FORBIDDEN,
"View '$view' disabled. Cannot continue." );
return $response;
}
@@ -80,7 +80,7 @@
Logger::info( "Starting processing for request, configuration
view: '$view', action: '$action'" );
if ( !$config->nodeExists( "endpoints/$action" ) ) {
Logger::debug( '403 will be given for unknown action on
inbound URL.', $uri );
- $response->setStatusCode( 403, "Action '$action' not
configured. Cannot continue." );
+ $response->setStatusCode( Response::HTTP_FORBIDDEN,
"Action '$action' not configured. Cannot continue." );
return $response;
}
@@ -101,11 +101,11 @@
} else {
$str = "Requested action '$action' does not implement a
known handler. Cannot continue.";
Logger::debug( $str );
- $response->setStatusCode( 500, $str );
+ $response->setStatusCode(
Response::HTTP_INTERNAL_SERVER_ERROR, $str );
}
$code = $response->getStatusCode();
- if ( ( $code !== 200 ) && ( $code !== 302 ) ) {
+ if ( ( $code !== Response::HTTP_OK ) && ( $code !==
Response::HTTP_FOUND ) ) {
$response->setContent( '' );
}
return $response;
@@ -125,7 +125,7 @@
$response = new Response();
$response->setPrivate();
- $response->setStatusCode( 500, "Unhandled internal server
error." );
+ $response->setStatusCode( Response::HTTP_INTERNAL_SERVER_ERROR,
"Unhandled internal server error." );
$response->send();
return false;
@@ -142,7 +142,7 @@
$response = new Response();
$response->setPrivate();
- $response->setStatusCode( 500, "Unhandled internal server
exception." );
+ $response->setStatusCode( Response::HTTP_INTERNAL_SERVER_ERROR,
"Unhandled internal server exception." );
$response->send();
}
}
diff --git a/Core/Listeners/RestListener.php b/Core/Listeners/RestListener.php
index ff597ca..8b805f2 100644
--- a/Core/Listeners/RestListener.php
+++ b/Core/Listeners/RestListener.php
@@ -23,19 +23,19 @@
$this->ackEnvelope();
} catch ( ListenerSecurityException $ex ) {
Logger::notice( 'Message denied by security policy,
death is me.', null, $ex );
- $response->setStatusCode( 403, "Not authorized." );
+ $response->setStatusCode( Response::HTTP_FORBIDDEN,
"Not authorized." );
}
catch ( ListenerDataException $ex ) {
Logger::error( 'Listener received request it could not
process, death is me.', null, $ex );
- $response->setStatusCode( 500, 'Received data could not
be processed.' );
+ $response->setStatusCode(
Response::HTTP_INTERNAL_SERVER_ERROR, 'Received data could not be processed.' );
}
catch ( Core\ConfigurationException $ex ) {
Logger::alert( 'Some sad panda gave me a bad
configuration.', null, $ex );
- $response->setStatusCode( 500, "Configuration error." );
+ $response->setStatusCode(
Response::HTTP_INTERNAL_SERVER_ERROR, "Configuration error." );
}
catch ( \Exception $ex ) {
Logger::error( 'Listener threw an unknown exception,
death is me.', null, $ex );
- $response->setStatusCode( 500, "Unknown listener
exception" );
+ $response->setStatusCode(
Response::HTTP_INTERNAL_SERVER_ERROR, "Unknown listener exception" );
}
Logger::info( 'Finished processing listener request' );
diff --git a/PaymentProviders/Ingenico/RestResponseValidator.php
b/PaymentProviders/Ingenico/RestResponseValidator.php
index 0a74d33..f8e1f66 100644
--- a/PaymentProviders/Ingenico/RestResponseValidator.php
+++ b/PaymentProviders/Ingenico/RestResponseValidator.php
@@ -2,11 +2,12 @@
namespace SmashPig\PaymentProviders\Ingenico;
use SmashPig\Core\Http\HttpStatusValidator;
+use Symfony\Component\HttpFoundation\Response;
class RestResponseValidator extends HttpStatusValidator {
protected function getSuccessCodes() {
$codes = parent::getSuccessCodes();
- $codes[] = '404'; // also a valid response in REST-ese
+ $codes[] = Response::HTTP_NOT_FOUND; // also a valid response
in REST-ese
return $codes;
}
}
diff --git a/PaymentProviders/PayPal/Listener.php
b/PaymentProviders/PayPal/Listener.php
index 4148554..51fd574 100644
--- a/PaymentProviders/PayPal/Listener.php
+++ b/PaymentProviders/PayPal/Listener.php
@@ -28,7 +28,7 @@
// Tried to validate a bunch of times and got nonsense
responses.
Logger::error( $e->getMessage() );
// 403 should tell them to send it again later.
- $response->setStatusCode( 403, 'Failed verification' );
+ $response->setStatusCode( Response::HTTP_FORBIDDEN,
'Failed verification' );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/347524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4325d080631c85c6187001487796ec0aa56b5593
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
