jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Use factory closures instead of Action classes
......................................................................
Hygiene: Use factory closures instead of Action classes
When this was first written the only option was specific classes,
but since then the wikidata team have updated the Action handling
to accept closures. This patch removes the redundant classes that
only specify the explicit action name and replaces them with
Closures.
Change-Id: I0c9d96cee594975b32c9c22cf145e0f3c3749f7c
---
M FlowActions.php
M autoload.php
D includes/Actions/ActionTemplate.php.template
D includes/Actions/CompareHeaderRevisionsAction.php
D includes/Actions/ComparePostRevisionsAction.php
D includes/Actions/ComparePostSummaryRevisionsAction.php
D includes/Actions/CreateTopicSummaryAction.php
D includes/Actions/EditHeaderAction.php
D includes/Actions/EditPostAction.php
D includes/Actions/EditTitleAction.php
D includes/Actions/EditTopicSummaryAction.php
D includes/Actions/HistoryAction.php
D includes/Actions/LockTopicAction.php
D includes/Actions/ModeratePostAction.php
D includes/Actions/ModerateTopicAction.php
D includes/Actions/NewTopicAction.php
D includes/Actions/PostSingleViewAction.php
D includes/Actions/ReplyAction.php
D includes/Actions/RestorePostAction.php
D includes/Actions/RestoreTopicAction.php
D includes/Actions/UndoEditHeaderAction.php
D includes/Actions/UndoEditPostAction.php
D includes/Actions/UndoEditTopicSummaryAction.php
D includes/Actions/ViewHeaderAction.php
D includes/Actions/ViewTopicSummaryAction.php
M includes/Content/BoardContentHandler.php
26 files changed, 37 insertions(+), 330 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FlowActions.php b/FlowActions.php
index 93e6d5e..3e5e5bb 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -76,7 +76,7 @@
),
'class' => 'flow-history-edit-header',
),
- 'handler-class' => 'Flow\Actions\EditHeaderAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'editcount' => true,
),
@@ -99,7 +99,7 @@
),
'class' => 'flow-history-edit-header',
),
- 'handler-class' => 'Flow\Actions\UndoEditHeaderAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'editcount' => true,
// theis modules/moduleStyles is repeated in all the undo-*
actions. Find a way to share.
'modules' => array( 'ext.flow.undo' ),
@@ -159,7 +159,7 @@
),
'class' => 'flow-history-edit-topic-summary',
),
- 'handler-class' => 'Flow\Actions\EditTopicSummaryAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'editcount' => true,
),
@@ -187,7 +187,7 @@
),
'class' => 'flow-history-edit-topic-summary',
),
- 'handler-class' => 'Flow\Actions\UndoEditTopicSummaryAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'editcount' => true,
'modules' => array( 'ext.flow.undo' ),
'moduleStyles' => array(
@@ -219,7 +219,7 @@
),
'class' => 'flow-history-edit-title',
),
- 'handler-class' => 'Flow\Actions\EditTitleAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'watch' => array(
'immediate' => array(
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
@@ -247,7 +247,7 @@
),
'class' => 'flow-history-new-post',
),
- 'handler-class' => 'Flow\Actions\NewTopicAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'watch' => array(
'immediate' => array(
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
@@ -279,7 +279,7 @@
),
'class' => 'flow-history-edit-post',
),
- 'handler-class' => 'Flow\Actions\EditPostAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'watch' => array(
'immediate' => array(
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
@@ -309,7 +309,7 @@
),
'class' => 'flow-history-edit-post',
),
- 'handler-class' => 'Flow\Actions\UndoEditPostAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'watch' => array(
'immediate' => array(
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
@@ -502,7 +502,7 @@
),
'class' => 'flow-history-locked-topic',
),
- 'handler-class' => 'Flow\Actions\LockTopicAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'restore-post' => array(
@@ -555,7 +555,7 @@
return "flow-history-un$state-post";
}
),
- 'handler-class' => 'Flow\Actions\RestorePostAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'restore-topic' => array(
@@ -609,7 +609,7 @@
return "flow-history-un$state-topic";
}
),
- 'handler-class' => 'Flow\Actions\RestoreTopicAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'view' => array(
@@ -660,7 +660,7 @@
'class' => 'flow-history-bundle',
),
),
- 'handler-class' => 'Flow\Actions\ReplyAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
'watch' => array(
'immediate' => array(
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
@@ -732,7 +732,7 @@
PostRevision::MODERATED_SUPPRESSED => 'flow-suppress',
),
'history' => array(), // views don't generate history
- 'handler-class' => 'Flow\Actions\HistoryAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
// Pseudo-action to determine when to show thank links,
@@ -752,29 +752,29 @@
// Actions not tied to a particular revision change_type
// or just move these to a different file
'compare-header-revisions' => array(
- 'handler-class' => 'Flow\Actions\CompareHeaderRevisionsAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'view-header' => array(
- 'handler-class' => 'Flow\Actions\ViewHeaderAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'compare-post-revisions' => array(
- 'handler-class' => 'Flow\Actions\ComparePostRevisionsAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
// @todo - This is a very bad action name, consolidate with view-post
action
'single-view' => array(
- 'handler-class' => 'Flow\Actions\PostSingleViewAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'view-topic-summary' => array(
- 'handler-class' => 'Flow\Actions\ViewTopicSummaryAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'compare-postsummary-revisions' => array(
- 'handler-class' =>
'Flow\Actions\ComparePostSummaryRevisionsAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'moderate-topic' => array(
- 'handler-class' => 'Flow\Actions\ModerateTopicAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'moderate-post' => array(
- 'handler-class' => 'Flow\Actions\ModeratePostAction',
+ 'handler-class' => 'Flow\Actions\FlowAction',
),
'purge' => array(
'handler-class' => 'Flow\Actions\PurgeAction',
diff --git a/autoload.php b/autoload.php
index c8bb08d..c0dc563 100644
--- a/autoload.php
+++ b/autoload.php
@@ -28,32 +28,10 @@
'ApiParsoidUtilsFlow' => __DIR__ .
'/includes/api/ApiParsoidUtilsFlow.php',
'ApiQueryPropFlowInfo' => __DIR__ .
'/includes/api/ApiQueryPropFlowInfo.php',
'FlowHooks' => __DIR__ . '/Hooks.php',
- 'Flow\\Actions\\CompareHeaderRevisionsAction' => __DIR__ .
'/includes/Actions/CompareHeaderRevisionsAction.php',
- 'Flow\\Actions\\ComparePostRevisionsAction' => __DIR__ .
'/includes/Actions/ComparePostRevisionsAction.php',
- 'Flow\\Actions\\ComparePostSummaryRevisionsAction' => __DIR__ .
'/includes/Actions/ComparePostSummaryRevisionsAction.php',
- 'Flow\\Actions\\CreateTopicSummaryAction' => __DIR__ .
'/includes/Actions/CreateTopicSummaryAction.php',
'Flow\\Actions\\EditAction' => __DIR__ .
'/includes/Actions/EditAction.php',
- 'Flow\\Actions\\EditHeaderAction' => __DIR__ .
'/includes/Actions/EditHeaderAction.php',
- 'Flow\\Actions\\EditPostAction' => __DIR__ .
'/includes/Actions/EditPostAction.php',
- 'Flow\\Actions\\EditTitleAction' => __DIR__ .
'/includes/Actions/EditTitleAction.php',
- 'Flow\\Actions\\EditTopicSummaryAction' => __DIR__ .
'/includes/Actions/EditTopicSummaryAction.php',
'Flow\\Actions\\FlowAction' => __DIR__ . '/includes/Actions/Action.php',
- 'Flow\\Actions\\HistoryAction' => __DIR__ .
'/includes/Actions/HistoryAction.php',
- 'Flow\\Actions\\LockTopicAction' => __DIR__ .
'/includes/Actions/LockTopicAction.php',
- 'Flow\\Actions\\ModeratePostAction' => __DIR__ .
'/includes/Actions/ModeratePostAction.php',
- 'Flow\\Actions\\ModerateTopicAction' => __DIR__ .
'/includes/Actions/ModerateTopicAction.php',
- 'Flow\\Actions\\NewTopicAction' => __DIR__ .
'/includes/Actions/NewTopicAction.php',
- 'Flow\\Actions\\PostSingleViewAction' => __DIR__ .
'/includes/Actions/PostSingleViewAction.php',
'Flow\\Actions\\PurgeAction' => __DIR__ .
'/includes/Actions/PurgeAction.php',
- 'Flow\\Actions\\ReplyAction' => __DIR__ .
'/includes/Actions/ReplyAction.php',
- 'Flow\\Actions\\RestorePostAction' => __DIR__ .
'/includes/Actions/RestorePostAction.php',
- 'Flow\\Actions\\RestoreTopicAction' => __DIR__ .
'/includes/Actions/RestoreTopicAction.php',
- 'Flow\\Actions\\UndoEditHeaderAction' => __DIR__ .
'/includes/Actions/UndoEditHeaderAction.php',
- 'Flow\\Actions\\UndoEditPostAction' => __DIR__ .
'/includes/Actions/UndoEditPostAction.php',
- 'Flow\\Actions\\UndoEditTopicSummaryAction' => __DIR__ .
'/includes/Actions/UndoEditTopicSummaryAction.php',
'Flow\\Actions\\ViewAction' => __DIR__ .
'/includes/Actions/ViewAction.php',
- 'Flow\\Actions\\ViewHeaderAction' => __DIR__ .
'/includes/Actions/ViewHeaderAction.php',
- 'Flow\\Actions\\ViewTopicSummaryAction' => __DIR__ .
'/includes/Actions/ViewTopicSummaryAction.php',
'Flow\\BlockFactory' => __DIR__ . '/includes/BlockFactory.php',
'Flow\\Block\\AbstractBlock' => __DIR__ . '/includes/Block/Block.php',
'Flow\\Block\\Block' => __DIR__ . '/includes/Block/Block.php',
diff --git a/includes/Actions/ActionTemplate.php.template
b/includes/Actions/ActionTemplate.php.template
deleted file mode 100644
index 655ceed..0000000
--- a/includes/Actions/ActionTemplate.php.template
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-// Set up like so:
-// foreach( $wgFlowActions as $action => $options ) {
-// if ( is_array( $options ) ) {
-// $className = implode( '', array_map( 'ucfirst',
explode( '-', "$action-action" ) ) );
-// echo "\$wgAutoloadClasses['$className'] =
'\$dir/includes/Actions/$className.php';\n";
-// $content = strtr( $template, array( '{{CLASSNAME}}' =>
$className, '{{ACTIONNAME}}' => $action ) );
-// file_put_contents(
"/vagrant/mediawiki/extensions/Flow/includes/actions/{$className}.php",
$content );
-// }
-// }
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class {{CLASSNAME}} extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, '{{ACTIONNAME}}' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/CompareHeaderRevisionsAction.php
b/includes/Actions/CompareHeaderRevisionsAction.php
deleted file mode 100644
index bd01a60..0000000
--- a/includes/Actions/CompareHeaderRevisionsAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class CompareHeaderRevisionsAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context,
'compare-header-revisions' );
- }
-}
diff --git a/includes/Actions/ComparePostRevisionsAction.php
b/includes/Actions/ComparePostRevisionsAction.php
deleted file mode 100644
index 39a0740..0000000
--- a/includes/Actions/ComparePostRevisionsAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class ComparePostRevisionsAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'compare-post-revisions'
);
- }
-}
diff --git a/includes/Actions/ComparePostSummaryRevisionsAction.php
b/includes/Actions/ComparePostSummaryRevisionsAction.php
deleted file mode 100644
index e40e277..0000000
--- a/includes/Actions/ComparePostSummaryRevisionsAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class ComparePostSummaryRevisionsAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context,
'compare-postsummary-revisions' );
- }
-}
diff --git a/includes/Actions/CreateTopicSummaryAction.php
b/includes/Actions/CreateTopicSummaryAction.php
deleted file mode 100644
index b9e609a..0000000
--- a/includes/Actions/CreateTopicSummaryAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class CreateTopicSummaryAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'create-topic-summary' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/EditHeaderAction.php
b/includes/Actions/EditHeaderAction.php
deleted file mode 100644
index 91310ca..0000000
--- a/includes/Actions/EditHeaderAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class EditHeaderAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'edit-header' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/EditPostAction.php
b/includes/Actions/EditPostAction.php
deleted file mode 100644
index e6f2c92..0000000
--- a/includes/Actions/EditPostAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class EditPostAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'edit-post' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/EditTitleAction.php
b/includes/Actions/EditTitleAction.php
deleted file mode 100644
index 3b42ed0..0000000
--- a/includes/Actions/EditTitleAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class EditTitleAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'edit-title' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/EditTopicSummaryAction.php
b/includes/Actions/EditTopicSummaryAction.php
deleted file mode 100644
index 9f2226f..0000000
--- a/includes/Actions/EditTopicSummaryAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class EditTopicSummaryAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'edit-topic-summary' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/HistoryAction.php
b/includes/Actions/HistoryAction.php
deleted file mode 100644
index 0dce217..0000000
--- a/includes/Actions/HistoryAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class HistoryAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'history' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/LockTopicAction.php
b/includes/Actions/LockTopicAction.php
deleted file mode 100644
index bfd0bed..0000000
--- a/includes/Actions/LockTopicAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class LockTopicAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'lock-topic' );
- }
-}
diff --git a/includes/Actions/ModeratePostAction.php
b/includes/Actions/ModeratePostAction.php
deleted file mode 100644
index 5b52019..0000000
--- a/includes/Actions/ModeratePostAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class ModeratePostAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'moderate-post' );
- }
-}
diff --git a/includes/Actions/ModerateTopicAction.php
b/includes/Actions/ModerateTopicAction.php
deleted file mode 100644
index e690052..0000000
--- a/includes/Actions/ModerateTopicAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class ModerateTopicAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'moderate-topic' );
- }
-}
diff --git a/includes/Actions/NewTopicAction.php
b/includes/Actions/NewTopicAction.php
deleted file mode 100644
index 4695476..0000000
--- a/includes/Actions/NewTopicAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class NewTopicAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'new-topic' );
- }
-}
diff --git a/includes/Actions/PostSingleViewAction.php
b/includes/Actions/PostSingleViewAction.php
deleted file mode 100644
index 32666d8..0000000
--- a/includes/Actions/PostSingleViewAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class PostSingleViewAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'single-view' );
- }
-}
diff --git a/includes/Actions/ReplyAction.php b/includes/Actions/ReplyAction.php
deleted file mode 100644
index 0a52b69..0000000
--- a/includes/Actions/ReplyAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class ReplyAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'reply' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/RestorePostAction.php
b/includes/Actions/RestorePostAction.php
deleted file mode 100644
index 11bf09c..0000000
--- a/includes/Actions/RestorePostAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class RestorePostAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'restore-post' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/RestoreTopicAction.php
b/includes/Actions/RestoreTopicAction.php
deleted file mode 100644
index 2993bba..0000000
--- a/includes/Actions/RestoreTopicAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class RestoreTopicAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'restore-topic' );
- }
-}
\ No newline at end of file
diff --git a/includes/Actions/UndoEditHeaderAction.php
b/includes/Actions/UndoEditHeaderAction.php
deleted file mode 100644
index 8bfe20b..0000000
--- a/includes/Actions/UndoEditHeaderAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class UndoEditHeaderAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'undo-edit-header' );
- }
-}
diff --git a/includes/Actions/UndoEditPostAction.php
b/includes/Actions/UndoEditPostAction.php
deleted file mode 100644
index e4b44cb..0000000
--- a/includes/Actions/UndoEditPostAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class UndoEditPostAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'undo-edit-post' );
- }
-}
diff --git a/includes/Actions/UndoEditTopicSummaryAction.php
b/includes/Actions/UndoEditTopicSummaryAction.php
deleted file mode 100644
index e5624c2..0000000
--- a/includes/Actions/UndoEditTopicSummaryAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class UndoEditTopicSummaryAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'undo-edit-topic-summary'
);
- }
-}
diff --git a/includes/Actions/ViewHeaderAction.php
b/includes/Actions/ViewHeaderAction.php
deleted file mode 100644
index 7ecf6ee..0000000
--- a/includes/Actions/ViewHeaderAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class ViewHeaderAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'view-header' );
- }
-}
diff --git a/includes/Actions/ViewTopicSummaryAction.php
b/includes/Actions/ViewTopicSummaryAction.php
deleted file mode 100644
index 7eba3bc..0000000
--- a/includes/Actions/ViewTopicSummaryAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Flow\Actions;
-
-use IContextSource;
-use Page;
-
-class ViewTopicSummaryAction extends FlowAction {
- function __construct( Page $page, IContextSource $context ) {
- parent::__construct( $page, $context, 'view-topic-summary' );
- }
-}
diff --git a/includes/Content/BoardContentHandler.php
b/includes/Content/BoardContentHandler.php
index 3c4d836..a028251 100644
--- a/includes/Content/BoardContentHandler.php
+++ b/includes/Content/BoardContentHandler.php
@@ -2,11 +2,14 @@
namespace Flow\Content;
+use Flow\Actions\FlowAction;
use Flow\Container;
use Flow\FlowActions;
use Flow\Model\UUID;
use FormatJson;
+use IContextSource;
use MWException;
+use Page;
class BoardContentHandler extends \ContentHandler {
public function __construct( $modelId ) {
@@ -119,7 +122,19 @@
foreach( $actions->getActions() as $action ) {
$actionData = $actions->getValue( $action );
- if ( is_array( $actionData ) && isset(
$actionData['handler-class'] ) ) {
+ if ( !is_array( $actionData ) ) {
+ continue;
+ }
+
+ if ( !isset( $actionData['handler-class'] ) ) {
+ continue;
+ }
+
+ if ( $actionData['handler-class'] ===
'Flow\Actions\FlowAction' ) {
+ $output[$action] = function( Page $page,
IContextSource $source ) use ( $action ) {
+ return new FlowAction( $page, $source,
$action );
+ };
+ } else {
$output[$action] = $actionData['handler-class'];
}
}
--
To view, visit https://gerrit.wikimedia.org/r/196113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c9d96cee594975b32c9c22cf145e0f3c3749f7c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: SG <shah...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
