From f93f8e8b642fde961d8f878af58e3e585417e95e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 29 Jul 2019 10:22:36 +1200
Subject: [PATCH] Fix unreleased regression - fatal on financial account screen

---
 CRM/Financial/BAO/FinancialAccount.php          |  2 +-
 .../CRM/Financial/BAO/FinancialAccountTest.php  | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php
index c8f3357370..42a97669b4 100644
--- a/CRM/Financial/BAO/FinancialAccount.php
+++ b/CRM/Financial/BAO/FinancialAccount.php
@@ -49,7 +49,7 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco
    *
    * @return CRM_Financial_BAO_FinancialAccount
    */
-  public static function retrieve(&$params, &$defaults) {
+  public static function retrieve(&$params, $defaults = []) {
     $financialAccount = new CRM_Financial_DAO_FinancialAccount();
     $financialAccount->copyValues($params);
     if ($financialAccount->find(TRUE)) {
diff --git a/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php b/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php
index 1bd7a387e1..b094855514 100644
--- a/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php
+++ b/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php
@@ -103,20 +103,21 @@ class CRM_Financial_BAO_FinancialAccountTest extends CiviUnitTestCase {
 
   /**
    * Check method del()
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function testdel() {
-    $params = array(
+  public function testDel() {
+    $params = [
       'name' => 'Donations',
       'is_deductible' => 0,
       'is_active' => 1,
-    );
-    $ids = array();
-    $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids);
+    ];
+    $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params);
 
     CRM_Financial_BAO_FinancialAccount::del($financialAccount->id);
-    $params = array('id' => $financialAccount->id);
-    $result = CRM_Financial_BAO_FinancialAccount::retrieve($params, $defaults);
-    $this->assertEquals(empty($result), TRUE, 'Verify financial account record deletion.');
+    $params = ['id' => $financialAccount->id];
+    $result = CRM_Financial_BAO_FinancialAccount::retrieve($params);
+    $this->assertEmpty($result, 'Verify financial account record deletion.');
   }
 
   /**
-- 
2.25.1