From e29b2066c25e07e6b2a10e1676456b6be0abd3f2 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sun, 2 Aug 2020 11:59:43 +0200
Subject: [PATCH] Remove deprecated method.

---
 .../V1/Controllers/BudgetLimitController.php  |  3 +-
 .../Budget/BudgetLimitRepository.php          | 31 +++++--------------
 .../Budget/BudgetLimitRepositoryInterface.php |  9 ------
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php
index 56a018c1fe..7973104360 100644
--- a/app/Api/V1/Controllers/BudgetLimitController.php
+++ b/app/Api/V1/Controllers/BudgetLimitController.php
@@ -245,8 +245,7 @@ class BudgetLimitController extends Controller
     public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
     {
         $data           = $request->getAll();
-        $data['budget'] = $budgetLimit->budget;
-        $budgetLimit    = $this->blRepository->updateBudgetLimit($budgetLimit, $data);
+        $budgetLimit    = $this->blRepository->update($budgetLimit, $data);
         $manager        = $this->getManager();
 
         /** @var BudgetLimitTransformer $transformer */
diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php
index 93908559c3..c204a55b44 100644
--- a/app/Repositories/Budget/BudgetLimitRepository.php
+++ b/app/Repositories/Budget/BudgetLimitRepository.php
@@ -337,29 +337,11 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
      */
     public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit
     {
-        $budgetLimit->amount = $data['amount'] ?? $budgetLimit->amount;
-        $budgetLimit->save();
-
-        return $budgetLimit;
-    }
-
-    /**
-     * @param BudgetLimit $budgetLimit
-     * @param array       $data
-     *
-     * @return BudgetLimit
-     * @throws Exception
-     * @deprecated
-     */
-    public function updateBudgetLimit(BudgetLimit $budgetLimit, array $data): BudgetLimit
-    {
-        /** @var Budget $budget */
-        $budget = $data['budget'];
-
-        $budgetLimit->budget()->associate($budget);
-        $budgetLimit->start_date = $data['start']->format('Y-m-d 00:00:00');
-        $budgetLimit->end_date   = $data['end']->format('Y-m-d 00:00:00');
-        $budgetLimit->amount     = $data['amount'];
+        $budgetLimit->amount     = $data['amount'] ?? $budgetLimit->amount;
+        $budgetLimit->budget_id  = $data['budget_id'] ?? $budgetLimit->id;
+        $budgetLimit->budget_id  = $data['budget'] ? $data['budget']->id : $budgetLimit->budget_id;
+        $budgetLimit->start_date = $data['start'] ? $data['start']->format('Y-m-d 00:00:00') : $budgetLimit->start_date;
+        $budgetLimit->end_date   = $data['end'] ? $data['end']->format('Y-m-d 00:00:00') : $budgetLimit->end_date;
 
         // if no currency has been provided, use the user's default currency:
         /** @var TransactionCurrencyFactory $factory */
@@ -370,9 +352,10 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         }
         $currency->enabled = true;
         $currency->save();
-        $budgetLimit->transaction_currency_id = $currency->id;
 
+        $budgetLimit->transaction_currency_id = $currency->id;
         $budgetLimit->save();
+
         Log::debug(sprintf('Updated budget limit with ID #%d and amount %s', $budgetLimit->id, $data['amount']));
 
         return $budgetLimit;
diff --git a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php
index 488df1e81b..4fc293f5d5 100644
--- a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php
+++ b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php
@@ -119,15 +119,6 @@ interface BudgetLimitRepositoryInterface
      */
     public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit;
 
-    /**
-     * @param BudgetLimit $budgetLimit
-     * @param array       $data
-     *
-     * @return BudgetLimit
-     * @deprecated
-     */
-    public function updateBudgetLimit(BudgetLimit $budgetLimit, array $data): BudgetLimit;
-
     /**
      * @param Budget $budget
      * @param Carbon $start