aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--inc/HTTPClient.php53
-rw-r--r--inc/deprecated.php49
-rw-r--r--inc/load.php2
3 files changed, 49 insertions, 55 deletions
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
deleted file mode 100644
index badef9604..000000000
--- a/inc/HTTPClient.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-// phpcs:ignoreFile
-
-use dokuwiki\Debug\DebugHelper;
-
-/**
- * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\HTTPClientException instead!
- */
-class HTTPClientException extends \dokuwiki\HTTPClient\HTTPClientException {
-
- /**
- * @inheritdoc
- * @deprecated 2019-03-17
- */
- public function __construct($message = '', $code = 0, $previous = null)
- {
- DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\HTTPClientException::class);
- parent::__construct($message, $code, $previous);
- }
-}
-
-/**
- * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\HTTPClient instead!
- */
-class HTTPClient extends \dokuwiki\HTTPClient\HTTPClient {
-
- /**
- * @inheritdoc
- * @deprecated 2019-03-17
- */
- public function __construct()
- {
- DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\HTTPClient::class);
- parent::__construct();
- }
-}
-
-/**
- * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\DokuHTTPClient instead!
- */
-class DokuHTTPClient extends \dokuwiki\HTTPClient\DokuHTTPClient {
-
- /**
- * @inheritdoc
- * @deprecated 2019-03-17
- */
- public function __construct()
- {
- DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\DokuHTTPClient::class);
- parent::__construct();
- }
-
-}
diff --git a/inc/deprecated.php b/inc/deprecated.php
index 22105bec3..da983cfcd 100644
--- a/inc/deprecated.php
+++ b/inc/deprecated.php
@@ -266,3 +266,52 @@ class PassHash extends \dokuwiki\PassHash {
dbg_deprecated(\dokuwiki\PassHash::class);
}
}
+
+/**
+ * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\HTTPClientException instead!
+ */
+class HTTPClientException extends \dokuwiki\HTTPClient\HTTPClientException {
+
+ /**
+ * @inheritdoc
+ * @deprecated 2019-03-17
+ */
+ public function __construct($message = '', $code = 0, $previous = null)
+ {
+ DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\HTTPClientException::class);
+ parent::__construct($message, $code, $previous);
+ }
+}
+
+/**
+ * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\HTTPClient instead!
+ */
+class HTTPClient extends \dokuwiki\HTTPClient\HTTPClient {
+
+ /**
+ * @inheritdoc
+ * @deprecated 2019-03-17
+ */
+ public function __construct()
+ {
+ DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\HTTPClient::class);
+ parent::__construct();
+ }
+}
+
+/**
+ * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\DokuHTTPClient instead!
+ */
+class DokuHTTPClient extends \dokuwiki\HTTPClient\DokuHTTPClient {
+
+ /**
+ * @inheritdoc
+ * @deprecated 2019-03-17
+ */
+ public function __construct()
+ {
+ DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\DokuHTTPClient::class);
+ parent::__construct();
+ }
+
+}
diff --git a/inc/load.php b/inc/load.php
index c96b38134..f4e9004f0 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -52,8 +52,6 @@ require_once(DOKU_INC.'inc/deprecated.php');
function load_autoload($name){
static $classes = null;
if(is_null($classes)) $classes = array(
- 'DokuHTTPClient' => DOKU_INC.'inc/HTTPClient.php',
- 'HTTPClient' => DOKU_INC.'inc/HTTPClient.php',
'Diff' => DOKU_INC.'inc/DifferenceEngine.php',
'UnifiedDiffFormatter' => DOKU_INC.'inc/DifferenceEngine.php',
'TableDiffFormatter' => DOKU_INC.'inc/DifferenceEngine.php',