From 8eba329111e832d7efdacf4f6a6fa85b0f7abbf3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 1 May 2019 21:24:51 -0400
Subject: [PATCH] Remove code parameter from HTTPException constructor

- Remove duplicate HTTPException->httpcode class variable
---
 src/Network/HTTPException.php                      | 14 +++++++-------
 src/Network/HTTPException/AcceptedException.php    | 10 ++++++++++
 src/Network/HTTPException/BadGatewayException.php  |  2 +-
 src/Network/HTTPException/BadRequestException.php  |  2 +-
 src/Network/HTTPException/ConflictException.php    |  2 +-
 .../HTTPException/ExpectationFailedException.php   |  2 +-
 src/Network/HTTPException/ForbiddenException.php   |  4 ++--
 .../HTTPException/GatewayTimeoutException.php      |  2 +-
 src/Network/HTTPException/GoneException.php        |  2 +-
 src/Network/HTTPException/ImATeapotException.php   |  2 +-
 .../HTTPException/InternalServerErrorException.php |  2 +-
 .../HTTPException/LenghtRequiredException.php      |  2 +-
 .../HTTPException/MethodNotAllowedException.php    |  2 +-
 src/Network/HTTPException/NoContentException.php   | 10 ++++++++++
 .../HTTPException/NonAcceptableException.php       |  2 +-
 src/Network/HTTPException/NotFoundException.php    |  5 +++--
 .../HTTPException/NotImplementedException.php      |  2 +-
 src/Network/HTTPException/OKException.php          | 10 ++++++++++
 .../HTTPException/PreconditionFailedException.php  |  2 +-
 .../HTTPException/ServiceUnavaiableException.php   |  2 +-
 .../HTTPException/TooManyRequestsException.php     |  2 +-
 .../HTTPException/UnauthorizedException.php        |  2 +-
 .../HTTPException/UnprocessableEntityException.php |  2 +-
 .../UnsupportedMediaTypeException.php              |  2 +-
 24 files changed, 60 insertions(+), 29 deletions(-)
 create mode 100644 src/Network/HTTPException/AcceptedException.php
 create mode 100644 src/Network/HTTPException/NoContentException.php
 create mode 100644 src/Network/HTTPException/OKException.php

diff --git a/src/Network/HTTPException.php b/src/Network/HTTPException.php
index b9bad457da..89c447b714 100644
--- a/src/Network/HTTPException.php
+++ b/src/Network/HTTPException.php
@@ -3,7 +3,7 @@
 /**
  * Throwable exceptions to return HTTP status code
  *
- * This list of Exception has be extracted from
+ * This list of Exception has been extracted from
  * here http://racksburg.com/choosing-an-http-status-code/
  */
 
@@ -11,17 +11,17 @@ namespace Friendica\Network;
 
 use Exception;
 
-class HTTPException extends Exception
+abstract class HTTPException extends Exception
 {
-	var $httpcode = 200;
-	var $httpdesc = "";
+	public $httpdesc = '';
 
-	public function __construct($message = '', $code = 0, Exception $previous = null)
+	public function __construct($message = '', Exception $previous = null)
 	{
-		if ($this->httpdesc == '') {
+		parent::__construct($message, $this->code, $previous);
+
+		if (empty($this->httpdesc)) {
 			$classname = str_replace('Exception', '', str_replace('Friendica\Network\HTTPException\\', '', get_class($this)));
 			$this->httpdesc = preg_replace("|([a-z])([A-Z])|",'$1 $2', $classname);
 		}
-		parent::__construct($message, $code, $previous);
 	}
 }
diff --git a/src/Network/HTTPException/AcceptedException.php b/src/Network/HTTPException/AcceptedException.php
new file mode 100644
index 0000000000..b8c843ec54
--- /dev/null
+++ b/src/Network/HTTPException/AcceptedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class AcceptedException extends HTTPException
+{
+	protected $code = 202;
+}
diff --git a/src/Network/HTTPException/BadGatewayException.php b/src/Network/HTTPException/BadGatewayException.php
index 6fc80c9091..c23d7e5a34 100644
--- a/src/Network/HTTPException/BadGatewayException.php
+++ b/src/Network/HTTPException/BadGatewayException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class BadGatewayException extends HTTPException
 {
-	var $httpcode = 502;
+	protected $code = 502;
 }
diff --git a/src/Network/HTTPException/BadRequestException.php b/src/Network/HTTPException/BadRequestException.php
index dd1dc191b8..9f25c61a8f 100644
--- a/src/Network/HTTPException/BadRequestException.php
+++ b/src/Network/HTTPException/BadRequestException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class BadRequestException extends HTTPException
 {
-	var $httpcode = 400;
+	protected $code = 400;
 }
diff --git a/src/Network/HTTPException/ConflictException.php b/src/Network/HTTPException/ConflictException.php
index 1d5053c4b7..5d63922c9b 100644
--- a/src/Network/HTTPException/ConflictException.php
+++ b/src/Network/HTTPException/ConflictException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class ConflictException extends HTTPException
 {
-	var $httpcode = 409;
+	protected $code = 409;
 }
diff --git a/src/Network/HTTPException/ExpectationFailedException.php b/src/Network/HTTPException/ExpectationFailedException.php
index fe932a9f0a..7c928f34fa 100644
--- a/src/Network/HTTPException/ExpectationFailedException.php
+++ b/src/Network/HTTPException/ExpectationFailedException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class ExpectationFailedException extends HTTPException
 {
-	var $httpcode = 417;
+	protected $code = 417;
 }
diff --git a/src/Network/HTTPException/ForbiddenException.php b/src/Network/HTTPException/ForbiddenException.php
index 66a063e137..f83fe524ba 100644
--- a/src/Network/HTTPException/ForbiddenException.php
+++ b/src/Network/HTTPException/ForbiddenException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class ForbiddenException extends HTTPException
 {
-	var $httpcode = 403;
-}
\ No newline at end of file
+	protected $code = 403;
+}
diff --git a/src/Network/HTTPException/GatewayTimeoutException.php b/src/Network/HTTPException/GatewayTimeoutException.php
index bcd98080ed..2e51648506 100644
--- a/src/Network/HTTPException/GatewayTimeoutException.php
+++ b/src/Network/HTTPException/GatewayTimeoutException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class GatewayTimeoutException extends HTTPException
 {
-	var $httpcode = 504;
+	protected $code = 504;
 }
diff --git a/src/Network/HTTPException/GoneException.php b/src/Network/HTTPException/GoneException.php
index 42e19e89da..0f665206f9 100644
--- a/src/Network/HTTPException/GoneException.php
+++ b/src/Network/HTTPException/GoneException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class GoneException extends HTTPException
 {
-	var $httpcode = 410;
+	protected $code = 410;
 }
diff --git a/src/Network/HTTPException/ImATeapotException.php b/src/Network/HTTPException/ImATeapotException.php
index f4eea4077c..89a28bebd8 100644
--- a/src/Network/HTTPException/ImATeapotException.php
+++ b/src/Network/HTTPException/ImATeapotException.php
@@ -6,6 +6,6 @@ use Friendica\Network\HTTPException;
 
 class ImATeapotException extends HTTPException
 {
-	var $httpcode = 418;
+	protected $code = 418;
 	var $httpdesc = "I'm A Teapot";
 }
diff --git a/src/Network/HTTPException/InternalServerErrorException.php b/src/Network/HTTPException/InternalServerErrorException.php
index c049ef25ba..dca1894fb4 100644
--- a/src/Network/HTTPException/InternalServerErrorException.php
+++ b/src/Network/HTTPException/InternalServerErrorException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class InternalServerErrorException extends HTTPException
 {
-	var $httpcode = 500;
+	protected $code = 500;
 }
diff --git a/src/Network/HTTPException/LenghtRequiredException.php b/src/Network/HTTPException/LenghtRequiredException.php
index 1f2f0f16bc..071cac73d0 100644
--- a/src/Network/HTTPException/LenghtRequiredException.php
+++ b/src/Network/HTTPException/LenghtRequiredException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class LenghtRequiredException extends HTTPException
 {
-	var $httpcode = 411;
+	protected $code = 411;
 }
diff --git a/src/Network/HTTPException/MethodNotAllowedException.php b/src/Network/HTTPException/MethodNotAllowedException.php
index 82fd3e786b..128b9dc062 100644
--- a/src/Network/HTTPException/MethodNotAllowedException.php
+++ b/src/Network/HTTPException/MethodNotAllowedException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class MethodNotAllowedException extends HTTPException
 {
-	var $httpcode = 405;
+	protected $code = 405;
 }
diff --git a/src/Network/HTTPException/NoContentException.php b/src/Network/HTTPException/NoContentException.php
new file mode 100644
index 0000000000..7bd60fbbc3
--- /dev/null
+++ b/src/Network/HTTPException/NoContentException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class NoContentException extends HTTPException
+{
+	protected $code = 204;
+}
diff --git a/src/Network/HTTPException/NonAcceptableException.php b/src/Network/HTTPException/NonAcceptableException.php
index 356bc0c545..9ef40d60b6 100644
--- a/src/Network/HTTPException/NonAcceptableException.php
+++ b/src/Network/HTTPException/NonAcceptableException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class NonAcceptableException extends HTTPException
 {
-	var $httpcode = 406;
+	protected $code = 406;
 }
diff --git a/src/Network/HTTPException/NotFoundException.php b/src/Network/HTTPException/NotFoundException.php
index 2d24ccef04..f581794796 100644
--- a/src/Network/HTTPException/NotFoundException.php
+++ b/src/Network/HTTPException/NotFoundException.php
@@ -4,6 +4,7 @@ namespace Friendica\Network\HTTPException;
 
 use Friendica\Network\HTTPException;
 
-class NotFoundException extends HTTPException {
-	var $httpcode = 404;
+class NotFoundException extends HTTPException
+{
+	protected $code = 404;
 }
diff --git a/src/Network/HTTPException/NotImplementedException.php b/src/Network/HTTPException/NotImplementedException.php
index c0dc21c158..76cb5d4206 100644
--- a/src/Network/HTTPException/NotImplementedException.php
+++ b/src/Network/HTTPException/NotImplementedException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class NotImplementedException extends HTTPException
 {
-	var $httpcode = 501;
+	protected $code = 501;
 }
diff --git a/src/Network/HTTPException/OKException.php b/src/Network/HTTPException/OKException.php
new file mode 100644
index 0000000000..d506ddf32e
--- /dev/null
+++ b/src/Network/HTTPException/OKException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class OKException extends HTTPException
+{
+	protected $code = 200;
+}
diff --git a/src/Network/HTTPException/PreconditionFailedException.php b/src/Network/HTTPException/PreconditionFailedException.php
index fd5fdbc995..325c88aa47 100644
--- a/src/Network/HTTPException/PreconditionFailedException.php
+++ b/src/Network/HTTPException/PreconditionFailedException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class PreconditionFailedException extends HTTPException
 {
-	var $httpcode = 412;
+	protected $code = 412;
 }
diff --git a/src/Network/HTTPException/ServiceUnavaiableException.php b/src/Network/HTTPException/ServiceUnavaiableException.php
index 9270bc4505..6c0e6595d8 100644
--- a/src/Network/HTTPException/ServiceUnavaiableException.php
+++ b/src/Network/HTTPException/ServiceUnavaiableException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class ServiceUnavaiableException extends HTTPException
 {
-	var $httpcode = 503;
+	protected $code = 503;
 }
diff --git a/src/Network/HTTPException/TooManyRequestsException.php b/src/Network/HTTPException/TooManyRequestsException.php
index 093911f932..e06d9d9cbf 100644
--- a/src/Network/HTTPException/TooManyRequestsException.php
+++ b/src/Network/HTTPException/TooManyRequestsException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class TooManyRequestsException extends HTTPException
 {
-	var $httpcode = 429;
+	protected $code = 429;
 }
diff --git a/src/Network/HTTPException/UnauthorizedException.php b/src/Network/HTTPException/UnauthorizedException.php
index a3015d412d..eda1f071bc 100644
--- a/src/Network/HTTPException/UnauthorizedException.php
+++ b/src/Network/HTTPException/UnauthorizedException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class UnauthorizedException extends HTTPException
 {
-	var $httpcode = 401;
+	protected $code = 401;
 }
diff --git a/src/Network/HTTPException/UnprocessableEntityException.php b/src/Network/HTTPException/UnprocessableEntityException.php
index 02852e2f92..b33a75f793 100644
--- a/src/Network/HTTPException/UnprocessableEntityException.php
+++ b/src/Network/HTTPException/UnprocessableEntityException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class UnprocessableEntityException extends HTTPException
 {
-	var $httpcode = 422;
+	protected $code = 422;
 }
diff --git a/src/Network/HTTPException/UnsupportedMediaTypeException.php b/src/Network/HTTPException/UnsupportedMediaTypeException.php
index b039901739..02962dfc29 100644
--- a/src/Network/HTTPException/UnsupportedMediaTypeException.php
+++ b/src/Network/HTTPException/UnsupportedMediaTypeException.php
@@ -6,5 +6,5 @@ use Friendica\Network\HTTPException;
 
 class UnsupportedMediaTypeException extends HTTPException
 {
-	var $httpcode = 415;
+	protected $code = 415;
 }
-- 
2.39.5