Merge pull request #4123 from eileenmcnaughton/CRM-15296

[civicrm-core.git] / CRM / Utils / Request.php

diff --git a/CRM/Utils/Request.php b/CRM/Utils/Request.php
index 376eeeb9ce953759235ab4f348c6fc093914eed0..eea57653e1d1168c4175d6cb529482e3a8780515 100644 (file)
--- a/CRM/Utils/Request.php
+++ b/CRM/Utils/Request.php
@@ -57,17 +57,16 @@ class CRM_Utils_Request {
   /**
    * Retrieve a value from the request (GET/POST/REQUEST)
    *
-   * @param $name    name of the variable to be retrieved
-   * @param $type    type of the variable (see CRM_Utils_Type for details)
-   * @param $store   session scope where variable is stored
-   * @param $abort   is this variable required
-   * @param $default default value of the variable if not present
-   * @param $method  where should we look for the variable
+   * @param string $name name of the variable to be retrieved
+   * @param string $type  type of the variable (see CRM_Utils_Type for details)
+   * @param stdClass $store session scope where variable is stored
+   * @param bool $abort is this variable required
+   * @param mixed $default default value of the variable if not present
+   * @param string $method where should we look for the variable
    *
    * @return mixed the value of the variable
    * @access public
    * @static
-   *
    */
   static function retrieve($name, $type, &$store = NULL, $abort = FALSE, $default = NULL, $method = 'REQUEST') {
 
@@ -126,9 +125,8 @@ class CRM_Utils_Request {
    * This is a replacement for $_REQUEST which includes $_GET/$_POST
    * but excludes $_COOKIE / $_ENV / $_SERVER.
    *
-   * @param string $method
+   * @internal param string $method
    * @return array
-   * @throws CRM_Core_Exception
    */
   static function exportValues() {
     // For more discussion of default $_REQUEST handling, see: