Mwjames has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74179
Change subject: Move some files into utilities folder
......................................................................
Move some files into utilities folder
Change-Id: I8841a919548ff76a05912216d640088ecd83c39c
---
M includes/Setup.php
R includes/utilities/ArrayAccessor.php
R includes/utilities/HashIdGenerator.php
R includes/utilities/MessageReporter.php
R includes/utilities/NamespaceExaminer.php
R includes/utilities/Profiler.php
M includes/utilities/RedirectBuilder.php
R tests/phpunit/includes/utilities/ArrayAccessorTest.php
R tests/phpunit/includes/utilities/HashIdGeneratorTest.php
R tests/phpunit/includes/utilities/ObservableMessageReporterTest.php
R tests/phpunit/includes/utilities/ProfilerTest.php
M tests/phpunit/includes/utilities/RedirectBuilderTest.php
12 files changed, 27 insertions(+), 17 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/79/74179/1
diff --git a/includes/Setup.php b/includes/Setup.php
index 2259b15..1ffc18f 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -127,8 +127,6 @@
$wgAutoloadClasses['SMW\FormatFactory'] = $incDir .
'FormatFactory.php';
$wgAutoloadClasses['SMW\Highlighter'] = $incDir .
'Highlighter.php';
$wgAutoloadClasses['SMW\ParameterInput'] = $incDir .
'ParameterInput.php';
- $wgAutoloadClasses['SMW\MessageReporter'] = $incDir .
'MessageReporter.php';
- $wgAutoloadClasses['SMW\ObservableMessageReporter'] = $incDir .
'MessageReporter.php';
$wgAutoloadClasses['SMWFactbox'] = $incDir .
'Factbox.php';
$wgAutoloadClasses['SMWInfolink'] = $incDir .
'SMW_Infolink.php';
$wgAutoloadClasses['SMWOutputs'] = $incDir .
'SMW_Outputs.php';
@@ -149,21 +147,21 @@
$wgAutoloadClasses['SMW\Settings'] = $incDir .
'Settings.php';
- $wgAutoloadClasses['SMW\Accessor'] = $incDir .
'ArrayAccessor.php';
- $wgAutoloadClasses['SMW\Arrayable'] = $incDir .
'ArrayAccessor.php';
- $wgAutoloadClasses['SMW\ArrayAccessor'] = $incDir .
'ArrayAccessor.php';
-
$wgAutoloadClasses['SMW\CacheHandler'] = $incDir .
'/cache/CacheHandler.php';
$wgAutoloadClasses['SMW\ResultCacheMapper'] = $incDir .
'/cache/ResultCacheMapper.php';
$wgAutoloadClasses['SMW\CacheIdGenerator'] = $incDir .
'/cache/CacheIdGenerator.php';
// Utilities
- $wgAutoloadClasses['SMW\NamespaceExaminer'] = $incDir .
'NamespaceExaminer.php';
- $wgAutoloadClasses['SMW\Profiler'] = $incDir .
'Profiler.php';
- $wgAutoloadClasses['SMW\IdGenerator'] = $incDir .
'HashIdGenerator.php';
- $wgAutoloadClasses['SMW\HashIdGenerator'] = $incDir .
'HashIdGenerator.php';
-
- $wgAutoloadClasses['SMW\RedirectBuilder'] = $incDir .
'/utilities/RedirectBuilder.php';
+ $wgAutoloadClasses['SMW\NamespaceExaminer'] = $incDir .
'/utilities/NamespaceExaminer.php';
+ $wgAutoloadClasses['SMW\Profiler'] = $incDir .
'/utilities/Profiler.php';
+ $wgAutoloadClasses['SMW\IdGenerator'] = $incDir .
'/utilities/HashIdGenerator.php';
+ $wgAutoloadClasses['SMW\HashIdGenerator'] = $incDir .
'/utilities/HashIdGenerator.php';
+ $wgAutoloadClasses['SMW\Accessor'] = $incDir .
'/utilities/ArrayAccessor.php';
+ $wgAutoloadClasses['SMW\Arrayable'] = $incDir .
'/utilities/ArrayAccessor.php';
+ $wgAutoloadClasses['SMW\ArrayAccessor'] = $incDir .
'/utilities/ArrayAccessor.php';
+ $wgAutoloadClasses['SMW\MessageReporter'] = $incDir .
'/utilities/MessageReporter.php';
+ $wgAutoloadClasses['SMW\ObservableMessageReporter'] = $incDir .
'/utilities/MessageReporter.php';
+ $wgAutoloadClasses['SMW\RedirectBuilder'] = $incDir .
'/utilities/RedirectBuilder.php';
// Formatters
$wgAutoloadClasses['SMW\ArrayFormatter'] = $incDir .
'formatters/ArrayFormatter.php';
diff --git a/includes/ArrayAccessor.php b/includes/utilities/ArrayAccessor.php
similarity index 100%
rename from includes/ArrayAccessor.php
rename to includes/utilities/ArrayAccessor.php
diff --git a/includes/HashIdGenerator.php
b/includes/utilities/HashIdGenerator.php
similarity index 100%
rename from includes/HashIdGenerator.php
rename to includes/utilities/HashIdGenerator.php
diff --git a/includes/MessageReporter.php
b/includes/utilities/MessageReporter.php
similarity index 100%
rename from includes/MessageReporter.php
rename to includes/utilities/MessageReporter.php
diff --git a/includes/NamespaceExaminer.php
b/includes/utilities/NamespaceExaminer.php
similarity index 100%
rename from includes/NamespaceExaminer.php
rename to includes/utilities/NamespaceExaminer.php
diff --git a/includes/Profiler.php b/includes/utilities/Profiler.php
similarity index 100%
rename from includes/Profiler.php
rename to includes/utilities/Profiler.php
diff --git a/includes/utilities/RedirectBuilder.php
b/includes/utilities/RedirectBuilder.php
index 9637b39..4dcfc6b 100644
--- a/includes/utilities/RedirectBuilder.php
+++ b/includes/utilities/RedirectBuilder.php
@@ -64,7 +64,9 @@
*
* @since 1.9
*
- * @return string|null
+ * @param boolean $canBuild
+ *
+ * @return RedirectBuilder
*/
public function canBuild( $canBuild = true ) {
$this->canBuild = $canBuild;
@@ -91,15 +93,15 @@
$argument = func_get_arg( 0 );
- if ( is_string( $argument ) ) {
+ if ( $this->canBuild && is_string( $argument ) ) {
$title = $this->buildFromText( $argument );
- } else if ( $argument instanceof Title ) {
+ } else if ( $this->canBuild && $argument instanceof Title ) {
$title = $argument;
} else {
$title = null;
}
- if ( $this->canBuild && $title !== null ) {
+ if ( $title !== null ) {
$this->semanticData->addPropertyObjectValue( new
DIProperty( '_REDI' ), DIWikiPage::newFromTitle( $title, '__red' ) );
}
@@ -109,6 +111,8 @@
* Extract a redirect destination from a string and return the Title,
* or null if the text doesn't contain a valid redirect
*
+ * @note ContentHandler got introduced with Mw 1.21
+ *
* @since 1.9
*
* @param string $text
diff --git a/tests/phpunit/includes/ArrayAccessorTest.php
b/tests/phpunit/includes/utilities/ArrayAccessorTest.php
similarity index 100%
rename from tests/phpunit/includes/ArrayAccessorTest.php
rename to tests/phpunit/includes/utilities/ArrayAccessorTest.php
diff --git a/tests/phpunit/includes/HashIdGeneratorTest.php
b/tests/phpunit/includes/utilities/HashIdGeneratorTest.php
similarity index 100%
rename from tests/phpunit/includes/HashIdGeneratorTest.php
rename to tests/phpunit/includes/utilities/HashIdGeneratorTest.php
diff --git a/tests/phpunit/includes/ObservableMessageReporterTest.php
b/tests/phpunit/includes/utilities/ObservableMessageReporterTest.php
similarity index 100%
rename from tests/phpunit/includes/ObservableMessageReporterTest.php
rename to tests/phpunit/includes/utilities/ObservableMessageReporterTest.php
diff --git a/tests/phpunit/includes/ProfilerTest.php
b/tests/phpunit/includes/utilities/ProfilerTest.php
similarity index 100%
rename from tests/phpunit/includes/ProfilerTest.php
rename to tests/phpunit/includes/utilities/ProfilerTest.php
diff --git a/tests/phpunit/includes/utilities/RedirectBuilderTest.php
b/tests/phpunit/includes/utilities/RedirectBuilderTest.php
index 2869716..9c93cb5 100644
--- a/tests/phpunit/includes/utilities/RedirectBuilderTest.php
+++ b/tests/phpunit/includes/utilities/RedirectBuilderTest.php
@@ -141,7 +141,7 @@
)
);
- // #4 Disabled
+ // #4 Disabled free text
$provider[] = array(
array( 'build' => '#REDIRECT [[:Lala]]', 'canBuild' =>
false ),
array(
@@ -157,6 +157,14 @@
)
);
+ // #6 Empty
+ $provider[] = array(
+ array( 'build' => '', 'canBuild' => true ),
+ array(
+ 'propertyCount' => 0,
+ )
+ );
+
return $provider;
}
--
To view, visit https://gerrit.wikimedia.org/r/74179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8841a919548ff76a05912216d640088ecd83c39c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
