From bc74afc67e192196ea7830ecb12e5eb81170863a Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <ladsgroup@gmail.com>
Date: Mon, 12 Jun 2017 18:15:51 +0430
Subject: [PATCH] Move HttpAccept* to libs

Bug: T163923
Change-Id: I4984f6b77843669950afeff82351827cd416a80d
---
 autoload.php                                                  | 4 ++--
 includes/{ => libs}/http/HttpAcceptNegotiator.php             | 2 +-
 includes/{ => libs}/http/HttpAcceptParser.php                 | 2 +-
 includes/linkeddata/PageDataRequestHandler.php                | 4 ++--
 .../includes/{ => libs}/http/HttpAcceptNegotiatorTest.php     | 4 ++--
 .../phpunit/includes/{ => libs}/http/HttpAcceptParserTest.php | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename includes/{ => libs}/http/HttpAcceptNegotiator.php (99%)
 rename includes/{ => libs}/http/HttpAcceptParser.php (98%)
 rename tests/phpunit/includes/{ => libs}/http/HttpAcceptNegotiatorTest.php (98%)
 rename tests/phpunit/includes/{ => libs}/http/HttpAcceptParserTest.php (93%)

diff --git a/autoload.php b/autoload.php
index 3632b5528c..6c5aff5d3d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -872,8 +872,6 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Diff\\ComplexityException' => __DIR__ . '/includes/diff/ComplexityException.php',
 	'MediaWiki\\Diff\\WordAccumulator' => __DIR__ . '/includes/diff/WordAccumulator.php',
 	'MediaWiki\\HeaderCallback' => __DIR__ . '/includes/HeaderCallback.php',
-	'MediaWiki\\Http\\HttpAcceptNegotiator' => __DIR__ . '/includes/http/HttpAcceptNegotiator.php',
-	'MediaWiki\\Http\\HttpAcceptParser' => __DIR__ . '/includes/http/HttpAcceptParser.php',
 	'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . '/includes/interwiki/ClassicInterwikiLookup.php',
 	'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . '/includes/interwiki/InterwikiLookup.php',
 	'MediaWiki\\Interwiki\\InterwikiLookupAdapter' => __DIR__ . '/includes/interwiki/InterwikiLookupAdapter.php',
@@ -1610,6 +1608,8 @@ $wgAutoloadLocalClasses = [
 	'WikiRevision' => __DIR__ . '/includes/import/WikiRevision.php',
 	'WikiStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
 	'WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php',
+	'Wikimedia\\Http\\HttpAcceptNegotiator' => __DIR__ . '/includes/libs/http/HttpAcceptNegotiator.php',
+	'Wikimedia\\Http\\HttpAcceptParser' => __DIR__ . '/includes/libs/http/HttpAcceptParser.php',
 	'Wikimedia\\Rdbms\\Blob' => __DIR__ . '/includes/libs/rdbms/encasing/Blob.php',
 	'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/ChronologyProtector.php',
 	'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
diff --git a/includes/http/HttpAcceptNegotiator.php b/includes/libs/http/HttpAcceptNegotiator.php
similarity index 99%
rename from includes/http/HttpAcceptNegotiator.php
rename to includes/libs/http/HttpAcceptNegotiator.php
index 399aa34a86..5f8d9a69e1 100644
--- a/includes/http/HttpAcceptNegotiator.php
+++ b/includes/libs/http/HttpAcceptNegotiator.php
@@ -13,7 +13,7 @@
  * @author Thiemo Mättig
  */
 
-namespace MediaWiki\Http;
+namespace Wikimedia\Http;
 
 class HttpAcceptNegotiator {
 
diff --git a/includes/http/HttpAcceptParser.php b/includes/libs/http/HttpAcceptParser.php
similarity index 98%
rename from includes/http/HttpAcceptParser.php
rename to includes/libs/http/HttpAcceptParser.php
index 304c9831e6..bce071e726 100644
--- a/includes/http/HttpAcceptParser.php
+++ b/includes/libs/http/HttpAcceptParser.php
@@ -8,7 +8,7 @@
  * @author Daniel Kinzler
  */
 
-namespace MediaWiki\Http;
+namespace Wikimedia\Http;
 
 class HttpAcceptParser {
 
diff --git a/includes/linkeddata/PageDataRequestHandler.php b/includes/linkeddata/PageDataRequestHandler.php
index 8fc32b9181..9804b2d651 100644
--- a/includes/linkeddata/PageDataRequestHandler.php
+++ b/includes/linkeddata/PageDataRequestHandler.php
@@ -1,7 +1,7 @@
 <?php
 
-use MediaWiki\Http\HttpAcceptParser;
-use MediaWiki\Http\HttpAcceptNegotiator;
+use Wikimedia\Http\HttpAcceptParser;
+use Wikimedia\Http\HttpAcceptNegotiator;
 
 /**
  * Request handler implementing a data interface for mediawiki pages.
diff --git a/tests/phpunit/includes/http/HttpAcceptNegotiatorTest.php b/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php
similarity index 98%
rename from tests/phpunit/includes/http/HttpAcceptNegotiatorTest.php
rename to tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php
index c194803f36..4415bc9717 100644
--- a/tests/phpunit/includes/http/HttpAcceptNegotiatorTest.php
+++ b/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use MediaWiki\Http\HttpAcceptNegotiator;
+use Wikimedia\Http\HttpAcceptNegotiator;
 
 /**
- * @covers MediaWiki\Http\HttpAcceptNegotiator
+ * @covers Wikimedia\Http\HttpAcceptNegotiator
  *
  * @license GPL-2.0+
  * @author Daniel Kinzler
diff --git a/tests/phpunit/includes/http/HttpAcceptParserTest.php b/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php
similarity index 93%
rename from tests/phpunit/includes/http/HttpAcceptParserTest.php
rename to tests/phpunit/includes/libs/http/HttpAcceptParserTest.php
index 7e5fc74692..5bd9425305 100644
--- a/tests/phpunit/includes/http/HttpAcceptParserTest.php
+++ b/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use MediaWiki\Http\HttpAcceptParser;
+use Wikimedia\Http\HttpAcceptParser;
 
 /**
- * @covers MediaWiki\Http\HttpAcceptParser
+ * @covers Wikimedia\Http\HttpAcceptParser
  *
  * @license GPL-2.0+
  * @author Daniel Kinzler
-- 
2.20.1