From d7a9a62a1d7e5187df7d39df50d075526b10c521 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 9 Jul 2015 21:48:05 +0200
Subject: [PATCH] Should fix some scrutinyizer problems.

---
 app/Helpers/Csv/Importer.php          | 13 +++----------
 app/Helpers/Csv/Mapper/AnyAccount.php |  2 --
 app/Models/Account.php                |  1 +
 app/Models/Category.php               |  1 +
 app/Models/TransactionJournal.php     |  7 ++++++-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/Helpers/Csv/Importer.php b/app/Helpers/Csv/Importer.php
index 02112a5572..77aabb1170 100644
--- a/app/Helpers/Csv/Importer.php
+++ b/app/Helpers/Csv/Importer.php
@@ -295,24 +295,17 @@ class Importer
         $this->saveTags($journal);
 
         // some debug info:
-        $id   = $journal->id;
-        $type = $journal->transactionType->type;
+        $journalId = $journal->id;
+        $type      = $journal->transactionType->type;
         /** @var Account $asset */
         $asset = $this->importData['asset-account-object'];
         /** @var Account $opposing */
         $opposing = $this->importData['opposing-account-object'];
 
-        Log::info('Created journal #' . $id . ' of type ' . $type . '!');
+        Log::info('Created journal #' . $journalId . ' of type ' . $type . '!');
         Log::info('Asset account ' . $asset->name . ' (#' . $asset->id . ') lost/gained: ' . $this->importData['amount']);
         Log::info($opposing->accountType->type . ' ' . $opposing->name . ' (#' . $opposing->id . ') lost/gained: ' . bcmul($this->importData['amount'], -1));
 
-        //.
-        //' [' . $asset->name . ' (#' .$asset->id . ')] <--> ' .
-        //' [' . $this->importData['opposing-account-object']->name . ' (' . $this->importData['opposing-account-object']->accountType->type . ') (#'
-        //. $this->importData['opposing-account-object']->id . ')]'
-        //        );
-        //
-
         return $journal;
     }
 
diff --git a/app/Helpers/Csv/Mapper/AnyAccount.php b/app/Helpers/Csv/Mapper/AnyAccount.php
index 24556424de..dcfaefeec5 100644
--- a/app/Helpers/Csv/Mapper/AnyAccount.php
+++ b/app/Helpers/Csv/Mapper/AnyAccount.php
@@ -29,8 +29,6 @@ class AnyAccount implements MapperInterface
 
         $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
-        //array_unshift($list, );
-
         return $list;
     }
 }
diff --git a/app/Models/Account.php b/app/Models/Account.php
index fdb4eeb6e3..c51332af85 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -41,6 +41,7 @@ use Watson\Validating\ValidatingTrait;
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereIban($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account accountTypeIn($types)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account hasMetaValue($name, $value)
+ * @property-read bool $joinedAccountTypes
  */
 class Account extends Model
 {
diff --git a/app/Models/Category.php b/app/Models/Category.php
index b1a6c847c7..0612f2cf62 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -24,6 +24,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value)
+ * @property-read float $spent
  */
 class Category extends Model
 {
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index ecce561f14..b9f78c9ca4 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -41,7 +41,7 @@ use Watson\Validating\ValidatingTrait;
  * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency 
  * @property-read \FireflyIII\Models\TransactionType $transactionType 
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups 
- * @property-read \FireflyIII\User $user 
+ * @property-read \FireflyIII\User $user
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value)
@@ -62,6 +62,11 @@ use Watson\Validating\ValidatingTrait;
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal onDate($date)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal transactionTypes($types)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withRelevantData()
+ * @property-read bool $account_encrypted
+ * @property-read bool $joinedTransactions
+ * @property-read bool $joinedTransactionTypes
+ * @property-read int $account_id
+ * @property-read string $name
  */
 class TransactionJournal extends Model
 {