Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342282 )
Change subject: widgets: Rename directory and namespace, move search stuff to
own place
......................................................................
widgets: Rename directory and namespace, move search stuff to own place
Change-Id: I16d21dd5e1ac3aa9893863df272d1bbb4788066f
---
M autoload.php
M includes/htmlform/fields/HTMLDateTimeField.php
M includes/htmlform/fields/HTMLSelectNamespace.php
M includes/htmlform/fields/HTMLTitleTextField.php
M includes/htmlform/fields/HTMLUserTextField.php
M includes/htmlform/fields/HTMLUsersMultiselectField.php
R includes/search/searchwidgets/BasicSearchResultSetWidget.php
R includes/search/searchwidgets/DidYouMeanWidget.php
R includes/search/searchwidgets/FullSearchResultWidget.php
R includes/search/searchwidgets/InterwikiSearchResultSetWidget.php
R includes/search/searchwidgets/InterwikiSearchResultWidget.php
R includes/search/searchwidgets/SearchFormWidget.php
R includes/search/searchwidgets/SearchResultSetWidget.php
R includes/search/searchwidgets/SearchResultWidget.php
R includes/search/searchwidgets/SimpleSearchResultSetWidget.php
R includes/search/searchwidgets/SimpleSearchResultWidget.php
M includes/specials/SpecialMovepage.php
M includes/specials/SpecialSearch.php
R includes/widgets/AUTHORS.txt
R includes/widgets/ComplexNamespaceInputWidget.php
R includes/widgets/ComplexTitleInputWidget.php
R includes/widgets/DateInputWidget.php
R includes/widgets/DateTimeInputWidget.php
R includes/widgets/LICENSE.txt
R includes/widgets/NamespaceInputWidget.php
A includes/widgets/README.txt
R includes/widgets/SearchInputWidget.php
R includes/widgets/TitleInputWidget.php
R includes/widgets/UserInputWidget.php
R includes/widgets/UsersMultiselectWidget.php
30 files changed, 54 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/342282/1
diff --git a/autoload.php b/autoload.php
index 0f79323..89e39b0 100644
--- a/autoload.php
+++ b/autoload.php
@@ -881,6 +881,16 @@
'MediaWiki\\Logger\\NullSpi' => __DIR__ .
'/includes/debug/logger/NullSpi.php',
'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
'MediaWiki\\MediaWikiServices' => __DIR__ .
'/includes/MediaWikiServices.php',
+ 'MediaWiki\\SearchWidgets\\BasicSearchResultSetWidget' => __DIR__ .
'/includes/search/searchwidgets/BasicSearchResultSetWidget.php',
+ 'MediaWiki\\SearchWidgets\\DidYouMeanWidget' => __DIR__ .
'/includes/search/searchwidgets/DidYouMeanWidget.php',
+ 'MediaWiki\\SearchWidgets\\FullSearchResultWidget' => __DIR__ .
'/includes/search/searchwidgets/FullSearchResultWidget.php',
+ 'MediaWiki\\SearchWidgets\\InterwikiSearchResultSetWidget' => __DIR__ .
'/includes/search/searchwidgets/InterwikiSearchResultSetWidget.php',
+ 'MediaWiki\\SearchWidgets\\InterwikiSearchResultWidget' => __DIR__ .
'/includes/search/searchwidgets/InterwikiSearchResultWidget.php',
+ 'MediaWiki\\SearchWidgets\\SearchFormWidget' => __DIR__ .
'/includes/search/searchwidgets/SearchFormWidget.php',
+ 'MediaWiki\\SearchWidgets\\SearchResultSetWidget' => __DIR__ .
'/includes/search/searchwidgets/SearchResultSetWidget.php',
+ 'MediaWiki\\SearchWidgets\\SearchResultWidget' => __DIR__ .
'/includes/search/searchwidgets/SearchResultWidget.php',
+ 'MediaWiki\\SearchWidgets\\SimpleSearchResultSetWidget' => __DIR__ .
'/includes/search/searchwidgets/SimpleSearchResultSetWidget.php',
+ 'MediaWiki\\SearchWidgets\\SimpleSearchResultWidget' => __DIR__ .
'/includes/search/searchwidgets/SimpleSearchResultWidget.php',
'MediaWiki\\Search\\ParserOutputSearchDataExtractor' => __DIR__ .
'/includes/search/ParserOutputSearchDataExtractor.php',
'MediaWiki\\Services\\CannotReplaceActiveServiceException' => __DIR__ .
'/includes/services/CannotReplaceActiveServiceException.php',
'MediaWiki\\Services\\ContainerDisabledException' => __DIR__ .
'/includes/services/ContainerDisabledException.php',
@@ -924,25 +934,15 @@
'MediaWiki\\Tidy\\RemexDriver' => __DIR__ .
'/includes/tidy/RemexDriver.php',
'MediaWiki\\Tidy\\RemexMungerData' => __DIR__ .
'/includes/tidy/RemexMungerData.php',
'MediaWiki\\Tidy\\TidyDriverBase' => __DIR__ .
'/includes/tidy/TidyDriverBase.php',
- 'MediaWiki\\Widget\\ComplexNamespaceInputWidget' => __DIR__ .
'/includes/widget/ComplexNamespaceInputWidget.php',
- 'MediaWiki\\Widget\\ComplexTitleInputWidget' => __DIR__ .
'/includes/widget/ComplexTitleInputWidget.php',
- 'MediaWiki\\Widget\\DateInputWidget' => __DIR__ .
'/includes/widget/DateInputWidget.php',
- 'MediaWiki\\Widget\\DateTimeInputWidget' => __DIR__ .
'/includes/widget/DateTimeInputWidget.php',
- 'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ .
'/includes/widget/NamespaceInputWidget.php',
- 'MediaWiki\\Widget\\SearchInputWidget' => __DIR__ .
'/includes/widget/SearchInputWidget.php',
- 'MediaWiki\\Widget\\Search\\BasicSearchResultSetWidget' => __DIR__ .
'/includes/widget/search/BasicSearchResultSetWidget.php',
- 'MediaWiki\\Widget\\Search\\DidYouMeanWidget' => __DIR__ .
'/includes/widget/search/DidYouMeanWidget.php',
- 'MediaWiki\\Widget\\Search\\FullSearchResultWidget' => __DIR__ .
'/includes/widget/search/FullSearchResultWidget.php',
- 'MediaWiki\\Widget\\Search\\InterwikiSearchResultSetWidget' => __DIR__
. '/includes/widget/search/InterwikiSearchResultSetWidget.php',
- 'MediaWiki\\Widget\\Search\\InterwikiSearchResultWidget' => __DIR__ .
'/includes/widget/search/InterwikiSearchResultWidget.php',
- 'MediaWiki\\Widget\\Search\\SearchFormWidget' => __DIR__ .
'/includes/widget/search/SearchFormWidget.php',
- 'MediaWiki\\Widget\\Search\\SearchResultSetWidget' => __DIR__ .
'/includes/widget/search/SearchResultSetWidget.php',
- 'MediaWiki\\Widget\\Search\\SearchResultWidget' => __DIR__ .
'/includes/widget/search/SearchResultWidget.php',
- 'MediaWiki\\Widget\\Search\\SimpleSearchResultSetWidget' => __DIR__ .
'/includes/widget/search/SimpleSearchResultSetWidget.php',
- 'MediaWiki\\Widget\\Search\\SimpleSearchResultWidget' => __DIR__ .
'/includes/widget/search/SimpleSearchResultWidget.php',
- 'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ .
'/includes/widget/TitleInputWidget.php',
- 'MediaWiki\\Widget\\UserInputWidget' => __DIR__ .
'/includes/widget/UserInputWidget.php',
- 'MediaWiki\\Widget\\UsersMultiselectWidget' => __DIR__ .
'/includes/widget/UsersMultiselectWidget.php',
+ 'MediaWiki\\Widgets\\ComplexNamespaceInputWidget' => __DIR__ .
'/includes/widgets/ComplexNamespaceInputWidget.php',
+ 'MediaWiki\\Widgets\\ComplexTitleInputWidget' => __DIR__ .
'/includes/widgets/ComplexTitleInputWidget.php',
+ 'MediaWiki\\Widgets\\DateInputWidget' => __DIR__ .
'/includes/widgets/DateInputWidget.php',
+ 'MediaWiki\\Widgets\\DateTimeInputWidget' => __DIR__ .
'/includes/widgets/DateTimeInputWidget.php',
+ 'MediaWiki\\Widgets\\NamespaceInputWidget' => __DIR__ .
'/includes/widgets/NamespaceInputWidget.php',
+ 'MediaWiki\\Widgets\\SearchInputWidget' => __DIR__ .
'/includes/widgets/SearchInputWidget.php',
+ 'MediaWiki\\Widgets\\TitleInputWidget' => __DIR__ .
'/includes/widgets/TitleInputWidget.php',
+ 'MediaWiki\\Widgets\\UserInputWidget' => __DIR__ .
'/includes/widgets/UserInputWidget.php',
+ 'MediaWiki\\Widgets\\UsersMultiselectWidget' => __DIR__ .
'/includes/widgets/UsersMultiselectWidget.php',
'MemCachedClientforWiki' => __DIR__ .
'/includes/compat/MemcachedClientCompat.php',
'MemcLockManager' => __DIR__ .
'/includes/libs/lockmanager/MemcLockManager.php',
'MemcachedBagOStuff' => __DIR__ .
'/includes/libs/objectcache/MemcachedBagOStuff.php',
diff --git a/includes/htmlform/fields/HTMLDateTimeField.php
b/includes/htmlform/fields/HTMLDateTimeField.php
index 7b59a1d..9fba75c 100644
--- a/includes/htmlform/fields/HTMLDateTimeField.php
+++ b/includes/htmlform/fields/HTMLDateTimeField.php
@@ -171,7 +171,7 @@
}
}
- return new MediaWiki\Widget\DateTimeInputWidget( $params );
+ return new MediaWiki\Widgets\DateTimeInputWidget( $params );
}
protected function getOOUIModules() {
diff --git a/includes/htmlform/fields/HTMLSelectNamespace.php
b/includes/htmlform/fields/HTMLSelectNamespace.php
index f13aa17..a58eb19 100644
--- a/includes/htmlform/fields/HTMLSelectNamespace.php
+++ b/includes/htmlform/fields/HTMLSelectNamespace.php
@@ -25,7 +25,7 @@
}
public function getInputOOUI( $value ) {
- return new MediaWiki\Widget\NamespaceInputWidget( [
+ return new MediaWiki\Widgets\NamespaceInputWidget( [
'value' => $value,
'name' => $this->mName,
'id' => $this->mID,
diff --git a/includes/htmlform/fields/HTMLTitleTextField.php
b/includes/htmlform/fields/HTMLTitleTextField.php
index 3eb3f5d..5218658 100644
--- a/includes/htmlform/fields/HTMLTitleTextField.php
+++ b/includes/htmlform/fields/HTMLTitleTextField.php
@@ -1,6 +1,6 @@
<?php
-use MediaWiki\Widget\TitleInputWidget;
+use MediaWiki\Widgets\TitleInputWidget;
/**
* Implements a text input field for page titles.
diff --git a/includes/htmlform/fields/HTMLUserTextField.php
b/includes/htmlform/fields/HTMLUserTextField.php
index 12c09c1..557bee5 100644
--- a/includes/htmlform/fields/HTMLUserTextField.php
+++ b/includes/htmlform/fields/HTMLUserTextField.php
@@ -1,6 +1,6 @@
<?php
-use MediaWiki\Widget\UserInputWidget;
+use MediaWiki\Widgets\UserInputWidget;
/**
* Implements a text input field for user names.
diff --git a/includes/htmlform/fields/HTMLUsersMultiselectField.php
b/includes/htmlform/fields/HTMLUsersMultiselectField.php
index 8c1241d..b197688 100644
--- a/includes/htmlform/fields/HTMLUsersMultiselectField.php
+++ b/includes/htmlform/fields/HTMLUsersMultiselectField.php
@@ -1,6 +1,6 @@
<?php
-use MediaWiki\Widget\UsersMultiselectWidget;
+use MediaWiki\Widgets\UsersMultiselectWidget;
/**
* Implements a capsule multiselect input field for user names.
diff --git a/includes/widget/search/BasicSearchResultSetWidget.php
b/includes/search/searchwidgets/BasicSearchResultSetWidget.php
similarity index 98%
rename from includes/widget/search/BasicSearchResultSetWidget.php
rename to includes/search/searchwidgets/BasicSearchResultSetWidget.php
index 07094af..5a24d83 100644
--- a/includes/widget/search/BasicSearchResultSetWidget.php
+++ b/includes/search/searchwidgets/BasicSearchResultSetWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use Message;
use SearchResultSet;
diff --git a/includes/widget/search/DidYouMeanWidget.php
b/includes/search/searchwidgets/DidYouMeanWidget.php
similarity index 98%
rename from includes/widget/search/DidYouMeanWidget.php
rename to includes/search/searchwidgets/DidYouMeanWidget.php
index 3aee87b..670c305 100644
--- a/includes/widget/search/DidYouMeanWidget.php
+++ b/includes/search/searchwidgets/DidYouMeanWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use Linker;
use SearchResultSet;
diff --git a/includes/widget/search/FullSearchResultWidget.php
b/includes/search/searchwidgets/FullSearchResultWidget.php
similarity index 99%
rename from includes/widget/search/FullSearchResultWidget.php
rename to includes/search/searchwidgets/FullSearchResultWidget.php
index 0d0fa12..c4c8de1 100644
--- a/includes/widget/search/FullSearchResultWidget.php
+++ b/includes/search/searchwidgets/FullSearchResultWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use Category;
use Hooks;
diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php
b/includes/search/searchwidgets/InterwikiSearchResultSetWidget.php
similarity index 98%
rename from includes/widget/search/InterwikiSearchResultSetWidget.php
rename to includes/search/searchwidgets/InterwikiSearchResultSetWidget.php
index 76b9b01..42527b6 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/search/searchwidgets/InterwikiSearchResultSetWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use MediaWiki\Interwiki\InterwikiLookup;
use MediaWiki\Linker\LinkRenderer;
diff --git a/includes/widget/search/InterwikiSearchResultWidget.php
b/includes/search/searchwidgets/InterwikiSearchResultWidget.php
similarity index 98%
rename from includes/widget/search/InterwikiSearchResultWidget.php
rename to includes/search/searchwidgets/InterwikiSearchResultWidget.php
index 6b51db5..45b5fd0 100644
--- a/includes/widget/search/InterwikiSearchResultWidget.php
+++ b/includes/search/searchwidgets/InterwikiSearchResultWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use HtmlArmor;
use MediaWiki\Linker\LinkRenderer;
diff --git a/includes/widget/search/SearchFormWidget.php
b/includes/search/searchwidgets/SearchFormWidget.php
similarity index 98%
rename from includes/widget/search/SearchFormWidget.php
rename to includes/search/searchwidgets/SearchFormWidget.php
index a7407a0..c7fc914 100644
--- a/includes/widget/search/SearchFormWidget.php
+++ b/includes/search/searchwidgets/SearchFormWidget.php
@@ -1,10 +1,10 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use Hooks;
use Html;
-use MediaWiki\Widget\SearchInputWidget;
+use MediaWiki\SearchWidgetsInputWidget;
use MWNamespace;
use SearchEngineConfig;
use SpecialSearch;
diff --git a/includes/widget/search/SearchResultSetWidget.php
b/includes/search/searchwidgets/SearchResultSetWidget.php
similarity index 90%
rename from includes/widget/search/SearchResultSetWidget.php
rename to includes/search/searchwidgets/SearchResultSetWidget.php
index 6df6e65..35fd5ec 100644
--- a/includes/widget/search/SearchResultSetWidget.php
+++ b/includes/search/searchwidgets/SearchResultSetWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use SearchResultSet;
diff --git a/includes/widget/search/SearchResultWidget.php
b/includes/search/searchwidgets/SearchResultWidget.php
similarity index 92%
rename from includes/widget/search/SearchResultWidget.php
rename to includes/search/searchwidgets/SearchResultWidget.php
index 3fbdbef..d8bce81 100644
--- a/includes/widget/search/SearchResultWidget.php
+++ b/includes/search/searchwidgets/SearchResultWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use SearchResult;
diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php
b/includes/search/searchwidgets/SimpleSearchResultSetWidget.php
similarity index 98%
rename from includes/widget/search/SimpleSearchResultSetWidget.php
rename to includes/search/searchwidgets/SimpleSearchResultSetWidget.php
index 04e1e21..6b1d8c0 100644
--- a/includes/widget/search/SimpleSearchResultSetWidget.php
+++ b/includes/search/searchwidgets/SimpleSearchResultSetWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use MediaWiki\Interwiki\InterwikiLookup;
use MediaWiki\Linker\LinkRenderer;
diff --git a/includes/widget/search/SimpleSearchResultWidget.php
b/includes/search/searchwidgets/SimpleSearchResultWidget.php
similarity index 97%
rename from includes/widget/search/SimpleSearchResultWidget.php
rename to includes/search/searchwidgets/SimpleSearchResultWidget.php
index 9fe816a..6661d7b 100644
--- a/includes/widget/search/SimpleSearchResultWidget.php
+++ b/includes/search/searchwidgets/SimpleSearchResultWidget.php
@@ -1,6 +1,6 @@
<?php
-namespace MediaWiki\Widget\Search;
+namespace MediaWiki\SearchWidgets;
use HtmlArmor;
use MediaWiki\Linker\LinkRenderer;
diff --git a/includes/specials/SpecialMovepage.php
b/includes/specials/SpecialMovepage.php
index 7d8a493..75a053e 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -303,7 +303,7 @@
$fields = [];
$fields[] = new OOUI\FieldLayout(
- new MediaWiki\Widget\ComplexTitleInputWidget( [
+ new MediaWiki\Widgets\ComplexTitleInputWidget( [
'id' => 'wpNewTitle',
'namespace' => [
'id' => 'wpNewTitleNs',
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index b7356e7..aade569 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -24,12 +24,12 @@
*/
use MediaWiki\MediaWikiServices;
-use MediaWiki\Widget\Search\BasicSearchResultSetWidget;
-use MediaWiki\Widget\Search\FullSearchResultWidget;
-use MediaWiki\Widget\Search\InterwikiSearchResultWidget;
-use MediaWiki\Widget\Search\InterwikiSearchResultSetWidget;
-use MediaWiki\Widget\Search\SimpleSearchResultWidget;
-use MediaWiki\Widget\Search\SimpleSearchResultSetWidget;
+use MediaWiki\SearchWidgets\BasicSearchResultSetWidget;
+use MediaWiki\SearchWidgets\FullSearchResultWidget;
+use MediaWiki\SearchWidgets\InterwikiSearchResultWidget;
+use MediaWiki\SearchWidgets\InterwikiSearchResultSetWidget;
+use MediaWiki\SearchWidgets\SimpleSearchResultWidget;
+use MediaWiki\SearchWidgets\SimpleSearchResultSetWidget;
/**
* implements Special:Search - Run text & title search and display the output
@@ -267,7 +267,7 @@
}
$out = $this->getOutput();
- $formWidget = new MediaWiki\Widget\Search\SearchFormWidget(
+ $formWidget = new MediaWiki\SearchWidgets\SearchFormWidget(
$this,
$this->searchConfig,
$this->getSearchProfiles()
@@ -342,7 +342,7 @@
// did you mean... suggestions
if ( $textMatches ) {
- $dymWidget = new
MediaWiki\Widget\Search\DidYouMeanWidget( $this );
+ $dymWidget = new
MediaWiki\SearchWidgets\DidYouMeanWidget( $this );
$out->addHTML( $dymWidget->render( $term, $textMatches
) );
}
diff --git a/includes/widget/AUTHORS.txt b/includes/widgets/AUTHORS.txt
similarity index 100%
rename from includes/widget/AUTHORS.txt
rename to includes/widgets/AUTHORS.txt
diff --git a/includes/widget/ComplexNamespaceInputWidget.php
b/includes/widgets/ComplexNamespaceInputWidget.php
similarity index 98%
rename from includes/widget/ComplexNamespaceInputWidget.php
rename to includes/widgets/ComplexNamespaceInputWidget.php
index d3ada03..c678f42 100644
--- a/includes/widget/ComplexNamespaceInputWidget.php
+++ b/includes/widgets/ComplexNamespaceInputWidget.php
@@ -5,7 +5,7 @@
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
/**
* Namespace input widget. Displays a dropdown box with the choice of
available namespaces, plus two
diff --git a/includes/widget/ComplexTitleInputWidget.php
b/includes/widgets/ComplexTitleInputWidget.php
similarity index 98%
rename from includes/widget/ComplexTitleInputWidget.php
rename to includes/widgets/ComplexTitleInputWidget.php
index a9e8042..7d2f6f3 100644
--- a/includes/widget/ComplexTitleInputWidget.php
+++ b/includes/widgets/ComplexTitleInputWidget.php
@@ -5,7 +5,7 @@
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
/**
* Complex title input widget.
diff --git a/includes/widget/DateInputWidget.php
b/includes/widgets/DateInputWidget.php
similarity index 99%
rename from includes/widget/DateInputWidget.php
rename to includes/widgets/DateInputWidget.php
index 507dab6..2b5fd36 100644
--- a/includes/widget/DateInputWidget.php
+++ b/includes/widgets/DateInputWidget.php
@@ -6,7 +6,7 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
use DateTime;
diff --git a/includes/widget/DateTimeInputWidget.php
b/includes/widgets/DateTimeInputWidget.php
similarity index 98%
rename from includes/widget/DateTimeInputWidget.php
rename to includes/widgets/DateTimeInputWidget.php
index f0d5cdb..0b25169 100644
--- a/includes/widget/DateTimeInputWidget.php
+++ b/includes/widgets/DateTimeInputWidget.php
@@ -5,7 +5,7 @@
* @copyright 2016 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
use OOUI\Tag;
diff --git a/includes/widget/LICENSE.txt b/includes/widgets/LICENSE.txt
similarity index 100%
rename from includes/widget/LICENSE.txt
rename to includes/widgets/LICENSE.txt
diff --git a/includes/widget/NamespaceInputWidget.php
b/includes/widgets/NamespaceInputWidget.php
similarity index 98%
rename from includes/widget/NamespaceInputWidget.php
rename to includes/widgets/NamespaceInputWidget.php
index 3e86738..7a0e76d 100644
--- a/includes/widget/NamespaceInputWidget.php
+++ b/includes/widgets/NamespaceInputWidget.php
@@ -5,7 +5,7 @@
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
/**
* Namespace input widget. Displays a dropdown box with the choice of
available namespaces.
diff --git a/includes/widgets/README.txt b/includes/widgets/README.txt
new file mode 100644
index 0000000..cea0ef9
--- /dev/null
+++ b/includes/widgets/README.txt
@@ -0,0 +1 @@
+This directory is for the PHP halves of OOUI-based widgets, licensed under MIT.
diff --git a/includes/widget/SearchInputWidget.php
b/includes/widgets/SearchInputWidget.php
similarity index 98%
rename from includes/widget/SearchInputWidget.php
rename to includes/widgets/SearchInputWidget.php
index 0d71629..f13d887 100644
--- a/includes/widget/SearchInputWidget.php
+++ b/includes/widgets/SearchInputWidget.php
@@ -5,7 +5,7 @@
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
/**
* Search input widget.
diff --git a/includes/widget/TitleInputWidget.php
b/includes/widgets/TitleInputWidget.php
similarity index 98%
rename from includes/widget/TitleInputWidget.php
rename to includes/widgets/TitleInputWidget.php
index da2e94b..a0883c7 100644
--- a/includes/widget/TitleInputWidget.php
+++ b/includes/widgets/TitleInputWidget.php
@@ -5,7 +5,7 @@
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
/**
* Title input widget.
diff --git a/includes/widget/UserInputWidget.php
b/includes/widgets/UserInputWidget.php
similarity index 95%
rename from includes/widget/UserInputWidget.php
rename to includes/widgets/UserInputWidget.php
index d591ad1..c8015f1 100644
--- a/includes/widget/UserInputWidget.php
+++ b/includes/widgets/UserInputWidget.php
@@ -5,7 +5,7 @@
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
/**
* User input widget.
diff --git a/includes/widget/UsersMultiselectWidget.php
b/includes/widgets/UsersMultiselectWidget.php
similarity index 98%
rename from includes/widget/UsersMultiselectWidget.php
rename to includes/widgets/UsersMultiselectWidget.php
index d24ab7b..2dbc936 100644
--- a/includes/widget/UsersMultiselectWidget.php
+++ b/includes/widgets/UsersMultiselectWidget.php
@@ -5,7 +5,7 @@
* @copyright 2017 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-namespace MediaWiki\Widget;
+namespace MediaWiki\Widgets;
use \OOUI\TextInputWidget;
--
To view, visit https://gerrit.wikimedia.org/r/342282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16d21dd5e1ac3aa9893863df272d1bbb4788066f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
