Mwjames has submitted this change and it was merged.
Change subject: Move some more files to /include
......................................................................
Move some more files to /include
Change-Id: I774d696f86ee2eda6635174776bdb13f7b0f87bd
---
M SemanticMediaWiki.hooks.php
R includes/ParserParameterFormatter.php
R includes/RecurringEvents.php
M includes/Setup.php
R includes/Subobject.php
R tests/phpunit/includes/ParserParameterFormatterTest.php
R tests/phpunit/includes/RecurringEventsTest.php
R tests/phpunit/includes/SubobjectTest.php
8 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Mwjames: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SemanticMediaWiki.hooks.php b/SemanticMediaWiki.hooks.php
index f0d45a5..6a57b07 100644
--- a/SemanticMediaWiki.hooks.php
+++ b/SemanticMediaWiki.hooks.php
@@ -273,6 +273,9 @@
'ObservableMessageReporter',
'ParserData',
// 'QueryProcessor', old test
+ 'ParserParameterFormatter',
+ 'Subobject',
+ 'RecurringEvents',
'dataitems/DI_Blob',
'dataitems/DI_Bool',
@@ -283,10 +286,7 @@
'export/SMWExpElement',
- 'parserhooks/ParserParameterFormatter',
- 'parserhooks/Subobject',
'parserhooks/SubobjectParserFunction',
- 'parserhooks/RecurringEvents',
'parserhooks/RecurringEventsParserFunction',
'parserhooks/AskParserFunction',
'parserhooks/ShowParserFunction',
diff --git a/includes/parserhooks/ParserParameterFormatter.php
b/includes/ParserParameterFormatter.php
similarity index 100%
rename from includes/parserhooks/ParserParameterFormatter.php
rename to includes/ParserParameterFormatter.php
diff --git a/includes/parserhooks/RecurringEvents.php
b/includes/RecurringEvents.php
similarity index 100%
rename from includes/parserhooks/RecurringEvents.php
rename to includes/RecurringEvents.php
diff --git a/includes/Setup.php b/includes/Setup.php
index 3e71a40..666963c 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -133,6 +133,11 @@
$wgAutoloadClasses['SMW\IParserData'] = $incDir .
'ParserData.php';
$wgAutoloadClasses['SMW\ParserData'] = $incDir .
'ParserData.php';
+ $wgAutoloadClasses['SMW\Subobject'] = $incDir .
'Subobject.php';
+ $wgAutoloadClasses['SMW\RecurringEvents'] = $incDir .
'RecurringEvents.php';
+ $wgAutoloadClasses['SMW\IParameterFormatter'] = $incDir .
'ParserParameterFormatter.php';
+ $wgAutoloadClasses['SMW\ParserParameterFormatter'] = $incDir .
'ParserParameterFormatter.php';
+
// Article pages
$apDir = $smwgIP . 'includes/articlepages/';
$wgAutoloadClasses['SMWOrderedListPage'] = $apDir .
'SMW_OrderedListPage.php';
@@ -225,13 +230,9 @@
$wgAutoloadClasses['SMW\ConceptParserFunction'] = $phDir .
'ConceptParserFunction.php';
$wgAutoloadClasses['SMW\DeclareParserFunction'] = $phDir .
'DeclareParserFunction.php';
$wgAutoloadClasses['SMW\SetParserFunction'] = $phDir .
'SetParserFunction.php';
- $wgAutoloadClasses['SMW\Subobject'] = $phDir .
'Subobject.php';
- $wgAutoloadClasses['SMW\RecurringEvents'] = $phDir .
'RecurringEvents.php';
$wgAutoloadClasses['SMW\AskParserFunction'] = $phDir .
'AskParserFunction.php';
$wgAutoloadClasses['SMW\ShowParserFunction'] = $phDir .
'ShowParserFunction.php';
$wgAutoloadClasses['SMW\ConceptParserFunction'] = $phDir .
'ConceptParserFunction.php';
- $wgAutoloadClasses['SMW\IParameterFormatter'] = $phDir .
'ParserParameterFormatter.php';
- $wgAutoloadClasses['SMW\ParserParameterFormatter'] = $phDir .
'ParserParameterFormatter.php';
$wgAutoloadClasses['SMW\SubobjectParserFunction'] = $phDir .
'SubobjectParserFunction.php';
$wgAutoloadClasses['SMW\RecurringEventsParserFunction'] = $phDir .
'RecurringEventsParserFunction.php';
$wgAutoloadClasses['SMW\DocumentationParserFunction'] = $phDir .
'DocumentationParserFunction.php';
diff --git a/includes/parserhooks/Subobject.php b/includes/Subobject.php
similarity index 100%
rename from includes/parserhooks/Subobject.php
rename to includes/Subobject.php
diff --git
a/tests/phpunit/includes/parserhooks/ParserParameterFormatterTest.php
b/tests/phpunit/includes/ParserParameterFormatterTest.php
similarity index 100%
rename from tests/phpunit/includes/parserhooks/ParserParameterFormatterTest.php
rename to tests/phpunit/includes/ParserParameterFormatterTest.php
diff --git a/tests/phpunit/includes/parserhooks/RecurringEventsTest.php
b/tests/phpunit/includes/RecurringEventsTest.php
similarity index 100%
rename from tests/phpunit/includes/parserhooks/RecurringEventsTest.php
rename to tests/phpunit/includes/RecurringEventsTest.php
diff --git a/tests/phpunit/includes/parserhooks/SubobjectTest.php
b/tests/phpunit/includes/SubobjectTest.php
similarity index 100%
rename from tests/phpunit/includes/parserhooks/SubobjectTest.php
rename to tests/phpunit/includes/SubobjectTest.php
--
To view, visit https://gerrit.wikimedia.org/r/57445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I774d696f86ee2eda6635174776bdb13f7b0f87bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>
Gerrit-Reviewer: Mwjames <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
