Merge branch '4.5' of https://github.com/civicrm/civicrm-core

[civicrm-core.git] / api / class.api.php

diff --git a/api/class.api.php b/api/class.api.php
index 93dda31ec1b2c266dfa9dd3a47616d6652d09de1..7112996141c197594ec90edccb20bd48b5b620cc 100644 (file)
--- a/api/class.api.php
+++ b/api/class.api.php
@@ -126,14 +126,14 @@ class civicrm_api3 {
   }
 
   /**
-   *
+   * @return string
    */
   public function __toString() {
     return json_encode($this->lastResult);
   }
 
   /**
-   *
+   * Perform action
    */
   public function __call($action, $params) {
     // @TODO Check if it's a valid action.
@@ -154,7 +154,8 @@ class civicrm_api3 {
   }
 
   /**
-   *
+   * Call via rest
+   * @return stdClass
    */
   function remoteCall($entity, $action, $params = array()) {
     $fields = "key={$this->key}&api_key={$this->api_key}";
@@ -253,20 +254,21 @@ class civicrm_api3 {
 
   /**
    * Return the last error message.
+   * @return string
    */
   function errorMsg() {
     return $this->lastResult->error_message;
   }
 
   /**
-   *
+   * Initialize
    */
   function init() {
     CRM_Core_DAO::init($this->cfg->dsn);
   }
 
   /**
-   *
+   * @return $this
    */
   public function attr($name, $value = NULL) {
     if ($value === NULL) {
@@ -281,21 +283,22 @@ class civicrm_api3 {
   }
 
   /**
-   *
+   * @return bool
    */
   public function is_error() {
     return (property_exists($this->lastResult, 'is_error') && $this->lastResult->is_error);
   }
 
   /**
-   *
+   * @param string $name
+   * @return bool
    */
   public function is_set($name) {
     return (isset($this->lastResult->$name));
   }
 
   /**
-   *
+   * @return $this
    */
   public function __get($name) {
     // @TODO Test if valid entity.
@@ -320,6 +323,7 @@ class civicrm_api3 {
 
   /**
    * Or use $api->value.
+   * @return array
    */
   public function values() {
     if (is_array($this->lastResult)) {
@@ -332,6 +336,7 @@ class civicrm_api3 {
 
   /**
    * Or use $api->result.
+   * @return array
    */
   public function result() {
     return $this->lastResult;