Move isOpeningBalance() to trait

app/Http/Controllers/Controller.php

@@ -23,10 +23,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers;
 
 use FireflyConfig;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\Http\Controllers\UserNavigation;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -34,7 +30,6 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 use Log;
 use Route;
-use URL;
 
 /**
  * Class Controller.
@@ -96,22 +91,6 @@ class Controller extends BaseController
     }
 
 
-
-    /**
-     * Is transaction opening balance?
-     *
-     * @param TransactionJournal $journal
-     *
-     * @return bool
-     */
-    protected function isOpeningBalance(TransactionJournal $journal): bool // get object info / validate input
-    {
-        return TransactionType::OPENING_BALANCE === $journal->transactionType->type;
-    }
-
-
-
-
     /**
      * Get user's language.
      *

app/Http/Controllers/Transaction/ConvertController.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\ModelInformation;
 use Illuminate\Http\Request;
 use Log;
 use View;
@@ -38,6 +39,8 @@ use View;
  */
 class ConvertController extends Controller
 {
+    use ModelInformation;
+
     /** @var JournalRepositoryInterface Journals and transactions overview */
     private $repository;
 
@@ -181,7 +184,8 @@ class ConvertController extends Controller
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function getDestinationAccount(TransactionJournal $journal, TransactionType $destinationType, array $data): Account // helper for conversion. Get info from obj.
+    protected function getDestinationAccount(TransactionJournal $journal, TransactionType $destinationType, array $data
+    ): Account // helper for conversion. Get info from obj.
     {
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository  = app(AccountRepositoryInterface::class);
@@ -242,7 +246,8 @@ class ConvertController extends Controller
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function getSourceAccount(TransactionJournal $journal, TransactionType $destinationType, array $data): Account // helper for conversion. Get info from obj.
+    protected function getSourceAccount(TransactionJournal $journal, TransactionType $destinationType, array $data
+    ): Account // helper for conversion. Get info from obj.
     {
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository  = app(AccountRepositoryInterface::class);

app/Http/Controllers/Transaction/SingleController.php

@@ -33,6 +33,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\ModelInformation;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Log;
@@ -45,6 +46,8 @@ use View;
  */
 class SingleController extends Controller
 {
+    use ModelInformation;
+
     /** @var AttachmentHelperInterface The attachment helper. */
     private $attachments;
     /** @var BudgetRepositoryInterface The budget repository */

app/Http/Controllers/Transaction/SplitController.php

@@ -34,6 +34,7 @@ use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\ModelInformation;
 use FireflyIII\Transformers\TransactionTransformer;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -47,6 +48,8 @@ use View;
  */
 class SplitController extends Controller
 {
+    use ModelInformation;
+
     /** @var AttachmentHelperInterface Attachment helper */
     private $attachments;
 

app/Http/Controllers/TransactionController.php

@@ -35,6 +35,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\ModelInformation;
 use FireflyIII\Transformers\TransactionTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -50,6 +51,7 @@ use View;
  */
 class TransactionController extends Controller
 {
+    use ModelInformation;
     /** @var JournalRepositoryInterface Journals and transactions overview */
     private $repository;
 

app/Support/Http/Controllers/ModelInformation.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * ModelInformation.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Http\Controllers;
+
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+
+/**
+ * Trait ModelInformation
+ *
+ * @package FireflyIII\Support\Http\Controllers
+ */
+trait ModelInformation
+{
+    /**
+     * Is transaction opening balance?
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    protected function isOpeningBalance(TransactionJournal $journal): bool
+    {
+        return TransactionType::OPENING_BALANCE === $journal->transactionType->type;
+    }
+
+
+}