Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-07-19-33-29

[civicrm-core.git] / CRM / Contribute / StateMachine / ContributionPage.php

diff --git a/CRM/Contribute/StateMachine/ContributionPage.php b/CRM/Contribute/StateMachine/ContributionPage.php
index bd98929b238fc1658e2fd7af1d45cbc165564107..cad1d182b8441f3ca24a256b62a603253f71219e 100644 (file)
--- a/CRM/Contribute/StateMachine/ContributionPage.php
+++ b/CRM/Contribute/StateMachine/ContributionPage.php
@@ -42,10 +42,11 @@ class CRM_Contribute_StateMachine_ContributionPage extends CRM_Core_StateMachine
   /**
    * class constructor
    *
-   * @param object  CRM_Contribute_Controller_ContributionPage
-   * @param int     $action
+   * @param object $controller
+   * @param \const|int $action
    *
-   * @return object CRM_Contribute_StateMachine_ContributionPage
+   * @internal param \CRM_Contribute_Controller_ContributionPage $object
+   * @return \CRM_Contribute_StateMachine_ContributionPage CRM_Contribute_StateMachine_ContributionPage
    */
   function __construct($controller, $action = CRM_Core_Action::NONE) {
     parent::__construct($controller, $action);