Merge "Changed formatting of "anontalkpagetext""

[lhc/web/wiklou.git] / includes / Action.php

diff --git a/includes/Action.php b/includes/Action.php
index 0bc5ba2..7c3a3ba 100644 (file)
--- a/includes/Action.php
+++ b/includes/Action.php
@@ -38,7 +38,7 @@ abstract class Action {
 
        /**
         * Page on which we're performing the action
-        * @var Page $page
+        * @var WikiPage|Article|ImagePage|CategoryPage|Page $page
         */
        protected $page;
 
@@ -147,7 +147,7 @@ abstract class Action {
        /**
         * Check if a given action is recognised, even if it's disabled
         *
-        * @param $name String: name of an action
+        * @param string $name name of an action
         * @return Bool
         */
        final public static function exists( $name ) {
@@ -388,7 +388,7 @@ abstract class FormAction extends Action {
        protected function alterForm( HTMLForm $form ) {}
 
        /**
-        * Get the HTMLForm to control behaviour
+        * Get the HTMLForm to control behavior
         * @return HTMLForm|null
         */
        protected function getForm() {
@@ -439,7 +439,7 @@ abstract class FormAction extends Action {
         * some stuff underneath (history etc); to do some processing on submission of that
         * form (delete, protect, etc) and to do something exciting on 'success', be that
         * display something new or redirect to somewhere.  Some actions have more exotic
-        * behaviour, but that's what subclassing is for :D
+        * behavior, but that's what subclassing is for :D
         */
        public function show() {
                $this->setHeaders();
@@ -545,8 +545,8 @@ abstract class FormlessAction extends Action {
        /**
         * Execute the action silently, not giving any output.  Since these actions don't have
         * forms, they probably won't have any data, but some (eg rollback) may do
-        * @param $data Array values that would normally be in the GET request
-        * @param $captureErrors Bool whether to catch exceptions and just return false
+        * @param array $data values that would normally be in the GET request
+        * @param bool $captureErrors whether to catch exceptions and just return false
         * @throws ErrorPageError|Exception
         * @return Bool whether execution was successful
         */