jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Get rid of unnecessary fully qualified namespaced
classnames
......................................................................
Hygiene: Get rid of unnecessary fully qualified namespaced classnames
Change-Id: Ibf16661b1cfff9622158080b91359d88a940b67c
---
M includes/Block/TopicSummary.php
M includes/Data/RecentChanges.php
M includes/api/ApiFlowBasePost.php
M tests/FormatterTest.php
M tests/HookTest.php
M tests/ReferenceExtractorTest.php
M tests/TreeRepositoryTest.php
M tests/WorkflowLoaderTest.php
8 files changed, 18 insertions(+), 9 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block/TopicSummary.php b/includes/Block/TopicSummary.php
index cc79b52..d98d28f 100644
--- a/includes/Block/TopicSummary.php
+++ b/includes/Block/TopicSummary.php
@@ -213,7 +213,7 @@
$this->storage->put( $this->nextRevision );
// Reload the $this->formatterRow for renderAPI() after save
- $this->formatterRow = new \Flow\Formatter\FormatterRow();
+ $this->formatterRow = new FormatterRow();
$this->formatterRow->revision = $this->nextRevision;
$this->formatterRow->previousRevision = $this->topicSummary;
$this->formatterRow->currentRevision = $this->nextRevision;
diff --git a/includes/Data/RecentChanges.php b/includes/Data/RecentChanges.php
index e221af6..08e5184 100644
--- a/includes/Data/RecentChanges.php
+++ b/includes/Data/RecentChanges.php
@@ -2,6 +2,7 @@
namespace Flow\Data;
+use Flow\Container;
use Flow\FlowActions;
use Flow\Model\AbstractRevision;
use Flow\Model\Workflow;
@@ -118,7 +119,7 @@
// Override the IRC formatter with our own formatter
foreach ( array_keys( $feeds ) as $name ) {
$feeds[$name]['original_formatter'] =
$feeds[$name]['formatter'];
- $feeds[$name]['formatter'] = \Flow\Container::get(
'formatter.irclineurl' );
+ $feeds[$name]['formatter'] = Container::get(
'formatter.irclineurl' );
}
$rc->notifyRCFeeds( $feeds );
}
diff --git a/includes/api/ApiFlowBasePost.php b/includes/api/ApiFlowBasePost.php
index 001dddd..bed11c8 100644
--- a/includes/api/ApiFlowBasePost.php
+++ b/includes/api/ApiFlowBasePost.php
@@ -2,6 +2,7 @@
use Flow\Anchor;
use Flow\Block\AbstractBlock;
+use Flow\Container;
abstract class ApiFlowBasePost extends ApiFlowBase {
public function execute() {
@@ -50,7 +51,7 @@
// @Todo - hacky, maybe have contentformat in
the request to overwrite
// requiredWikitext
$block->unsetRequiresWikitext( $action );
- $output[$action]['result'][$block->getName()] =
$block->renderAPI( \Flow\Container::get( 'templating' ),
$parameters[$block->getName()] );
+ $output[$action]['result'][$block->getName()] =
$block->renderAPI( Container::get( 'templating' ),
$parameters[$block->getName()] );
}
// required until php5.4 which has the JsonSerializable
interface
diff --git a/tests/FormatterTest.php b/tests/FormatterTest.php
index f98a6ae..1144444 100644
--- a/tests/FormatterTest.php
+++ b/tests/FormatterTest.php
@@ -4,6 +4,7 @@
use Flow\Container;
use Flow\Formatter\FormatterRow;
+use Flow\Formatter\RevisionFormatter;
use Flow\Model\UUID;
use Title;
use Flow\UrlGenerator;
@@ -134,7 +135,8 @@
->disableOriginalConstructor()
->getMock();
- $serializer = new \Flow\Formatter\RevisionFormatter(
$permissions, $templating, $usernames );
+ global $wgFlowMaxThreadingDepth;
+ $serializer = new RevisionFormatter( $permissions, $templating,
$usernames, $wgFlowMaxThreadingDepth );
return new $class( $permissions, $serializer );
}
diff --git a/tests/HookTest.php b/tests/HookTest.php
index 4d88f69..00e1d15 100644
--- a/tests/HookTest.php
+++ b/tests/HookTest.php
@@ -2,6 +2,7 @@
namespace Flow\Tests;
+use Flow\Data\RecentChanges;
use FlowHooks;
use RecentChange;
@@ -114,7 +115,7 @@
$rc->mAttribs = array(
'rc_namespace' => 0,
'rc_title' => 'Main Page',
- 'rc_source' => \Flow\Data\RecentChanges::SRC_FLOW,
+ 'rc_source' => RecentChanges::SRC_FLOW,
'rc_params' => serialize( array(
'flow-workflow-change' => $change
) ),
diff --git a/tests/ReferenceExtractorTest.php b/tests/ReferenceExtractorTest.php
index 04c35d7..5f9a37c 100644
--- a/tests/ReferenceExtractorTest.php
+++ b/tests/ReferenceExtractorTest.php
@@ -4,6 +4,7 @@
use MediaWikiTestCase;
use Flow\Exception\WikitextException;
+use Flow\Parsoid\Utils;
use Title;
/**
@@ -16,7 +17,7 @@
// Check for Parsoid
try {
- \Flow\Parsoid\Utils::convert( 'html', 'wikitext',
'Foo', Title::newFromText( 'UTPage' ) );
+ Utils::convert( 'html', 'wikitext', 'Foo',
Title::newFromText( 'UTPage' ) );
} catch ( WikitextException $excep ) {
$this->markTestSkipped( 'Parsoid not enabled' );
}
@@ -111,7 +112,7 @@
public function testReferenceExtractor( $description, $wikitext,
$expectedOutput, $page = 'UTPage' ) {
$referenceExtractor = Container::get( 'reference.extractor' );
- $html = \Flow\Parsoid\Utils::convert( 'wt', 'html', $wikitext,
Title::newFromText( $page ) );
+ $html = Utils::convert( 'wt', 'html', $wikitext,
Title::newFromText( $page ) );
$references = $referenceExtractor->extractReferences( $html );
diff --git a/tests/TreeRepositoryTest.php b/tests/TreeRepositoryTest.php
index 3bdfee1..16500c2 100644
--- a/tests/TreeRepositoryTest.php
+++ b/tests/TreeRepositoryTest.php
@@ -3,6 +3,7 @@
namespace Flow\Tests;
use Flow\Model\UUID;
+use Flow\Repository\TreeRepository;
use ReflectionClass;
/**
@@ -21,7 +22,7 @@
public function testSuccessfulInsert() {
$cache = new \HashBagOStuff();
- $treeRepository = new \Flow\Repository\TreeRepository(
$this->mockDbFactory( true ), $cache );
+ $treeRepository = new TreeRepository( $this->mockDbFactory(
true ), $cache );
$this->assertTrue( $treeRepository->insert( $this->descendant,
$this->ancestor ) );
$reflection = new ReflectionClass(
'\Flow\Repository\TreeRepository' );
@@ -41,7 +42,7 @@
// otherwise the exception would skip the cache result test
$cache = new \HashBagOStuff();
try {
- $treeRepository = new \Flow\Repository\TreeRepository(
$this->mockDbFactory( false ), $cache );
+ $treeRepository = new TreeRepository(
$this->mockDbFactory( false ), $cache );
$this->assertNull( $treeRepository->insert(
$this->descendant, $this->ancestor ) );
} catch ( \Exception $e ) {
$reflection = new ReflectionClass(
'\Flow\Repository\TreeRepository' );
diff --git a/tests/WorkflowLoaderTest.php b/tests/WorkflowLoaderTest.php
index f561f26..78af8df 100644
--- a/tests/WorkflowLoaderTest.php
+++ b/tests/WorkflowLoaderTest.php
@@ -44,6 +44,8 @@
/**
* Create a WorkflowLoader mock object since we don't want any query
* against the database
+ *
+ * @return \Flow\WorkflowLoader
*/
protected function mockWorkflowLoader( $type ) {
$definition = $this->getMockBuilder( '\Flow\Model\Definition' )
--
To view, visit https://gerrit.wikimedia.org/r/140969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf16661b1cfff9622158080b91359d88a940b67c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
