Merge pull request #12472 from eileenmcnaughton/add_product

Remove unused variables & comment cleanup
civicrm · Jul 14, 2018 · c08d63f · c08d63f
2 parents e3556f3 + 5b54155
commit c08d63f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/CRM/Contribute/Form/ContributionPage/AddProduct.php b/CRM/Contribute/Form/ContributionPage/AddProduct.php
@@ -229,15 +229,12 @@ public function postProcess() {
 
     $urlParams = 'civicrm/admin/contribute/premium';
     if ($this->_action & CRM_Core_Action::PREVIEW) {
-      $session = CRM_Core_Session::singleton();
       $url = CRM_Utils_System::url($urlParams, 'reset=1&action=update&id=' . $this->_id);
-      $single = $session->get('singleForm');
       CRM_Utils_System::redirect($url);
       return;
     }
 
     if ($this->_action & CRM_Core_Action::DELETE) {
-      $session = CRM_Core_Session::singleton();
       $url = CRM_Utils_System::url($urlParams, 'reset=1&action=update&id=' . $this->_id);
       $dao = new CRM_Contribute_DAO_PremiumsProduct();
       $dao->id = $this->_pid;
@@ -246,7 +243,6 @@ public function postProcess() {
       CRM_Utils_System::redirect($url);
     }
     else {
-      $session = CRM_Core_Session::singleton();
       $url = CRM_Utils_System::url($urlParams, 'reset=1&action=update&id=' . $this->_id);
       if ($this->_pid) {
         $params['id'] = $this->_pid;

diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php
@@ -48,7 +48,7 @@ public function __construct() {
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
    *
-   * @return CRM_Core_BAO_FinancialTrxn
+   * @return CRM_Financial_DAO_FinancialTrxn
    */
   public static function create($params) {
     $trxn = new CRM_Financial_DAO_FinancialTrxn();
@@ -116,7 +116,7 @@ public static function getBalanceTrxnAmt($contributionId, $contributionFinancial
    * @param array $defaults
    *   (reference ) an assoc array to hold the flattened values.
    *
-   * @return CRM_Contribute_BAO_ContributionType
+   * @return \CRM_Financial_DAO_FinancialTrxn
    */
   public static function retrieve(&$params, &$defaults) {
     $financialItem = new CRM_Financial_DAO_FinancialTrxn();
@@ -507,7 +507,7 @@ public static function getPartialPaymentWithType($entityId, $entityName = 'parti
   /**
    * @param int $contributionId
    *
-   * @return array
+   * @return string
    */
   public static function getTotalPayments($contributionId) {
     $statusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
@@ -531,7 +531,7 @@ public static function getTotalPayments($contributionId) {
    * @param array $contribution
    * @param array $params
    *
-   * @return CRM_Core_BAO_FinancialTrxn
+   * @return \CRM_Financial_DAO_FinancialTrxn
    */
   public static function getPartialPaymentTrxn($contribution, $params) {
     $trxn = CRM_Contribute_BAO_Contribution::recordPartialPayment($contribution, $params);

diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
@@ -47,7 +47,7 @@ public function __construct() {
    * @param array $defaults
    *   (reference ) an assoc array to hold the flattened values.
    *
-   * @return CRM_Financial_BAO_FinancialItem
+   * @return CRM_Financial_DAO_FinancialItem
    */
   public static function retrieve(&$params, &$defaults) {
     $financialItem = new CRM_Financial_DAO_FinancialItem();
@@ -189,9 +189,9 @@ public static function create(&$params, $ids = NULL, $trxnIds = NULL) {
    * Takes an associative array and creates a entity financial transaction object.
    *
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
+   *   an assoc array of name/value pairs.
    *
-   * @return CRM_Core_BAO_FinancialTrxn
+   * @return CRM_Financial_DAO_EntityFinancialTrxn
    */
   public static function createEntityTrxn($params) {
     $entity_trxn = new CRM_Financial_DAO_EntityFinancialTrxn();
@@ -204,9 +204,9 @@ public static function createEntityTrxn($params) {
    * Retrive entity financial trxn details.
    *
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
+   *   an assoc array of name/value pairs.
    * @param bool $maxId
-   *   To retrive max id.
+   *   To retrieve max id.
    *
    * @return array
    */