Merge branch 'release/4.7.1.4'

.env.docker

@@ -88,3 +88,4 @@ DEMO_PASSWORD=
 IS_DOCKER=true
 IS_SANDSTORM=false
 IS_HEROKU=false
+TZ=${TZ}

.env.example

@@ -13,6 +13,10 @@ SITE_OWNER=mail@example.com
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
 # APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
 TRUSTED_PROXIES=

.env.heroku

@@ -13,6 +13,10 @@ SITE_OWNER=heroku@example.com
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
 
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
 # APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
 TRUSTED_PROXIES=

.env.sandstorm

@@ -13,6 +13,10 @@ SITE_OWNER=sandstorm@example.com
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
 # APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
 TRUSTED_PROXIES=

.env.testing

@@ -6,6 +6,7 @@ APP_LOG=daily
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 TRUSTED_PROXIES=
+TZ=Europe/Amsterdam
 
 DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1

app/Api/V1/Controllers/AboutController.php

@@ -85,4 +85,4 @@ class AboutController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
-}
+}

app/Api/V1/Controllers/AccountController.php

@@ -260,4 +260,4 @@ class AccountController extends Controller
 
         return $types['all']; // @codeCoverageIgnore
     }
-}
+}

app/Api/V1/Controllers/TransactionController.php

@@ -166,7 +166,7 @@ class TransactionController extends Controller
         }
 
         $transactions = $collector->getJournals();
-        $resource     = new Item($transactions->first(), new TransactionTransformer($this->parameters), 'transactions');
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -330,4 +330,4 @@ class TransactionController extends Controller
         return $types['default']; // @codeCoverageIgnore
 
     }
-}
+}

app/Api/V1/Controllers/UserController.php

@@ -189,4 +189,4 @@ class UserController extends Controller
 
     }
 
-}
+}

app/Api/V1/Requests/AccountRequest.php

@@ -104,4 +104,4 @@ class AccountRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/BillRequest.php

@@ -116,4 +116,4 @@ class BillRequest extends Request
             }
         );
     }
-}
+}

app/Api/V1/Requests/TransactionRequest.php

@@ -497,4 +497,4 @@ class TransactionRequest extends Request
         return;
     }
 
-}
+}

app/Api/V1/Requests/UserRequest.php

@@ -86,4 +86,4 @@ class UserRequest extends Request
         return $rules;
     }
 
-}
+}

app/Events/RequestedVersionCheckStatus.php

@@ -49,4 +49,4 @@ class RequestedVersionCheckStatus extends Event
     {
         $this->user = $user;
     }
-}
+}

app/Factory/AccountFactory.php

@@ -168,4 +168,4 @@ class AccountFactory
 
     }
 
-}
+}

app/Factory/AccountMetaFactory.php

@@ -40,4 +40,4 @@ class AccountMetaFactory
         return AccountMeta::create($data);
     }
 
-}
+}

app/Factory/BillFactory.php

@@ -134,4 +134,4 @@ class BillFactory
         $this->user = $user;
     }
 
-}
+}

app/Factory/BudgetFactory.php

@@ -97,4 +97,4 @@ class BudgetFactory
         $this->user = $user;
     }
 
-}
+}

app/Factory/CategoryFactory.php

@@ -106,4 +106,4 @@ class CategoryFactory
         $this->user = $user;
     }
 
-}
+}

app/Factory/PiggyBankEventFactory.php

@@ -85,4 +85,4 @@ class PiggyBankEventFactory
 
         return $event;
     }
-}
+}

app/Factory/PiggyBankFactory.php

@@ -97,4 +97,4 @@ class PiggyBankFactory
 
     }
 
-}
+}

app/Factory/TagFactory.php

@@ -99,4 +99,4 @@ class TagFactory
         $this->user = $user;
     }
 
-}
+}

app/Factory/TransactionCurrencyFactory.php

@@ -64,4 +64,4 @@ class TransactionCurrencyFactory
     }
 
 
-}
+}

app/Factory/TransactionFactory.php

@@ -145,4 +145,4 @@ class TransactionFactory
     }
 
 
-}
+}

app/Factory/TransactionJournalFactory.php

@@ -151,4 +151,4 @@ class TransactionJournalFactory
         return $transactionType;
     }
 
-}
+}

app/Factory/TransactionJournalMetaFactory.php

@@ -69,4 +69,4 @@ class TransactionJournalMetaFactory
         return $entry;
     }
 
-}
+}

app/Factory/TransactionTypeFactory.php

@@ -41,4 +41,4 @@ class TransactionTypeFactory
         return TransactionType::whereType(ucfirst($type))->first();
     }
 
-}
+}

app/Handlers/Events/VersionCheckEventHandler.php

@@ -113,4 +113,4 @@ class VersionCheckEventHandler
         return;
     }
 
-}
+}

app/Http/Controllers/DebugController.php

@@ -171,4 +171,4 @@ class DebugController extends Controller
 
         return $packages;
     }
-}
+}

app/Http/Controllers/Transaction/BulkController.php

@@ -182,4 +182,4 @@ class BulkController extends Controller
         return redirect($this->getPreviousUri('transactions.bulk-edit.uri'));
     }
 
-}
+}

app/Http/Middleware/Authenticate.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Authenticate.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com

app/Http/Requests/ReconciliationStoreRequest.php

@@ -78,4 +78,4 @@ class ReconciliationStoreRequest extends Request
             'reconcile'    => 'required|in:create,nothing',
         ];
     }
-}
+}

app/Import/Object/ImportAccount.php

@@ -382,11 +382,12 @@ class ImportAccount
         Log::debug(sprintf('Found no account of type %s so must create one ourselves.', $this->expectedType));
 
         $data = [
-            'accountType'    => config('firefly.shortNamesByFullName.' . $this->expectedType),
-            'name'           => $this->accountName['value'] ?? '(no name)',
-            'iban'           => $this->accountIban['value'] ?? null,
-            'active'         => true,
-            'virtualBalance' => '0',
+            'accountType'     => config('firefly.shortNamesByFullName.' . $this->expectedType),
+            'name'            => $this->accountName['value'] ?? '(no name)',
+            'iban'            => $this->accountIban['value'] ?? null,
+            'active'          => true,
+            'virtualBalance'  => '0',
+            'account_type_id' => null,
         ];
 
         $this->account = $this->repository->store($data);

app/Import/Storage/ImportStorage.php

@@ -57,11 +57,11 @@ class ImportStorage
     /** @var Collection */
     public $journals;
     /** @var BillRepositoryInterface */
-    protected $billRepository; // yes, hard coded
+    protected $billRepository;
     /** @var Collection */
     protected $bills;
     /** @var int */
-    protected $defaultCurrencyId = 1;
+    protected $defaultCurrencyId = 1; // yes, hard coded
     /** @var ImportJob */
     protected $job;
     /** @var ImportJobRepositoryInterface */

app/Repositories/TransactionType/TransactionTypeRepository.php

@@ -41,4 +41,4 @@ class TransactionTypeRepository implements TransactionTypeRepositoryInterface
     {
         return TransactionType::where('type', ucfirst($type))->first();
     }
-}
+}

app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php

@@ -41,4 +41,4 @@ interface TransactionTypeRepositoryInterface
      */
     public function findByType(string $type): ?TransactionType;
 
-}
+}

app/Rules/BelongsUser.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

app/Rules/UniqueIban.php

@@ -86,4 +86,4 @@ class UniqueIban implements Rule
 
         return true;
     }
-}
+}

app/Rules/ValidTransactions.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

app/Services/Github/Object/Release.php

@@ -86,4 +86,4 @@ class Release extends GithubObject
     }
 
 
-}
+}

app/Services/Github/Request/GithubRequest.php

@@ -32,4 +32,4 @@ interface GithubRequest
 {
     public function call();
 
-}
+}

app/Services/Github/Request/UpdateRequest.php

@@ -79,4 +79,4 @@ class UpdateRequest implements GithubRequest
     }
 
 
-}
+}

app/Services/Internal/Destroy/AccountDestroyService.php

@@ -69,4 +69,4 @@ class AccountDestroyService
         return true;
     }
 
-}
+}

app/Services/Internal/Destroy/BillDestroyService.php

@@ -44,4 +44,4 @@ class BillDestroyService
         }
     }
 
-}
+}

app/Services/Internal/Destroy/JournalDestroyService.php

@@ -62,4 +62,4 @@ class JournalDestroyService
         return;
     }
 
-}
+}

app/Services/Internal/Support/AccountServiceTrait.php

@@ -394,4 +394,4 @@ trait AccountServiceTrait
 
         return false;
     }
-}
+}

app/Services/Internal/Support/BillServiceTrait.php

@@ -61,4 +61,4 @@ trait BillServiceTrait
         return true;
     }
 
-}
+}

app/Services/Internal/Support/JournalServiceTrait.php

@@ -130,4 +130,4 @@ trait JournalServiceTrait
         return;
 
     }
-}
+}

app/Services/Internal/Support/TransactionServiceTrait.php

@@ -267,4 +267,4 @@ trait TransactionServiceTrait
     }
 
 
-}
+}

app/Services/Internal/Update/AccountUpdateService.php

@@ -79,4 +79,4 @@ class AccountUpdateService
 
         return $account;
     }
-}
+}

app/Services/Internal/Update/BillUpdateService.php

@@ -66,4 +66,4 @@ class BillUpdateService
         return $bill;
     }
 
-}
+}

app/Services/Internal/Update/JournalUpdateService.php

@@ -166,4 +166,4 @@ class JournalUpdateService
         return $journal;
     }
 
-}
+}

app/Services/Internal/Update/TransactionUpdateService.php

@@ -159,4 +159,4 @@ class TransactionUpdateService
 
         return $transaction;
     }
-}
+}

app/Services/Spectre/Exception/DuplicatedCustomerException.php

@@ -29,4 +29,4 @@ namespace FireflyIII\Services\Spectre\Exception;
 class DuplicatedCustomerException extends SpectreException
 {
 
-}
+}

app/Services/Spectre/Exception/SpectreException.php

@@ -31,4 +31,4 @@ use Exception;
 class SpectreException extends Exception
 {
 
-}
+}

app/Services/Spectre/Object/Account.php

@@ -106,4 +106,4 @@ class Account extends SpectreObject
         return $array;
     }
 
-}
+}

app/Services/Spectre/Object/Attempt.php

@@ -205,4 +205,4 @@ class Attempt extends SpectreObject
     }
 
 
-}
+}

app/Services/Spectre/Object/Holder.php

@@ -45,4 +45,4 @@ class Holder extends SpectreObject
     {
         return [];
     }
-}
+}

app/Services/Spectre/Object/Login.php

@@ -143,4 +143,4 @@ class Login extends SpectreObject
     }
 
 
-}
+}

app/Services/Spectre/Object/Token.php

@@ -73,4 +73,4 @@ class Token extends SpectreObject
         return $this->token;
     }
 
-}
+}

app/Services/Spectre/Object/Transaction.php

@@ -185,4 +185,4 @@ class Transaction extends SpectreObject
     }
 
 
-}
+}

app/Services/Spectre/Object/TransactionExtra.php

@@ -166,4 +166,4 @@ class TransactionExtra extends SpectreObject
     }
 
 
-}
+}

app/Services/Spectre/Request/CreateTokenRequest.php

@@ -92,4 +92,4 @@ class CreateTokenRequest extends SpectreRequest
     }
 
 
-}
+}

app/Services/Spectre/Request/ListAccountsRequest.php

@@ -90,4 +90,4 @@ class ListAccountsRequest extends SpectreRequest
     }
 
 
-}
+}

app/Services/Spectre/Request/ListCustomersRequest.php

@@ -79,4 +79,4 @@ class ListCustomersRequest extends SpectreRequest
     }
 
 
-}
+}

app/Services/Spectre/Request/ListLoginsRequest.php

@@ -89,4 +89,4 @@ class ListLoginsRequest extends SpectreRequest
     }
 
 
-}
+}

app/Services/Spectre/Request/ListTransactionsRequest.php

@@ -91,4 +91,4 @@ class ListTransactionsRequest extends SpectreRequest
     }
 
 
-}
+}

app/Support/Import/Configuration/Spectre/HaveAccounts.php

@@ -153,4 +153,4 @@ class HaveAccounts implements ConfigurationInterface
 
         return $collection;
     }
-}
+}

app/Support/Preferences.php

@@ -156,6 +156,9 @@ class Preferences
         if (null !== $preference) {
             $lastActivity = $preference->data;
         }
+        if (is_array($lastActivity)) {
+            $lastActivity = implode(',', $lastActivity);
+        }
 
         return md5($lastActivity);
     }

app/TransactionRules/Actions/ClearBudget.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
 
@@ -55,6 +56,13 @@ class ClearBudget implements ActionInterface
     {
         $journal->budgets()->detach();
         $journal->touch();
+
+        // also remove categories from transactions:
+        /** @var Transaction $transaction */
+        foreach($journal->transactions as $transaction) {
+            $transaction->budgets()->detach();
+        }
+
         Log::debug(sprintf('RuleAction ClearBudget removed all budgets from journal %d.', $journal->id));
 
         return true;

app/TransactionRules/Actions/ClearCategory.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
 
@@ -55,6 +56,13 @@ class ClearCategory implements ActionInterface
     {
         $journal->categories()->detach();
         $journal->touch();
+
+        // also remove categories from transactions:
+        /** @var Transaction $transaction */
+        foreach($journal->transactions as $transaction) {
+            $transaction->categories()->detach();
+        }
+
         Log::debug(sprintf('RuleAction ClearCategory removed all categories from journal %d.', $journal->id));
 
         return true;

app/TransactionRules/Actions/SetBudget.php

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -87,7 +88,12 @@ class SetBudget implements ActionInterface
 
         Log::debug(sprintf('RuleAction SetBudget set the budget of journal #%d to budget #%d ("%s").', $journal->id, $budget->id, $budget->name));
 
-        $journal->budgets()->sync([$budget->id]);
+        $journal->budgets()->detach();
+        // set budget on transactions:
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions as $transaction) {
+            $transaction->budgets()->sync([$budget->id]);
+        }
         $journal->touch();
 
         return true;

app/TransactionRules/Actions/SetCategory.php

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\Category;
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
 
@@ -56,7 +57,16 @@ class SetCategory implements ActionInterface
     {
         $name     = $this->action->action_value;
         $category = Category::firstOrCreateEncrypted(['name' => $name, 'user_id' => $journal->user->id]);
-        $journal->categories()->sync([$category->id]);
+
+        $journal->categories()->detach();
+        // set category on transactions:
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions as $transaction) {
+            $transaction->categories()->sync([$category->id]);
+        }
+        $journal->touch();
+
+
         $journal->touch();
         Log::debug(sprintf('RuleAction SetCategory set the category of journal #%d to budget #%d ("%s").', $journal->id, $category->id, $category->name));
 

app/Transformers/AccountTransformer.php

@@ -240,4 +240,4 @@ class AccountTransformer extends TransformerAbstract
         return $result;
     }
 
-}
+}

app/Transformers/AttachmentTransformer.php

@@ -106,4 +106,4 @@ class AttachmentTransformer extends TransformerAbstract
         ];
     }
 
-}
+}

app/Transformers/BillTransformer.php

@@ -292,4 +292,4 @@ class BillTransformer extends TransformerAbstract
 
         return $simple->toArray();
     }
-}
+}

app/Transformers/BudgetTransformer.php

@@ -132,4 +132,4 @@ class BudgetTransformer extends TransformerAbstract
         return $data;
     }
 
-}
+}

app/Transformers/CategoryTransformer.php

@@ -131,4 +131,4 @@ class CategoryTransformer extends TransformerAbstract
         return $data;
     }
 
-}
+}

app/Transformers/JournalMetaTransformer.php

@@ -120,4 +120,4 @@ class JournalMetaTransformer extends TransformerAbstract
         return $data;
     }
 
-}
+}

app/Transformers/PiggyBankEventTransformer.php

@@ -145,4 +145,4 @@ class PiggyBankEventTransformer extends TransformerAbstract
         return $data;
     }
 
-}
+}

app/Transformers/PiggyBankTransformer.php

@@ -163,4 +163,4 @@ class PiggyBankTransformer extends TransformerAbstract
 
         return $data;
     }
-}
+}

app/Transformers/TagTransformer.php

@@ -137,4 +137,4 @@ class TagTransformer extends TransformerAbstract
         return $data;
     }
 
-}
+}

app/Transformers/TransactionTransformer.php

@@ -255,4 +255,4 @@ class TransactionTransformer extends TransformerAbstract
 
         return $data;
     }
-}
+}

app/Transformers/UserTransformer.php

@@ -205,4 +205,4 @@ class UserTransformer extends TransformerAbstract
         ];
     }
 
-}
+}

composer.json

@@ -113,7 +113,8 @@
 			"php artisan firefly:upgrade-database",
 			"php artisan firefly:verify",
 			"php artisan firefly:instructions update",
-			"php artisan optimize"
+			"php artisan optimize",
+			"php artisan passport:install"
 		],
 		"post-install-cmd": [
 			"php artisan optimize",

config/app.php

@@ -27,7 +27,7 @@ return [
     'env'             => env('APP_ENV', 'production'),
     'debug'           => env('APP_DEBUG', false),
     'url'             => env('APP_URL', 'http://localhost'),
-    'timezone'        => 'UTC',
+    'timezone'        => env('TZ', 'UTC'),
     'locale'          => 'en_US',
     'fallback_locale' => 'en_US',
     'key'             => env('APP_KEY'),

config/breadcrumbs.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

config/firefly.php

@@ -33,7 +33,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'     => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
-    'version'        => '4.7.1',
+    'version'        => '4.7.1.4',
     'api_version'    => '0.1',
     'maxUploadSize'  => 15242880,
     'allowedMimes'   => [

config/google2fa.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000004_create_oauth_clients_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

readme.md

@@ -47,14 +47,15 @@ You can read more about this in the [official documentation](http://firefly-iii.
 ### Features
 Most importantly...
 
-* Firefly III runs on your own server, so you are fully in control of your data. It will not contact other sites or servers
-* You can import from over 2500 financial providers, in 55 countries when you enable the [Spectre API](http://firefly-iii.readthedocs.io/en/latest/import/spectre.html)
-* You can import CSV files from practically any bank
+* Firefly III runs on your own server, so you are fully in control of your data. It will not contact other sites or servers.
+* You can import from over 2500 financial providers, in 55 countries when you enable the [Spectre API](http://firefly-iii.readthedocs.io/en/latest/import/spectre.html).
+* You can import CSV files from practically any bank.
+* Firefly III features an JSON REST API.
 * If you feel you’re missing something you can just ask me and I’ll add it!
 
 But actually, it features:
 
-* [A double-entry bookkeeping system](https://en.wikipedia.org/wiki/Double-entry_bookkeeping_system)
+* [A double-entry bookkeeping system](http://firefly-iii.readthedocs.io/en/latest/concepts/transactions.html)
 * You can store, edit and remove [withdrawals, deposits and transfers](http://firefly-iii.readthedocs.io/en/latest/concepts/transactions.html). This allows you full financial management
 * You can manage different types of accounts
   * [Asset](http://firefly-iii.readthedocs.io/en/latest/concepts/accounts.html) accounts

resources/assets/js/bootstrap.js

@@ -54,4 +54,4 @@ if (token) {
 //     encrypted: true
 // });
 
-/** Include font awesome */
+/** Include font awesome */

resources/assets/js/lang.js

@@ -27,4 +27,4 @@ const Lang = new lang({messages});
 Lang.setLocale(window.language);
 Lang.setFallback('en_US');
 
-export default Lang;
+export default Lang;

resources/lang/de_DE/components.php

@@ -27,4 +27,4 @@ return [
     // bills:
     'not_expected_period'    => 'Unerwarteter Zeitraum',
     'not_or_not_yet'         => '(Noch) nicht',
-];
+];