Thiemo Kreuz (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399379 )
Change subject: Remove repetitions of the extensions name from directories &
classes
......................................................................
Remove repetitions of the extensions name from directories & classes
* Rename the \PropertySuggester\PropertySuggesterHooks class to
\PropertySuggester\Hooks. This is a widely used naming scheme.
* Remove the redundant (and otherwise empty) directory that does
nothing but repeating the "PropertySuggester\" namespace.
This is a direct follow up for what was done in I81e9997 (I don't say
anything was missed – having these changes in separate patches is
actually good).
Bug: T183260
Change-Id: Iad4dc4f508fc127231adc5348f8f54aaac00e4c6
---
M extension.json
R src/GetSuggestions.php
R src/Hooks.php
R src/ResultBuilder.php
R src/SuggesterParams.php
R src/SuggesterParamsParser.php
R src/Suggesters/SimpleSuggester.php
R src/Suggesters/SuggesterEngine.php
R src/Suggesters/Suggestion.php
R src/SuggestionGenerator.php
R src/UpdateTable/ImportContext.php
R src/UpdateTable/Importer/BasicImporter.php
R src/UpdateTable/Importer/Importer.php
R tests/phpunit/PropertySuggester/HooksTest.php
14 files changed, 8 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PropertySuggester
refs/changes/79/399379/1
diff --git a/extension.json b/extension.json
index 65b63cd..71d115f 100644
--- a/extension.json
+++ b/extension.json
@@ -15,7 +15,7 @@
"MediaWiki": ">= 1.31.0"
},
"AutoloadNamespaces": {
- "PropertySuggester\\": "src/PropertySuggester/",
+ "PropertySuggester\\": "src/",
"PropertySuggester\\Maintenance\\": "maintenance/"
},
"APIModules": {
@@ -47,8 +47,8 @@
"remoteExtPath": "PropertySuggester"
},
"Hooks": {
- "BeforePageDisplay":
"PropertySuggester\\PropertySuggesterHooks::onBeforePageDisplay",
- "LoadExtensionSchemaUpdates":
"PropertySuggester\\PropertySuggesterHooks::onCreateSchema"
+ "BeforePageDisplay":
"PropertySuggester\\Hooks::onBeforePageDisplay",
+ "LoadExtensionSchemaUpdates":
"PropertySuggester\\Hooks::onCreateSchema"
},
"config": {
"PropertySuggesterDeprecatedIds": [],
diff --git a/src/PropertySuggester/GetSuggestions.php b/src/GetSuggestions.php
similarity index 100%
rename from src/PropertySuggester/GetSuggestions.php
rename to src/GetSuggestions.php
diff --git a/src/PropertySuggester/PropertySuggesterHooks.php b/src/Hooks.php
similarity index 96%
rename from src/PropertySuggester/PropertySuggesterHooks.php
rename to src/Hooks.php
index e6646a8..0d1665e 100644
--- a/src/PropertySuggester/PropertySuggesterHooks.php
+++ b/src/Hooks.php
@@ -12,7 +12,7 @@
* @author BP2013N2
* @license GNU GPL v2+
*/
-final class PropertySuggesterHooks {
+final class Hooks {
/**
* Handler for the BeforePageDisplay hook, injects special behaviour
diff --git a/src/PropertySuggester/ResultBuilder.php b/src/ResultBuilder.php
similarity index 100%
rename from src/PropertySuggester/ResultBuilder.php
rename to src/ResultBuilder.php
diff --git a/src/PropertySuggester/SuggesterParams.php b/src/SuggesterParams.php
similarity index 100%
rename from src/PropertySuggester/SuggesterParams.php
rename to src/SuggesterParams.php
diff --git a/src/PropertySuggester/SuggesterParamsParser.php
b/src/SuggesterParamsParser.php
similarity index 100%
rename from src/PropertySuggester/SuggesterParamsParser.php
rename to src/SuggesterParamsParser.php
diff --git a/src/PropertySuggester/Suggesters/SimpleSuggester.php
b/src/Suggesters/SimpleSuggester.php
similarity index 100%
rename from src/PropertySuggester/Suggesters/SimpleSuggester.php
rename to src/Suggesters/SimpleSuggester.php
diff --git a/src/PropertySuggester/Suggesters/SuggesterEngine.php
b/src/Suggesters/SuggesterEngine.php
similarity index 100%
rename from src/PropertySuggester/Suggesters/SuggesterEngine.php
rename to src/Suggesters/SuggesterEngine.php
diff --git a/src/PropertySuggester/Suggesters/Suggestion.php
b/src/Suggesters/Suggestion.php
similarity index 100%
rename from src/PropertySuggester/Suggesters/Suggestion.php
rename to src/Suggesters/Suggestion.php
diff --git a/src/PropertySuggester/SuggestionGenerator.php
b/src/SuggestionGenerator.php
similarity index 100%
rename from src/PropertySuggester/SuggestionGenerator.php
rename to src/SuggestionGenerator.php
diff --git a/src/PropertySuggester/UpdateTable/ImportContext.php
b/src/UpdateTable/ImportContext.php
similarity index 100%
rename from src/PropertySuggester/UpdateTable/ImportContext.php
rename to src/UpdateTable/ImportContext.php
diff --git a/src/PropertySuggester/UpdateTable/Importer/BasicImporter.php
b/src/UpdateTable/Importer/BasicImporter.php
similarity index 100%
rename from src/PropertySuggester/UpdateTable/Importer/BasicImporter.php
rename to src/UpdateTable/Importer/BasicImporter.php
diff --git a/src/PropertySuggester/UpdateTable/Importer/Importer.php
b/src/UpdateTable/Importer/Importer.php
similarity index 100%
rename from src/PropertySuggester/UpdateTable/Importer/Importer.php
rename to src/UpdateTable/Importer/Importer.php
diff --git a/tests/phpunit/PropertySuggester/PropertySuggesterHooksTest.php
b/tests/phpunit/PropertySuggester/HooksTest.php
similarity index 86%
rename from tests/phpunit/PropertySuggester/PropertySuggesterHooksTest.php
rename to tests/phpunit/PropertySuggester/HooksTest.php
index 0307bdf..161d01e 100644
--- a/tests/phpunit/PropertySuggester/PropertySuggesterHooksTest.php
+++ b/tests/phpunit/PropertySuggester/HooksTest.php
@@ -11,12 +11,12 @@
use Wikibase\Repo\WikibaseRepo;
/**
- * @covers \PropertySuggester\PropertySuggesterHooks
+ * @covers \PropertySuggester\Hooks
*
* @group PropertySuggester
* @group Wikibase
*/
-class PropertySuggesterHooksTest extends MediaWikiTestCase {
+class HooksTest extends MediaWikiTestCase {
public function testOnBeforePageDisplay_resourceLoaderModuleAdded() {
$title = $this->getTitleForId( new ItemId( 'Q1' ) );
@@ -25,7 +25,7 @@
$output = $context->getOutput();
$skin = $context->getSkin();
- PropertySuggesterHooks::onBeforePageDisplay( $output, $skin );
+ Hooks::onBeforePageDisplay( $output, $skin );
$this->assertContains( 'ext.PropertySuggester.EntitySelector',
$output->getModules() );
}
@@ -38,7 +38,7 @@
$output = $context->getOutput();
$skin = $context->getSkin();
- PropertySuggesterHooks::onBeforePageDisplay( $output, $skin );
+ Hooks::onBeforePageDisplay( $output, $skin );
$this->assertNotContains(
'ext.PropertySuggester.EntitySelector', $output->getModules() );
}
--
To view, visit https://gerrit.wikimedia.org/r/399379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad4dc4f508fc127231adc5348f8f54aaac00e4c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PropertySuggester
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
