Merge branch 'release/4.8.1.2'

Fixes some small typos in the english translations

.deploy/docker/entrypoint.sh

@@ -12,6 +12,7 @@ mkdir -p $FIREFLY_PATH/storage/export
 mkdir -p $FIREFLY_PATH/storage/framework/cache/data
 mkdir -p $FIREFLY_PATH/storage/framework/sessions
 mkdir -p $FIREFLY_PATH/storage/framework/testing
+mkdir -p $FIREFLY_PATH/storage/framework/views/twig
 mkdir -p $FIREFLY_PATH/storage/framework/views/v1
 mkdir -p $FIREFLY_PATH/storage/framework/views/v2
 mkdir -p $FIREFLY_PATH/storage/logs
@@ -56,7 +57,7 @@ php artisan cache:clear
 php artisan migrate --seed
 php artisan firefly-iii:decrypt-all
 
-# there are 12 upgrade commands
+# there are 13 upgrade commands
 php artisan firefly-iii:transaction-identifiers
 php artisan firefly-iii:migrate-to-groups
 php artisan firefly-iii:account-currencies
@@ -69,8 +70,9 @@ php artisan firefly-iii:bl-currency
 php artisan firefly-iii:cc-liabilities
 php artisan firefly-iii:back-to-journals
 php artisan firefly-iii:rename-account-meta
+php artisan firefly-iii:migrate-recurrence-meta
 
-# there are 13 verify commands
+# there are 15 verify commands
 php artisan firefly-iii:fix-piggies
 php artisan firefly-iii:create-link-types
 php artisan firefly-iii:create-access-tokens
@@ -84,10 +86,13 @@ php artisan firefly-iii:delete-orphaned-transactions
 php artisan firefly-iii:delete-empty-groups
 php artisan firefly-iii:fix-account-types
 php artisan firefly-iii:rename-meta-fields
+php artisan firefly-iii:fix-ob-currencies
+php artisan firefly-iii:fix-long-descriptions
 
 # report commands
 php artisan firefly-iii:report-empty-objects
 php artisan firefly-iii:report-sum
+php artisan firefly-iii:restore-oauth-keys
 
 php artisan passport:install
 php artisan cache:clear

.deploy/heroku/.locales

@@ -1,14 +1,14 @@
 en_US
+cs_CZ
 es_ES
 de_DE
 fr_FR
-ro_RO
 it_IT
+nb_NO
 nl_NL
 pl_PL
 pt_BR
+ro_RO
 ru_RU
-nb_NO
-cs_CZ
-id_ID
 hu_HU
+el_GR

.env.example

@@ -39,12 +39,12 @@ APP_LOG_LEVEL=notice
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=mysql
+DB_CONNECTION=pgsql
-DB_HOST=127.0.0.1
+DB_HOST=firefly_iii_db
-DB_PORT=3306
+DB_PORT=5432
-DB_DATABASE=homestead
+DB_DATABASE=firefly
-DB_USERNAME=homestead
+DB_USERNAME=firefly
-DB_PASSWORD=secret
+DB_PASSWORD=secret_firefly_password
 
 # PostgreSQL supports SSL. You can configure it here.
 PGSQL_SSL_MODE=prefer
@@ -88,6 +88,8 @@ MAIL_ENCRYPTION=null
 # Other mail drivers:
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=
+# If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
+MAILGUN_ENDPOINT=api.mailgun.net
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -12,9 +12,6 @@ I am running Firefly III version x.x.x, and my problem is:
 **Steps to reproduce**
 <!-- What do you need to do to trigger this bug? -->
 
-**Expected behavior**
-<!-- What do you expect to see after those steps? -->
-
 **Extra info**
 <!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). -->
 
@@ -23,5 +20,4 @@ I am running Firefly III version x.x.x, and my problem is:
 
 - Post a stacktrace from your log files
 - Add a screenshot
-- Remember the human
 -->

.github/ISSUE_TEMPLATE/Custom.md

@@ -12,8 +12,6 @@ I am running Firefly III version x.x.x
 **Extra info**
 <!-- Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). --> 
 
-
-
 **Bonus points**
 <!-- Earn bonus points by:
 
@@ -21,5 +19,4 @@ I am running Firefly III version x.x.x
 - Make a drawing
 - Donate money (just kidding ;)
 - Replicate the problem on the demo site https://demo.firefly-iii.org/
-- Remember the human
 -->

.github/security.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest version of Firefly III is supported. If you're not running the latest version of Firefly III, please upgrade at your earliest convenience.  
+
+## Reporting a Vulnerability
+
+If you find something that compromises the security of Firefly III, you should [send me a message](mailto:thegrumpydictator@gmail.com) as soon as possible. These issues will be fixed immediately. You can also open an issue, but if you feel the issue is sensitive, please drop me a message instead.
+
+You can use my [GPG key](https://keybase.io/jc5) for extra security. My [GitHub commits](https://github.com/firefly-iii/firefly-iii/commits/master) are almost always signed with this key.
+

.sandstorm/changelog.md

@@ -1,3 +1,174 @@
+# 4.8.1.2
+
+Firefly III v4.8.1.2 and onwards are licensed under the GNU Affero General 
+Public License. This will not meaningfully change Firefly III. This 
+particular license has some extra provisions that protect web-applications
+such as this one. You can read the full license on the website of GNU.
+
+https://www.gnu.org/licenses/agpl-3.0.html
+
+### Added
+- [Issue 2589](https://github.com/firefly-iii/firefly-iii/issues/2589) Can now search using `created_on:2019-10-22` and `updated_on:2019-10-22`.
+- [Issue 2494](https://github.com/firefly-iii/firefly-iii/issues/2494) Add account balance to the dropdown.
+- [Issue 2603](https://github.com/firefly-iii/firefly-iii/issues/2603) New keywords for reports.
+- [Issue 2618](https://github.com/firefly-iii/firefly-iii/issues/2618) Page navigation in the footer of transaction lists.
+- Option in your profile to delete meta-data from your administration.
+- Add average to some reports.
+
+### Changed
+- [Issue 2593](https://github.com/firefly-iii/firefly-iii/issues/2593) The budget overview is now fully multi-currency.
+- [Issue 2613](https://github.com/firefly-iii/firefly-iii/issues/2613) Improved Mailgun configuration options.
+- [Issue 2510](https://github.com/firefly-iii/firefly-iii/issues/2510) Maximum transaction description length is 1000 now.
+- [Issue 2616](https://github.com/firefly-iii/firefly-iii/issues/2616) Docker instances should remember their OAuth tokens and keys better (even after a restart)
+- [Issue 2675](https://github.com/firefly-iii/firefly-iii/issues/2675) Some spelling in the English is fixed.
+
+### Removed
+- [Issue 2677](https://github.com/firefly-iii/firefly-iii/issues/2677) Superfluous help popup.
+
+### Fixed
+- [Issue 2572](https://github.com/firefly-iii/firefly-iii/issues/2572) Sometimes users would get 404's after deleting stuff. 
+- [Issue 2587](https://github.com/firefly-iii/firefly-iii/issues/2587) Users would be redirected to JSON endpoints.
+- [Issue 2596](https://github.com/firefly-iii/firefly-iii/issues/2596) Could not remove the last tag from a transaction.
+- [Issue 2598](https://github.com/firefly-iii/firefly-iii/issues/2598) Fix an issue where foreign amounts were displayed incorrectly.
+- [Issue 2599](https://github.com/firefly-iii/firefly-iii/issues/2599) Could add negative amounts to piggy banks and game the system.
+- [Issue 2560](https://github.com/firefly-iii/firefly-iii/issues/2560) Search supports møre chäracters.
+- [Issue 2626](https://github.com/firefly-iii/firefly-iii/issues/2626) Budgets would display amounts with too many decimals.
+- [Issue 2629](https://github.com/firefly-iii/firefly-iii/issues/2629) [issue 2639](https://github.com/firefly-iii/firefly-iii/issues/2639) [issue 2640](https://github.com/firefly-iii/firefly-iii/issues/2640) [issue 2643](https://github.com/firefly-iii/firefly-iii/issues/2643) Line-breaks were not properly rendered in markdown.
+- [Issue 2623](https://github.com/firefly-iii/firefly-iii/issues/2623) Budget spent line would make the start of the month twice.
+- [Issue 2624](https://github.com/firefly-iii/firefly-iii/issues/2624) Editing a budget would redirect you to the wrong page.
+- [Issue 2633](https://github.com/firefly-iii/firefly-iii/issues/2633) New transaction form sorts budgets wrong.
+- [Issue 2567](https://github.com/firefly-iii/firefly-iii/issues/2567) Could not unlink bills.
+- [Issue 2647](https://github.com/firefly-iii/firefly-iii/issues/2647) Date issue in category overview
+- [Issue 2657](https://github.com/firefly-iii/firefly-iii/issues/2657) Possible fix for issue with transaction overview.
+- [Issue 2658](https://github.com/firefly-iii/firefly-iii/issues/2658) Fixed overview of recurring transactions.
+- [Issue 2480](https://github.com/firefly-iii/firefly-iii/issues/2480) SQLite can't handle a lot of variables so big update queries are now executed in chunks.
+- [Issue 2683](https://github.com/firefly-iii/firefly-iii/issues/2683) Link to the wrong transaction.
+
+
+### Security
+- [Issue 2687](https://github.com/firefly-iii/firefly-iii/issues/2687) Budget overview shows budget limit totals for all users, not just the logged-in user.
+
+### API
+- [Issue 2609](https://github.com/firefly-iii/firefly-iii/issues/2609) Summary endpoint would not always give the correct results.
+- [Issue 2638](https://github.com/firefly-iii/firefly-iii/issues/2638) Link to correct journal in API.
+- [Issue 2606](https://github.com/firefly-iii/firefly-iii/issues/2606) Budget endpoint gave error.
+- [Issue 2637](https://github.com/firefly-iii/firefly-iii/issues/2637) Transaction / piggy bank event endpoint now returns results.
+- An undocumented end point that allows you to search for accounts. Still a bit experimental.
+  Use: /api/v1/search/accounts?query=something&field=all (all,iban,id,number)
+
+# 4.8.1.1
+
+- Add some sensible maximum amounts to form inputs.
+- [Issue 2561](https://github.com/firefly-iii/firefly-iii/issues/2561) Fixes a query error on the /tags page that affected some MySQL users.
+- [Issue 2563](https://github.com/firefly-iii/firefly-iii/issues/2563) Two destination fields when editing a recurring transaction.
+- [Issue 2564](https://github.com/firefly-iii/firefly-iii/issues/2564) Ability to browse pages in the search results.
+- [Issue 2573](https://github.com/firefly-iii/firefly-iii/issues/2573) Could not submit an transaction update after an error was corrected.
+- [Issue 2577](https://github.com/firefly-iii/firefly-iii/issues/2577) Upgrade routine would wrongly store the categories of split transactions.
+- [Issue 2590](https://github.com/firefly-iii/firefly-iii/issues/2590) Fix an issue in the audit report.
+- [Issue 2592](https://github.com/firefly-iii/firefly-iii/issues/2592) Fix an issue with YNAB import.
+- [Issue 2597](https://github.com/firefly-iii/firefly-iii/issues/2597) Fix an issue where users could not delete currencies.
+
+# 4.8.1 (API 0.10.2)
+
+- Firefly III 4.8.1 requires PHP 7.3.
+- Support for Greek
+- [Issue 2383](https://github.com/firefly-iii/firefly-iii/issues/2383) Some tables in reports now also report percentages.
+- [Issue 2389](https://github.com/firefly-iii/firefly-iii/issues/2389) Add category / budget information to transaction lists.
+- [Issue 2464](https://github.com/firefly-iii/firefly-iii/issues/2464) Can now search for tag.
+- [Issue 2466](https://github.com/firefly-iii/firefly-iii/issues/2466) Can order recurring transactions in a more useful manner.
+- [Issue 2497](https://github.com/firefly-iii/firefly-iii/issues/2497) Transaction creation moment in hover of tag title.
+- [Issue 2471](https://github.com/firefly-iii/firefly-iii/issues/2471) Added date tag to table cells.
+- [Issue 2291](https://github.com/firefly-iii/firefly-iii/issues/2291) All reports are now properly multi-currency.
+- [Issue 2481](https://github.com/firefly-iii/firefly-iii/issues/2481) As part of the removal of local encryption, uploads and imports are no longer encrypted.
+- [Issue 2495](https://github.com/firefly-iii/firefly-iii/issues/2495) A better message of transaction submission.
+- [Issue 2506](https://github.com/firefly-iii/firefly-iii/issues/2506) Some bugs in tag report fixed.
+- [Issue 2510](https://github.com/firefly-iii/firefly-iii/issues/2510) All transaction descriptions cut off at 255 chars.
+- Better sum in bill view.
+- Clean up docker files for flawless operation.
+- The bunq API has changed, and support for bunq has been disabled.
+- [Issue 2470](https://github.com/firefly-iii/firefly-iii/issues/2470) Bad links for transactions.
+- [Issue 2480](https://github.com/firefly-iii/firefly-iii/issues/2480) Large queries would break in SQLite.
+- [Issue 2484](https://github.com/firefly-iii/firefly-iii/issues/2484) Transaction description auto-complete.
+- [Issue 2487](https://github.com/firefly-iii/firefly-iii/issues/2487) Fix issues with FinTS
+- [Issue 2488](https://github.com/firefly-iii/firefly-iii/issues/2488) 404 after deleting a tag.
+- [Issue 2490](https://github.com/firefly-iii/firefly-iii/issues/2490) "Reset form after submission" doesn't work.
+- [Issue 2492](https://github.com/firefly-iii/firefly-iii/issues/2492) After submitting and fixing an error, the error is persistent.
+- [Issue 2493](https://github.com/firefly-iii/firefly-iii/issues/2493) Auto detect transaction type is a bit better now.
+- [Issue 2498](https://github.com/firefly-iii/firefly-iii/issues/2498) Pressing enter in some fields breaks the form.
+- [Issue 2499](https://github.com/firefly-iii/firefly-iii/issues/2499) Auto-complete issues in transaction link form.
+- [Issue 2500](https://github.com/firefly-iii/firefly-iii/issues/2500) Issue when submitting edited transactions.
+- [Issue 2501](https://github.com/firefly-iii/firefly-iii/issues/2501) Better error messages for empty submissions.
+- [Issue 2508](https://github.com/firefly-iii/firefly-iii/issues/2508) Can remove category from transaction.
+- [Issue 2516](https://github.com/firefly-iii/firefly-iii/issues/2516) Can no longer import transactions with no amount.
+- [Issue 2518](https://github.com/firefly-iii/firefly-iii/issues/2518) Link in balance box goes to current period.
+- [Issue 2521](https://github.com/firefly-iii/firefly-iii/issues/2521) Foreign transaction currency is hidden when the user hasn't enabled foreign currencies.
+- [Issue 2522](https://github.com/firefly-iii/firefly-iii/issues/2522) Some reports were missing the "overspent" field.
+- [Issue 2526](https://github.com/firefly-iii/firefly-iii/issues/2526) It was impossible to remove the budget of a transaction.
+- [Issue 2527](https://github.com/firefly-iii/firefly-iii/issues/2527) Some bulk edits were buggy.
+- [Issue 2539](https://github.com/firefly-iii/firefly-iii/issues/2539) Fixed a typo.
+- [Issue 2545](https://github.com/firefly-iii/firefly-iii/issues/2545) Deleted tags would still show up.
+- [Issue 2547](https://github.com/firefly-iii/firefly-iii/issues/2547) Changing the opening balance to 0 will now remove it.
+- [Issue 2549](https://github.com/firefly-iii/firefly-iii/issues/2549) Can now clone transactions again.
+- [Issue 2550](https://github.com/firefly-iii/firefly-iii/issues/2550) Added missing locales for moment.js
+- [Issue 2553](https://github.com/firefly-iii/firefly-iii/issues/2553) Fixed an issue with split transactions.
+- [Issue 2555](https://github.com/firefly-iii/firefly-iii/issues/2555) Better error for when you submit the same account twice.
+- [Issue 2439](https://github.com/firefly-iii/firefly-iii/issues/2439) SQL error in API post new user
+- ... and many other bugs.
+- [Issue 2475](https://github.com/firefly-iii/firefly-iii/issues/2475) Tags are now the same for all views.
+- [Issue 2476](https://github.com/firefly-iii/firefly-iii/issues/2476) Amount is now represented equally in all views.
+- [Issue 2477](https://github.com/firefly-iii/firefly-iii/issues/2477) Rules are easier to update.
+- [Issue 2483](https://github.com/firefly-iii/firefly-iii/issues/2483) Several consistencies fixed.
+- [Issue 2484](https://github.com/firefly-iii/firefly-iii/issues/2484) Transaction link view fixed.
+- [Issue 2557](https://github.com/firefly-iii/firefly-iii/issues/2557) Fix for issue in summary API
+- No longer have to submit mandatory fields to account end point. Just submit the field you wish to update, the rest will be untouched.
+- Rules will no longer list the "user-action" trigger Rules will have a "moment" field that says either "update-journal" or "store-journal".
+
+# 4.8.0.3 (API 0.10.1)
+
+- Autocomplete for transaction description.
+- [Issue 2438](https://github.com/firefly-iii/firefly-iii/issues/2438) Some balance issues when working with multiple currencies (a known issue)
+- [Issue 2425](https://github.com/firefly-iii/firefly-iii/issues/2425) Transaction edit/create form is weird with the enter button
+- [Issue 2424](https://github.com/firefly-iii/firefly-iii/issues/2424) auto complete tab doesn't work.
+- [Issue 2441](https://github.com/firefly-iii/firefly-iii/issues/2441) Inconsistent character limit for currencies.
+- [Issue 2443](https://github.com/firefly-iii/firefly-iii/issues/2443) 500 error when submitting budgets
+- [Issue 2446](https://github.com/firefly-iii/firefly-iii/issues/2446) Can't update current amount for piggy bank
+- [Issue 2440](https://github.com/firefly-iii/firefly-iii/issues/2440) Errors when interacting with recurring transactions
+- [Issue 2439](https://github.com/firefly-iii/firefly-iii/issues/2439) SQL error in API post new user
+- Transaction report (after import, over email) is mostly empty
+- Mass edit checkboxes doesn't work in a tag overview
+- [Issue 2437](https://github.com/firefly-iii/firefly-iii/issues/2437) CPU issues when viewing accounts, probably run-away queries.
+- [Issue 2432](https://github.com/firefly-iii/firefly-iii/issues/2432) Can't disable all currencies except one / can't disable EUR and switch to something else.
+- Option to edit the budget is gone from edit transaction form.
+- [Issue 2453](https://github.com/firefly-iii/firefly-iii/issues/2453) Search view things
+- [Issue 2449](https://github.com/firefly-iii/firefly-iii/issues/2449) Can't add invoice date.
+- [Issue 2448](https://github.com/firefly-iii/firefly-iii/issues/2448) Bad link in transaction overview
+- [Issue 2447](https://github.com/firefly-iii/firefly-iii/issues/2447) Bad link in bill overview
+- Improvements to various API end-points. Docs are updated.
+
+# 4.8.0.2 (API 0.10.0)
+
+- [Issue 2203](https://github.com/firefly-iii/firefly-iii/issues/2203) Reconciliation inconsistencies.
+- [Issue 2392](https://github.com/firefly-iii/firefly-iii/issues/2392) Bad namespace leads to installation errors.
+- [Issue 2393](https://github.com/firefly-iii/firefly-iii/issues/2393) Missing budget selector.
+- [Issue 2402](https://github.com/firefly-iii/firefly-iii/issues/2402) bad amounts in default report
+- [Issue 2405](https://github.com/firefly-iii/firefly-iii/issues/2405) Due date can't be edited.
+- [Issue 2404](https://github.com/firefly-iii/firefly-iii/issues/2404) bad page indicator in the "no category" transaction overview.
+- [Issue 2407](https://github.com/firefly-iii/firefly-iii/issues/2407) Fix recurring transaction dates
+- [Issue 2410](https://github.com/firefly-iii/firefly-iii/issues/2410) Transaction links inconsistent
+- [Issue 2414](https://github.com/firefly-iii/firefly-iii/issues/2414) Can't edit recurring transactions
+- [Issue 2415](https://github.com/firefly-iii/firefly-iii/issues/2415) Return here + reset form results in empty transaction form
+- [Issue 2416](https://github.com/firefly-iii/firefly-iii/issues/2416) Some form inconsistencies.
+- [Issue 2418](https://github.com/firefly-iii/firefly-iii/issues/2418) Reports are inaccurate or broken.
+- [Issue 2422](https://github.com/firefly-iii/firefly-iii/issues/2422) PHP error when matching transactions.
+- [Issue 2423](https://github.com/firefly-iii/firefly-iii/issues/2423) Reports are inaccurate or broken.
+- [Issue 2426](https://github.com/firefly-iii/firefly-iii/issues/2426) Inconsistent documentation and instructions.
+- [Issue 2427](https://github.com/firefly-iii/firefly-iii/issues/2427) Deleted account and "initial balance" accounts may appear in dropdowns.
+- [Issue 2428](https://github.com/firefly-iii/firefly-iii/issues/2428) Reports are inaccurate or broken. 
+- [Issue 2429](https://github.com/firefly-iii/firefly-iii/issues/2429) Typo leads to SQL errors in available budgets API
+- [Issue 2431](https://github.com/firefly-iii/firefly-iii/issues/2431) Issues creating new recurring transactions.
+- [Issue 2434](https://github.com/firefly-iii/firefly-iii/issues/2434) You can edit the initial balance transaction but it fails to save.
+- ARM build should work now.
+
 # 4.8.0.1 (API 0.10.0)
 
 - The balance box on the dashboard shows only negative numbers, skewing the results.
@@ -158,7 +329,7 @@
 - [Issue 2009](https://github.com/firefly-iii/firefly-iii/issues/2009) Could not change recurrence back to "forever".
 - [Issue 2033](https://github.com/firefly-iii/firefly-iii/issues/2033) Longitude can go from -180 to 180.
 - [Issue 2034](https://github.com/firefly-iii/firefly-iii/issues/2034) Rules were not being triggered in mass-edit.
-- #2043 In rare instances the repetition of a recurring transaction was displayed incorrectly.
+- [Issue 2043](https://github.com/firefly-iii/firefly-iii/issues/2043) In rare instances the repetition of a recurring transaction was displayed incorrectly.
 - Fixed broken translations in the recurring transactions overview.
 - When you create a recurring transfer you make make it fill (or empty) a piggy bank. This was not working, despite a fix in 4.7.8.
 - Fixed a bug where the importer would not be capable of creating new currencies.

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 33,
+    appVersion = 38,
-    appMarketingVersion = (defaultText = "4.8.0.1"),
+    appMarketingVersion = (defaultText = "4.8.1.2"),
 
     actions = [
       # Define your "new document" handlers here.

.sandstorm/setup.sh

@@ -29,6 +29,7 @@ sed -i 's/# ro_RO.UTF-8 UTF-8/ro_RO.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# cs_CZ.UTF-8 UTF-8/cs_CZ.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# id_ID.UTF-8 UTF-8/id_ID.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# hu_HU.UTF-8 UTF-8/hu_HU.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# el_GR.UTF-8 UTF-8/el_GR.UTF-8 UTF-8/g' /etc/locale.gen
 
 dpkg-reconfigure --frontend=noninteractive locales
 

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: bash
 env:
-  - VERSION=4.8.0.1
+  - VERSION=4.8.1.2
 
 dist: xenial
 

COPYING

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

Dockerfile

@@ -1,28 +1,10 @@
-FROM php:7.2-apache
+FROM jc5x/firefly-iii-base-image:latest
 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
 LABEL version="1.5" maintainer="thegrumpydictator@gmail.com"
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
-# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer
-RUN apt-get update && apt-get install -y locales unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ADD https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/
-
-RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \
-    install-php-extensions --cleanup bcmath ldap gd pdo_pgsql pdo_sqlite pdo_mysql intl opcache memcached
-
-RUN a2enmod rewrite && a2enmod ssl
-RUN echo "hu_HU.UTF-8 UTF-8\nro_RO.UTF-8 UTF-8\nnb_NO.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\ncs_CZ.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen
-RUN locale-gen
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# configure PHP
-RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
-    sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \
-    sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
-
 # Copy in Firefly III source
 WORKDIR $FIREFLY_PATH
 ADD . $FIREFLY_PATH
@@ -32,15 +14,6 @@ RUN chown -R www-data:www-data /var/www && \
     chmod -R 775 $FIREFLY_PATH/storage && \
     composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
-# copy ca certs to correct location
-COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem
-
-# copy Apache config to correct spot.
-COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
-
-# Enable default site (Firefly III)
-COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-
 # Expose port 80
 EXPOSE 80
 

Dockerfile.amd64

@@ -1,29 +1,10 @@
-FROM php:7.2-apache
+FROM jc5x/firefly-iii-base-image:latest
-ARG ARCH
 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
 LABEL version="1.5" maintainer="thegrumpydictator@gmail.com"
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
-# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer
-RUN apt-get update && apt-get install -y locales unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ADD https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/
-
-RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \
-    install-php-extensions --cleanup bcmath ldap gd pdo_pgsql pdo_sqlite pdo_mysql intl opcache memcached
-
-RUN a2enmod rewrite && a2enmod ssl
-RUN echo "hu_HU.UTF-8 UTF-8\nro_RO.UTF-8 UTF-8\nnb_NO.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\ncs_CZ.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen
-RUN locale-gen
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# configure PHP
-RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
-    sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \
-    sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
-
 # Copy in Firefly III source
 WORKDIR $FIREFLY_PATH
 ADD . $FIREFLY_PATH
@@ -33,15 +14,6 @@ RUN chown -R www-data:www-data /var/www && \
     chmod -R 775 $FIREFLY_PATH/storage && \
     composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
-# copy ca certs to correct location
-COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem
-
-# copy Apache config to correct spot.
-COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
-
-# Enable default site (Firefly III)
-COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-
 # Expose port 80
 EXPOSE 80
 

Dockerfile.arm

@@ -1,25 +1,10 @@
-FROM arm32v7/php:7.2-apache-stretch
+FROM jc5x/firefly-iii-base-image:latest-arm
-ARG ARCH
-COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
 LABEL version="1.5" maintainer="thegrumpydictator@gmail.com"
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
-# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer
-RUN apt-get update && apt-get install -y locales unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ADD https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/
-
-RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \
-    install-php-extensions --cleanup bcmath ldap gd pdo_pgsql pdo_sqlite pdo_mysql intl opcache memcached
-
-RUN a2enmod rewrite && a2enmod ssl
-RUN echo "hu_HU.UTF-8 UTF-8\nro_RO.UTF-8 UTF-8\nnb_NO.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\ncs_CZ.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen
-RUN locale-gen
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
 # Copy in Firefly III source
 WORKDIR $FIREFLY_PATH
 ADD . $FIREFLY_PATH
@@ -29,15 +14,6 @@ RUN chown -R www-data:www-data /var/www && \
     chmod -R 775 $FIREFLY_PATH/storage && \
     composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
-# copy ca certs to correct location
-COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem
-
-# copy Apache config to correct spot.
-COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
-
-# Enable default site (Firefly III)
-COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-
 # Expose port 80
 EXPOSE 80
 

LICENSE

@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
+  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works.
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users.
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
+  Developers that use our General Public Licenses protect your rights
-these rights or asking you to surrender the rights.  Therefore, you have
+with two steps: (1) assert copyright on the software, and (2) offer
-certain responsibilities if you distribute copies of the software, or if
+you this License which gives you legal permission to copy, distribute
-you modify it: responsibilities to respect the freedom of others.
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
+  A secondary benefit of defending all users' freedom is that
-gratis or for a fee, you must pass on to the recipients the same
+improvements made in alternate versions of the program, if they
-freedoms that you received.  You must make sure that they, too, receive
+receive widespread use, become available for other developers to
-or can get the source code.  And you must show them these terms so they
+incorporate.  Many developers of free software are heartened and
-know their rights.
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
+  The GNU Affero General Public License is designed specifically to
-(1) assert copyright on the software, and (2) offer you this License
+ensure that, in such cases, the modified source code becomes available
-giving you legal permission to copy, distribute and/or modify it.
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
+  An older license, called the Affero General Public License and
-that there is no warranty for this free software.  For both users' and
+published by Affero, was designed to accomplish similar goals.  This is
-authors' sake, the GPL requires that modified versions be marked as
+a different license, not a version of the Affero GPL, but Affero has
-changed, so that their problems will not be attributed erroneously to
+released a new version of the Affero GPL which permits relicensing under
-authors of previous versions.
+this license.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
+but the work with which it is combined will remain governed by version
-section 13, concerning interaction through a network will apply to the
+3 of the GNU General Public License.
-combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+the GNU Affero General Public License from time to time.  Such new versions
-be similar in spirit to the present version, but may differ in detail to
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    it under the terms of the GNU Affero General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program 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.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
+  If your software can interact with users remotely through a computer
-notice like this when it starts in an interactive mode:
+network, you should also make sure that it provides a way for users to
-
+get its source.  For example, if your program is a web application, its
-    <program>  Copyright (C) <year>  <name of author>
+interface could display a "Source" link that leads users to an archive
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+of the code.  There are many ways you could offer source, and different
-    This is free software, and you are welcome to redistribute it
+solutions will be better for different programs; see section 13 for the
-    under certain conditions; type `show c' for details.
+specific requirements.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

app/Api/V1/Controllers/AboutController.php

@@ -2,22 +2,22 @@
 
 /**
  * AboutController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -27,13 +27,11 @@ namespace FireflyIII\Api\V1\Controllers;
 use DB;
 use FireflyIII\Transformers\UserTransformer;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use League\Fractal\Manager;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Returns basic information about this installation.
+ *
  * @codeCoverageIgnore
  * Class AboutController.
  */
@@ -68,14 +66,11 @@ class AboutController extends Controller
     /**
      * Returns information about the user.
      *
-     * @param Request $request
      * @return JsonResponse
      */
-    public function user(Request $request): JsonResponse
+    public function user(): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var UserTransformer $transformer */
         $transformer = app(UserTransformer::class);

app/Api/V1/Controllers/AccountController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * AccountController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -38,16 +38,13 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class AccountController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AccountController extends Controller
 {
@@ -101,11 +98,7 @@ class AccountController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
-        // read type from URI
         $type    = $request->get('type') ?? 'all';
         $this->parameters->set('type', $type);
 
@@ -122,8 +115,6 @@ class AccountController extends Controller
         $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
@@ -139,18 +130,16 @@ class AccountController extends Controller
     /**
      * List all piggies.
      *
-     * @param Request $request
      * @param Account $account
      *
+     * @return JsonResponse
      * @codeCoverageIgnore
      *
-     * @return JsonResponse
      */
-    public function piggyBanks(Request $request, Account $account): JsonResponse
+    public function piggyBanks(Account $account): JsonResponse
     {
         // create some objects:
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -164,9 +153,6 @@ class AccountController extends Controller
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -181,16 +167,13 @@ class AccountController extends Controller
     /**
      * Show single instance.
      *
-     * @param Request $request
      * @param Account $account
      *
      * @return JsonResponse
      */
-    public function show(Request $request, Account $account): JsonResponse
+    public function show(Account $account): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
@@ -211,9 +194,7 @@ class AccountController extends Controller
     {
         $data    = $request->getAllAccountData();
         $account = $this->repository->store($data);
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
@@ -234,8 +215,6 @@ class AccountController extends Controller
      *
      * @return JsonResponse
      *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function transactions(Request $request, Account $account): JsonResponse
     {
@@ -250,9 +229,7 @@ class AccountController extends Controller
         }
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var User $admin */
         $admin = auth()->user();
@@ -292,12 +269,10 @@ class AccountController extends Controller
      */
     public function update(AccountUpdateRequest $request, Account $account): JsonResponse
     {
-        $data         = $request->getAllAccountData();
+        $data         = $request->getUpdateData();
         $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $this->repository->update($account, $data);
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);

app/Api/V1/Controllers/AttachmentController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * AttachmentController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -35,17 +35,14 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 use function strlen;
 
 /**
  * Class AttachmentController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AttachmentController extends Controller
 {
@@ -54,6 +51,7 @@ class AttachmentController extends Controller
 
     /**
      * AccountController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -73,7 +71,9 @@ class AttachmentController extends Controller
 
     /**
      * Remove the specified resource from storage.
+     *
      * @codeCoverageIgnore
+     *
      * @param Attachment $attachment
      *
      * @return JsonResponse
@@ -89,6 +89,7 @@ class AttachmentController extends Controller
      * Download an attachment.
      *
      * @param Attachment $attachment
+     *
      * @codeCoverageIgnore
      * @return LaravelResponse
      * @throws   FireflyException
@@ -123,15 +124,12 @@ class AttachmentController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     * @codeCoverageIgnore
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -145,9 +143,6 @@ class AttachmentController extends Controller
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.attachments.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -161,16 +156,13 @@ class AttachmentController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param Request $request
      * @param Attachment $attachment
+     *
      * @return JsonResponse
      */
-    public function show(Request $request, Attachment $attachment): JsonResponse
+    public function show(Attachment $attachment): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -192,9 +184,7 @@ class AttachmentController extends Controller
     {
         $data       = $request->getAll();
         $attachment = $this->repository->store($data);
-        $manager    = new Manager;
+        $manager    = $this->getManager();
-        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -217,9 +207,7 @@ class AttachmentController extends Controller
     {
         $data = $request->getAll();
         $this->repository->update($attachment, $data);
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -232,7 +220,9 @@ class AttachmentController extends Controller
 
     /**
      * Upload an attachment.
+     *
      * @codeCoverageIgnore
+     *
      * @param Request    $request
      * @param Attachment $attachment
      *

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * AvailableBudgetController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -27,27 +27,23 @@ use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
 use FireflyIII\Factory\TransactionCurrencyFactory;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Transformers\AvailableBudgetTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class AvailableBudgetController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AvailableBudgetController extends Controller
 {
-    /** @var BudgetRepositoryInterface The budget repository */
+    /** @var AvailableBudgetRepositoryInterface */
-    private $repository;
+    private $abRepository;
 
     /**
      * AvailableBudgetController constructor.
@@ -61,8 +57,8 @@ class AvailableBudgetController extends Controller
             function ($request, $next) {
                 /** @var User $user */
                 $user               = auth()->user();
-                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->abRepository->setUser($user);
 
                 return $next($request);
             }
@@ -80,7 +76,7 @@ class AvailableBudgetController extends Controller
      */
     public function delete(AvailableBudget $availableBudget): JsonResponse
     {
-        $this->repository->destroyAvailableBudget($availableBudget);
+        $this->abRepository->destroyAvailableBudget($availableBudget);
 
         return response()->json([], 204);
     }
@@ -88,16 +84,12 @@ class AvailableBudgetController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -106,7 +98,7 @@ class AvailableBudgetController extends Controller
         $end   = $this->parameters->get('end');
 
         // get list of available budgets. Count it and split it.
-        $collection       = $this->repository->getAvailableBudgetsByDate($start, $end);
+        $collection       = $this->abRepository->getAvailableBudgetsByDate($start, $end);
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
@@ -114,9 +106,6 @@ class AvailableBudgetController extends Controller
         $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.available_budgets.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -130,17 +119,14 @@ class AvailableBudgetController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param Request $request
      * @param AvailableBudget $availableBudget
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, AvailableBudget $availableBudget): JsonResponse
+    public function show(AvailableBudget $availableBudget): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
@@ -168,10 +154,9 @@ class AvailableBudgetController extends Controller
         if (null === $currency) {
             $currency = app('amount')->getDefaultCurrency();
         }
-        $availableBudget = $this->repository->setAvailableBudget($currency, $data['start'], $data['end'], $data['amount']);
+        $data['currency'] = $currency;
-        $manager         = new Manager;
+        $availableBudget  = $this->abRepository->store($data);
-        $baseUrl         = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager          = $this->getManager();
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
@@ -210,10 +195,8 @@ class AvailableBudgetController extends Controller
         $data['currency_id'] = $currency->id;
 
 
-        $this->repository->updateAvailableBudget($availableBudget, $data);
+        $this->abRepository->updateAvailableBudget($availableBudget, $data);
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);

app/Api/V1/Controllers/BillController.php

@@ -2,22 +2,22 @@
 
 /**
  * BillController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -38,17 +38,13 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class BillController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BillController extends Controller
 {
@@ -81,18 +77,14 @@ class BillController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
      * @param Bill $bill
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function attachments(Request $request, Bill $bill): JsonResponse
+    public function attachments(Bill $bill): JsonResponse
     {
-        $manager = new Manager();
+        $manager    = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAttachments($bill);
 
@@ -103,9 +95,6 @@ class BillController extends Controller
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -134,21 +123,17 @@ class BillController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
+        $bills     = $this->repository->getBills();
+        $manager   = $this->getManager();
         $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $paginator = $this->repository->getPaginator($pageSize);
+        $count     = $bills->count();
-        /** @var Collection $bills */
+        $bills     = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $bills = $paginator->getCollection();
+        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
-
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
@@ -163,17 +148,14 @@ class BillController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
      * @param Bill $bill
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function rules(Request $request, Bill $bill): JsonResponse
+    public function rules(Bill $bill): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -187,9 +169,6 @@ class BillController extends Controller
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.bills.rules', [$bill->id]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -205,18 +184,14 @@ class BillController extends Controller
     /**
      * Show the specified bill.
      *
-     * @param Request $request
      * @param Bill $bill
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, Bill $bill): JsonResponse
+    public function show(Bill $bill): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -238,9 +213,7 @@ class BillController extends Controller
     {
         $bill = $this->repository->store($request->getAll());
         if (null !== $bill) {
-            $manager = new Manager();
+            $manager = $this->getManager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
             /** @var BillTransformer $transformer */
             $transformer = app(BillTransformer::class);
@@ -271,9 +244,7 @@ class BillController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var User $admin */
         $admin = auth()->user();
@@ -326,9 +297,7 @@ class BillController extends Controller
     {
         $data    = $request->getAll();
         $bill    = $this->repository->update($bill, $data);
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);

app/Api/V1/Controllers/BudgetController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * BudgetController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\BudgetRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\BudgetLimitTransformer;
@@ -38,20 +39,19 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class BudgetController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BudgetController extends Controller
 {
     use TransactionFilter;
+    /** @var BudgetLimitRepositoryInterface */
+    private $blRepository;
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
@@ -68,9 +68,10 @@ class BudgetController extends Controller
                 /** @var User $admin */
                 $admin = auth()->user();
 
-                /** @var BudgetRepositoryInterface repository */
                 $this->repository   = app(BudgetRepositoryInterface::class);
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
                 $this->repository->setUser($admin);
+                $this->blRepository->setUser($admin);
 
                 return $next($request);
             }
@@ -80,27 +81,22 @@ class BudgetController extends Controller
     /**
      * Display a listing of the resource.
      *
-     *
-     * @param Request $request
      * @param Budget $budget
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function budgetLimits(Request $request, Budget $budget): JsonResponse
+    public function budgetLimits(Budget $budget): JsonResponse
     {
-        $manager  = new Manager;
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $this->parameters->set('budget_id', $budget->id);
-        $collection   = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
+        $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]) . $this->buildParams());
 
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -130,16 +126,12 @@ class BudgetController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -153,9 +145,6 @@ class BudgetController extends Controller
         $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BudgetTransformer $transformer */
         $transformer = app(BudgetTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -169,17 +158,14 @@ class BudgetController extends Controller
     /**
      * Show a budget.
      *
-     * @param Request $request
      * @param Budget $budget
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, Budget $budget): JsonResponse
+    public function show(Budget $budget): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BudgetTransformer $transformer */
         $transformer = app(BudgetTransformer::class);
@@ -203,9 +189,7 @@ class BudgetController extends Controller
     {
         $budget = $this->repository->store($request->getAll());
         if (null !== $budget) {
-            $manager = new Manager();
+            $manager = $this->getManager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
             /** @var BudgetTransformer $transformer */
             $transformer = app(BudgetTransformer::class);
@@ -223,6 +207,7 @@ class BudgetController extends Controller
      *
      * @param BudgetLimitRequest $request
      * @param Budget             $budget
+     *
      * @return JsonResponse
      * @throws Exception
      */
@@ -230,10 +215,8 @@ class BudgetController extends Controller
     {
         $data           = $request->getAll();
         $data['budget'] = $budget;
-        $budgetLimit    = $this->repository->storeBudgetLimit($data);
+        $budgetLimit    = $this->blRepository->storeBudgetLimit($data);
-        $manager        = new Manager;
+        $manager        = $this->getManager();
-        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -268,9 +251,7 @@ class BudgetController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var User $admin */
         $admin = auth()->user();
@@ -322,9 +303,7 @@ class BudgetController extends Controller
     {
         $data    = $request->getAll();
         $budget  = $this->repository->update($budget, $data);
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BudgetTransformer $transformer */
         $transformer = app(BudgetTransformer::class);

app/Api/V1/Controllers/BudgetLimitController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * BudgetLimitController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\BudgetLimitTransformer;
@@ -37,20 +38,19 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class BudgetLimitController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BudgetLimitController extends Controller
 {
     use TransactionFilter;
+    /** @var BudgetLimitRepositoryInterface */
+    private $blRepository;
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
@@ -67,7 +67,9 @@ class BudgetLimitController extends Controller
                 /** @var User $user */
                 $user               = auth()->user();
                 $this->repository   = app(BudgetRepositoryInterface::class);
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
                 $this->repository->setUser($user);
+                $this->blRepository->setUser($user);
 
                 return $next($request);
             }
@@ -84,7 +86,7 @@ class BudgetLimitController extends Controller
      */
     public function delete(BudgetLimit $budgetLimit): JsonResponse
     {
-        $this->repository->destroyBudgetLimit($budgetLimit);
+        $this->blRepository->destroyBudgetLimit($budgetLimit);
 
         return response()->json([], 204);
     }
@@ -99,8 +101,7 @@ class BudgetLimitController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
-        $manager  = new Manager;
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $budgetId = (int)($request->get('budget_id') ?? 0);
         $budget   = $this->repository->findNull($budgetId);
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -108,10 +109,10 @@ class BudgetLimitController extends Controller
 
         $collection = new Collection;
         if (null === $budget) {
-            $collection = $this->repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
+            $collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
         }
         if (null !== $budget) {
-            $collection = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
+            $collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         }
 
         $count        = $collection->count();
@@ -119,8 +120,6 @@ class BudgetLimitController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budget_limits.index') . $this->buildParams());
 
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -134,17 +133,14 @@ class BudgetLimitController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param Request $request
      * @param BudgetLimit $budgetLimit
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, BudgetLimit $budgetLimit): JsonResponse
+    public function show(BudgetLimit $budgetLimit): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -172,10 +168,8 @@ class BudgetLimitController extends Controller
             throw new FireflyException('Unknown budget.');
         }
         $data['budget'] = $budget;
-        $budgetLimit    = $this->repository->storeBudgetLimit($data);
+        $budgetLimit    = $this->blRepository->storeBudgetLimit($data);
-        $manager        = new Manager;
+        $manager        = $this->getManager();
-        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -202,9 +196,7 @@ class BudgetLimitController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var User $admin */
         $admin = auth()->user();
@@ -253,10 +245,8 @@ class BudgetLimitController extends Controller
     {
         $data           = $request->getAll();
         $data['budget'] = $budgetLimit->budget;
-        $budgetLimit    = $this->repository->updateBudgetLimit($budgetLimit, $data);
+        $budgetLimit    = $this->blRepository->updateBudgetLimit($budgetLimit, $data);
-        $manager        = new Manager;
+        $manager        = $this->getManager();
-        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);

app/Api/V1/Controllers/CategoryController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CategoryController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -35,16 +35,13 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class CategoryController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoryController extends Controller
 {
@@ -92,16 +89,12 @@ class CategoryController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -115,9 +108,6 @@ class CategoryController extends Controller
         $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var CategoryTransformer $transformer */
         $transformer = app(CategoryTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -133,17 +123,14 @@ class CategoryController extends Controller
     /**
      * Show the category.
      *
-     * @param Request $request
      * @param Category $category
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, Category $category): JsonResponse
+    public function show(Category $category): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var CategoryTransformer $transformer */
         $transformer = app(CategoryTransformer::class);
@@ -166,9 +153,7 @@ class CategoryController extends Controller
     {
         $category = $this->repository->store($request->getAll());
         if (null !== $category) {
-            $manager = new Manager();
+            $manager = $this->getManager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
             /** @var CategoryTransformer $transformer */
             $transformer = app(CategoryTransformer::class);
@@ -198,9 +183,7 @@ class CategoryController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var User $admin */
         $admin = auth()->user();
@@ -251,9 +234,7 @@ class CategoryController extends Controller
     {
         $data     = $request->getAll();
         $category = $this->repository->update($category, $data);
-        $manager  = new Manager();
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var CategoryTransformer $transformer */
         $transformer = app(CategoryTransformer::class);

app/Api/V1/Controllers/Chart/AccountController.php

@@ -4,20 +4,20 @@
  * AccountController.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -49,6 +49,7 @@ class AccountController extends Controller
 
     /**
      * AccountController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()

app/Api/V1/Controllers/Chart/AvailableBudgetController.php

@@ -4,20 +4,20 @@
  * AvailableBudgetController.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,6 +28,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
@@ -37,11 +38,14 @@ use Illuminate\Support\Collection;
  */
 class AvailableBudgetController extends Controller
 {
+    /** @var OperationsRepositoryInterface */
+    private $opsRepository;
     /** @var BudgetRepositoryInterface */
     private $repository;
 
     /**
      * AvailableBudgetController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -52,7 +56,9 @@ class AvailableBudgetController extends Controller
                 /** @var User $user */
                 $user                = auth()->user();
                 $this->repository    = app(BudgetRepositoryInterface::class);
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->repository->setUser($user);
+                $this->opsRepository->setUser($user);
 
                 return $next($request);
             }
@@ -68,7 +74,7 @@ class AvailableBudgetController extends Controller
     {
         $currency          = $availableBudget->transactionCurrency;
         $budgets           = $this->repository->getActiveBudgets();
-        $budgetInformation = $this->repository->spentInPeriodMc($budgets, new Collection, $availableBudget->start_date, $availableBudget->end_date);
+        $budgetInformation = $this->opsRepository->spentInPeriodMc($budgets, new Collection, $availableBudget->start_date, $availableBudget->end_date);
         $spent             = 0.0;
 
         // get for current currency

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -4,20 +4,20 @@
  * CategoryController.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,9 +28,10 @@ use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\DateRequest;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Collection;
 
 /**
  * Class CategoryController
@@ -39,9 +40,14 @@ class CategoryController extends Controller
 {
     /** @var CategoryRepositoryInterface */
     private $categoryRepository;
+    /** @var NoCategoryRepositoryInterface */
+    private $noCatRepository;
+    /** @var OperationsRepositoryInterface */
+    private $opsRepository;
 
     /**
      * AccountController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -52,7 +58,11 @@ class CategoryController extends Controller
                 /** @var User $user */
                 $user                     = auth()->user();
                 $this->categoryRepository = app(CategoryRepositoryInterface::class);
+                $this->opsRepository      = app(OperationsRepositoryInterface::class);
+                $this->noCatRepository    = app(NoCategoryRepositoryInterface::class);
                 $this->categoryRepository->setUser($user);
+                $this->opsRepository->setUser($user);
+                $this->noCatRepository->setUser($user);
 
                 return $next($request);
             }
@@ -78,128 +88,110 @@ class CategoryController extends Controller
 
 
         $tempData      = [];
-        $spent      = $this->categoryRepository->spentInPeriodPerCurrency(new Collection, new Collection, $start, $end);
+        $spentWith     = $this->opsRepository->listExpenses($start, $end);
-        $earned     = $this->categoryRepository->earnedInPeriodPerCurrency(new Collection, new Collection, $start, $end);
+        $earnedWith    = $this->opsRepository->listIncome($start, $end);
+        $spentWithout  = $this->noCatRepository->listExpenses($start, $end);
+        $earnedWithout = $this->noCatRepository->listIncome($start, $end);
         $categories    = [];
 
-        // earned:
+
-        foreach ($earned as $categoryId => $row) {
+        foreach ([$spentWith, $earnedWith] as $set) {
-            $categoryName = $row['name'];
+            foreach ($set as $currency) {
-            foreach ($row['earned'] as $currencyId => $income) {
+                foreach ($currency['categories'] as $category) {
-                // find or make set for currency:
+                    $categories[] = $category['name'];
-                $key           = sprintf('%s-e', $currencyId);
+                    $inKey        = sprintf('%d-i', $currency['currency_id']);
-                $decimalPlaces = $income['currency_decimal_places'];
+                    $outKey       = sprintf('%d-e', $currency['currency_id']);
-                if (!isset($tempData[$key])) {
+                    // make data arrays if not yet present.
-                    $tempData[$key] = [
+                    $tempData[$inKey]  = $tempData[$inKey] ?? [
-                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $income['currency_symbol']]),
+                            'currency_id'             => $currency['currency_id'],
-                        'currency_id'             => $income['currency_id'],
+                            'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-                        'currency_code'           => $income['currency_code'],
+                            'currency_code'           => $currency['currency_code'],
-                        'currency_symbol'         => $income['currency_symbol'],
+                            'currency_symbol'         => $currency['currency_symbol'],
-                        'currency_decimal_places' => $decimalPlaces,
+                            'currency_decimal_places' => $currency['currency_decimal_places'],
                             'type'                    => 'bar', // line, area or bar
                             'yAxisID'                 => 0, // 0, 1, 2
-                        'entries'                 => [],
+                            'entries'                 => [
+                                // per category:
+                                // "category" => 5,
+                            ],
                         ];
-                }
+                    $tempData[$outKey] = $tempData[$outKey] ?? [
-                $amount                    = round($income['earned'], $decimalPlaces);
+                            'currency_id'             => $currency['currency_id'],
-                $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
+                            'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-                $tempData[$key]['entries'][$categoryName]
+                            'currency_code'           => $currency['currency_code'],
-                                           = $amount;
+                            'currency_symbol'         => $currency['currency_symbol'],
-
+                            'currency_decimal_places' => $currency['currency_decimal_places'],
-            }
-        }
-
-        // earned with no category:
-        $noCategory = $this->categoryRepository->earnedInPeriodPcWoCategory(new Collection, $start, $end);
-        foreach ($noCategory as $currencyId => $income) {
-            $categoryName = (string)trans('firefly.no_category');
-            // find or make set for currency:
-            $key           = sprintf('%s-e', $currencyId);
-            $decimalPlaces = $income['currency_decimal_places'];
-            if (!isset($tempData[$key])) {
-                $tempData[$key] = [
-                    'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $income['currency_symbol']]),
-                    'currency_id'             => $income['currency_id'],
-                    'currency_code'           => $income['currency_code'],
-                    'currency_symbol'         => $income['currency_symbol'],
-                    'currency_decimal_places' => $decimalPlaces,
                             'type'                    => 'bar', // line, area or bar
                             'yAxisID'                 => 0, // 0, 1, 2
-                    'entries'                 => [],
+                            'entries'                 => [
+                                // per category:
+                                // "category" => 5,
+                            ],
                         ];
+
+                    foreach ($category['transaction_journals'] as $journal) {
+                        // is it expense or income?
+                        $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
+                        $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
+                        $name                                    = $category['name'];
+                        $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
+                        $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
+                    }
+                }
             }
-            $amount                    = round($income['earned'], $decimalPlaces);
-            $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
-            $tempData[$key]['entries'][$categoryName]
-                                       = $amount;
         }
 
-
+        foreach ([$spentWithout, $earnedWithout] as $set) {
-        // spent
+            foreach ($set as $currency) {
-        foreach ($spent as $categoryId => $row) {
+                $inKey        = sprintf('%d-i', $currency['currency_id']);
-            $categoryName = $row['name'];
+                $outKey       = sprintf('%d-e', $currency['currency_id']);
-            // create a new set if necessary, "spent (EUR)":
+                $categories[] = (string)trans('firefly.no_category');
-            foreach ($row['spent'] as $currencyId => $expense) {
+                // make data arrays if not yet present.
-                // find or make set for currency:
+                $tempData[$inKey]  = $tempData[$inKey] ?? [
-                $key           = sprintf('%s-s', $currencyId);
+                        'currency_id'             => $currency['currency_id'],
-                $decimalPlaces = $expense['currency_decimal_places'];
+                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-                if (!isset($tempData[$key])) {
+                        'currency_code'           => $currency['currency_code'],
-                    $tempData[$key] = [
+                        'currency_symbol'         => $currency['currency_symbol'],
-                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $expense['currency_symbol']]),
+                        'currency_decimal_places' => $currency['currency_decimal_places'],
-                        'currency_id'             => $expense['currency_id'],
-                        'currency_code'           => $expense['currency_code'],
-                        'currency_symbol'         => $expense['currency_symbol'],
-                        'currency_decimal_places' => $decimalPlaces,
                         'type'                    => 'bar', // line, area or bar
                         'yAxisID'                 => 0, // 0, 1, 2
-                        'entries'                 => [],
+                        'entries'                 => [
+                            // per category:
+                            // "category" => 5,
+                        ],
                     ];
-                }
+                $tempData[$outKey] = $tempData[$outKey] ?? [
-                $amount                    = round($expense['spent'], $decimalPlaces);
+                        'currency_id'             => $currency['currency_id'],
-                $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
+                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-                $tempData[$key]['entries'][$categoryName]
+                        'currency_code'           => $currency['currency_code'],
-                                           = $amount;
+                        'currency_symbol'         => $currency['currency_symbol'],
-
+                        'currency_decimal_places' => $currency['currency_decimal_places'],
-            }
-        }
-
-        // spent with no category
-        $noCategory = $this->categoryRepository->spentInPeriodPcWoCategory(new Collection, $start, $end);
-        foreach ($noCategory as $currencyId => $expense) {
-            $categoryName = (string)trans('firefly.no_category');
-            // find or make set for currency:
-            $key           = sprintf('%s-s', $currencyId);
-            $decimalPlaces = $expense['currency_decimal_places'];
-            if (!isset($tempData[$key])) {
-                $tempData[$key] = [
-                    'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $expense['currency_symbol']]),
-                    'currency_id'             => $expense['currency_id'],
-                    'currency_code'           => $expense['currency_code'],
-                    'currency_symbol'         => $expense['currency_symbol'],
-                    'currency_decimal_places' => $decimalPlaces,
                         'type'                    => 'bar', // line, area or bar
                         'yAxisID'                 => 0, // 0, 1, 2
-                    'entries'                 => [],
+                        'entries'                 => [
+                            // per category:
+                            // "category" => 5,
+                        ],
                     ];
+                foreach ($currency['transaction_journals'] as $journal) {
+                    // is it expense or income?
+                    $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
+                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
+                    $name                                    = (string)trans('firefly.no_category');
+                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
+                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
+                }
             }
-            $amount                    = round($expense['spent'], $decimalPlaces);
-            $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
-            $tempData[$key]['entries'][$categoryName]
-                                       = $amount;
         }
-
-
-        asort($categories);
-        $keys = array_keys($categories);
 
         // re-sort every spent array and add 0 for missing entries.
         foreach ($tempData as $index => $set) {
             $oldSet = $set['entries'];
             $newSet = [];
-            foreach ($keys as $key) {
+            foreach ($categories as $category) {
-                $value        = $oldSet[$key] ?? 0;
+                $value             = $oldSet[$category] ?? '0';
-                $value        = $value < 0 ? $value * -1 : $value;
+                $value             = -1 === bccomp($value, '0') ? bcmul($value, '-1') : $value;
-                $newSet[$key] = $value;
+                $newSet[$category] = $value;
             }
             $tempData[$index]['entries'] = $newSet;
         }

app/Api/V1/Controllers/ConfigurationController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * ConfigurationController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -32,6 +32,7 @@ use Illuminate\Http\JsonResponse;
 
 /**
  * Class ConfigurationController.
+ *
  * @codeCoverageIgnore
  */
 class ConfigurationController extends Controller

app/Api/V1/Controllers/Controller.php

@@ -2,22 +2,22 @@
 
 /**
  * Controller.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -30,6 +30,8 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use League\Fractal\Manager;
+use League\Fractal\Serializer\JsonApiSerializer;
 use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
@@ -37,7 +39,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  * Class Controller.
  *
  * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.NumberOfChildren)
+ *
  */
 class Controller extends BaseController
 {
@@ -81,6 +83,19 @@ class Controller extends BaseController
         return $return;
     }
 
+    /**
+     * @return Manager
+     */
+    protected function getManager(): Manager
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        return $manager;
+    }
+
     /**
      * Method to grab all parameters from the URI.
      *

app/Api/V1/Controllers/CurrencyController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CurrencyController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -36,6 +36,8 @@ use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
@@ -56,17 +58,13 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class CurrencyController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CurrencyController extends Controller
 {
@@ -78,6 +76,7 @@ class CurrencyController extends Controller
 
     /**
      * CurrencyRepository constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -109,9 +108,7 @@ class CurrencyController extends Controller
      */
     public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // read type from URI
         $type = $request->get('type') ?? 'all';
@@ -142,9 +139,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.accounts', [$currency->code]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -159,22 +153,17 @@ class CurrencyController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function availableBudgets(Request $request, TransactionCurrency $currency): JsonResponse
+    public function availableBudgets(TransactionCurrency $currency): JsonResponse
     {
         /** @var User $admin */
         $admin = auth()->user();
 
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -182,8 +171,12 @@ class CurrencyController extends Controller
 
         /** @var BudgetRepositoryInterface $repository */
         $repository = app(BudgetRepositoryInterface::class);
+
+        /** @var AvailableBudgetRepositoryInterface $abRepository */
+        $abRepository = app(AvailableBudgetRepositoryInterface::class);
+
         $repository->setUser($admin);
-        $collection       = $repository->getAvailableBudgetsByCurrency($currency);
+        $collection       = $abRepository->getAvailableBudgetsByCurrency($currency);
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
@@ -192,9 +185,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.available_budgets', [$currency->code]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -208,24 +198,19 @@ class CurrencyController extends Controller
     /**
      * List all bills
      *
-     * @param Request $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function bills(Request $request, TransactionCurrency $currency): JsonResponse
+    public function bills(TransactionCurrency $currency): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         /** @var BillRepositoryInterface $repository */
         $repository = app(BillRepositoryInterface::class);
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $paginator  = $repository->getPaginator($pageSize);
+        $unfiltered = $repository->getBills();
-        /** @var Collection $bills */
-        $unfiltered = $paginator->getCollection();
 
         // filter and paginate list:
         $collection = $unfiltered->filter(
@@ -240,9 +225,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.bills', [$currency->code]) . $this->buildParams());
 
-
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -256,28 +238,24 @@ class CurrencyController extends Controller
     /**
      * List all budget limits
      *
-     * @param Request $request
-     *
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function budgetLimits(Request $request, TransactionCurrency $currency): JsonResponse
+    public function budgetLimits(TransactionCurrency $currency): JsonResponse
     {
-        /** @var BudgetRepositoryInterface $repository */
+        /** @var BudgetLimitRepositoryInterface $blRepository */
-        $repository   = app(BudgetRepositoryInterface::class);
+        $blRepository = app(BudgetLimitRepositoryInterface::class);
-        $manager      = new Manager;
+
-        $baseUrl      = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager      = $this->getManager();
         $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $collection   = $repository->getAllBudgetLimitsByCurrency($currency, $this->parameters->get('start'), $this->parameters->get('end'));
+        $collection   = $blRepository->getAllBudgetLimitsByCurrency($currency, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.budget_limits', [$currency->code]) . $this->buildParams());
 
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -291,20 +269,17 @@ class CurrencyController extends Controller
     /**
      * Show a list of known exchange rates
      *
-     * @param Request $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function cer(Request $request, TransactionCurrency $currency): JsonResponse
+    public function cer(TransactionCurrency $currency): JsonResponse
     {
         // create some objects:
-        $manager    = new Manager;
+        $manager    = $this->getManager();
-        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getExchangeRates($currency);
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
 
         $count         = $collection->count();
@@ -312,8 +287,6 @@ class CurrencyController extends Controller
         $paginator     = new LengthAwarePaginator($exchangeRates, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.cer', [$currency->code]) . $this->buildParams());
 
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var CurrencyExchangeRateTransformer $transformer */
         $transformer = app(CurrencyExchangeRateTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -353,22 +326,19 @@ class CurrencyController extends Controller
     /**
      * Disable a currency.
      *
-     * @param Request $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function disable(Request $request, TransactionCurrency $currency): JsonResponse
+    public function disable(TransactionCurrency $currency): JsonResponse
     {
         // must be unused.
         if ($this->repository->currencyInUse($currency)) {
             return response()->json([], 409);
         }
         $this->repository->disable($currency);
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
@@ -386,18 +356,15 @@ class CurrencyController extends Controller
     /**
      * Enable a currency.
      *
-     * @param Request $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function enable(Request $request, TransactionCurrency $currency): JsonResponse
+    public function enable(TransactionCurrency $currency): JsonResponse
     {
         $this->repository->enable($currency);
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
@@ -415,12 +382,10 @@ class CurrencyController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAll();
@@ -431,9 +396,7 @@ class CurrencyController extends Controller
         $paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
 
 
-        $manager = new Manager();
+        $manager         = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
@@ -450,22 +413,19 @@ class CurrencyController extends Controller
     /**
      * Make the currency a default currency.
      *
-     * @param Request $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function makeDefault(Request $request, TransactionCurrency $currency): JsonResponse
+    public function makeDefault(TransactionCurrency $currency): JsonResponse
     {
         $this->repository->enable($currency);
 
         app('preferences')->set('currencyPreference', $currency->code);
         app('preferences')->mark();
 
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         $this->parameters->set('defaultCurrency', $currency);
 
@@ -482,19 +442,14 @@ class CurrencyController extends Controller
     /**
      * List all recurring transactions.
      *
-     * @param Request $request
-     *
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function recurrences(Request $request, TransactionCurrency $currency): JsonResponse
+    public function recurrences(TransactionCurrency $currency): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -525,9 +480,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.recurrences', [$currency->code]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -542,16 +494,14 @@ class CurrencyController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function rules(Request $request, TransactionCurrency $currency): JsonResponse
+    public function rules(TransactionCurrency $currency): JsonResponse
     {
-        $manager  = new Manager;
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
@@ -579,9 +529,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -596,17 +543,14 @@ class CurrencyController extends Controller
     /**
      * Show a currency.
      *
-     * @param Request $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, TransactionCurrency $currency): JsonResponse
+    public function show(TransactionCurrency $currency): JsonResponse
     {
-        $manager = new Manager();
+        $manager         = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
@@ -636,9 +580,7 @@ class CurrencyController extends Controller
                 app('preferences')->set('currencyPreference', $currency->code);
                 app('preferences')->mark();
             }
-            $manager = new Manager();
+            $manager         = $this->getManager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
             $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
             $this->parameters->set('defaultCurrency', $defaultCurrency);
 
@@ -671,9 +613,7 @@ class CurrencyController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var User $admin */
         $admin = auth()->user();
@@ -730,9 +670,7 @@ class CurrencyController extends Controller
             app('preferences')->mark();
         }
 
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CurrencyExchangeRateController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -31,12 +31,11 @@ use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use League\Fractal\Manager;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class CurrencyExchangeRateController
+ *
  * @codeCoverageIgnore
  */
 class CurrencyExchangeRateController extends Controller
@@ -75,11 +74,7 @@ class CurrencyExchangeRateController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
-        // create some objects:
+        $manager      = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         $fromCurrency = $this->repository->findByCodeNull($request->get('from') ?? 'EUR');
         $toCurrency   = $this->repository->findByCodeNull($request->get('to') ?? 'USD');
 

app/Api/V1/Controllers/ImportController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * ImportController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -34,11 +34,9 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class ImportController
@@ -51,6 +49,7 @@ class ImportController extends Controller
 
     /**
      * ImportController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -69,16 +68,13 @@ class ImportController extends Controller
     }
 
     /**
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function listAll(Request $request): JsonResponse
+    public function listAll(): JsonResponse
     {
         // create some objects:
-        $manager  = new Manager;
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of accounts. Count it and split it.
@@ -90,9 +86,6 @@ class ImportController extends Controller
         $paginator = new LengthAwarePaginator($importJobs, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.import.list') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var ImportJobTransformer $transformer */
         $transformer = app(ImportJobTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -104,18 +97,14 @@ class ImportController extends Controller
     }
 
     /**
-     * @param Request $request
      * @param ImportJob $importJob
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, ImportJob $importJob): JsonResponse
+    public function show(ImportJob $importJob): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var ImportJobTransformer $transformer */
         $transformer = app(ImportJobTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -141,9 +130,7 @@ class ImportController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         $tag          = $importJob->tag;
         $transactions = new Collection();

app/Api/V1/Controllers/LinkTypeController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * LinkTypeController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -36,16 +36,13 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class LinkTypeController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LinkTypeController extends Controller
 {
@@ -99,16 +96,13 @@ class LinkTypeController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         // create some objects:
-        $manager  = new Manager;
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of accounts. Count it and split it.
@@ -120,9 +114,6 @@ class LinkTypeController extends Controller
         $paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.link_types.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var LinkTypeTransformer $transformer */
         $transformer = app(LinkTypeTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -137,17 +128,14 @@ class LinkTypeController extends Controller
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param LinkType $linkType
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, LinkType $linkType): JsonResponse
+    public function show(LinkType $linkType): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
         /** @var LinkTypeTransformer $transformer */
         $transformer = app(LinkTypeTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -177,9 +165,7 @@ class LinkTypeController extends Controller
         $data = $request->getAll();
         // if currency ID is 0, find the currency by the code:
         $linkType = $this->repository->store($data);
-        $manager  = new Manager;
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var LinkTypeTransformer $transformer */
         $transformer = app(LinkTypeTransformer::class);
@@ -206,9 +192,7 @@ class LinkTypeController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         // whatever is returned by the query, it must be part of these journals:
         $journalIds = $this->repository->getJournalIds($linkType);
@@ -275,10 +259,7 @@ class LinkTypeController extends Controller
 
         $data = $request->getAll();
         $this->repository->update($linkType, $data);
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var LinkTypeTransformer $transformer */
         $transformer = app(LinkTypeTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/PiggyBankController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * PiggyBankController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -31,18 +31,14 @@ use FireflyIII\Transformers\PiggyBankEventTransformer;
 use FireflyIII\Transformers\PiggyBankTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class PiggyBankController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PiggyBankController extends Controller
 {
@@ -90,17 +86,12 @@ class PiggyBankController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -113,9 +104,6 @@ class PiggyBankController extends Controller
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -130,19 +118,16 @@ class PiggyBankController extends Controller
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param PiggyBank $piggyBank
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function piggyBankEvents(Request $request, PiggyBank $piggyBank): JsonResponse
+    public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $manager  = new Manager();
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         $collection = $this->repository->getEvents($piggyBank);
         $count      = $collection->count();
@@ -166,17 +151,14 @@ class PiggyBankController extends Controller
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param PiggyBank $piggyBank
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, PiggyBank $piggyBank): JsonResponse
+    public function show(PiggyBank $piggyBank): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
@@ -200,9 +182,7 @@ class PiggyBankController extends Controller
     {
         $piggyBank = $this->repository->store($request->getAll());
         if (null !== $piggyBank) {
-            $manager = new Manager();
+            $manager = $this->getManager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
             /** @var PiggyBankTransformer $transformer */
             $transformer = app(PiggyBankTransformer::class);
@@ -226,11 +206,15 @@ class PiggyBankController extends Controller
      */
     public function update(PiggyBankRequest $request, PiggyBank $piggyBank): JsonResponse
     {
-        $piggyBank = $this->repository->update($piggyBank, $request->getAll());
+        $data      = $request->getAll();
-        $manager   = new Manager();
+        $piggyBank = $this->repository->update($piggyBank, $data);
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
+        if ('' !== $data['current_amount']) {
+            $this->repository->setCurrentAmount($piggyBank, $data['current_amount']);
+        }
+
+
+        $manager = $this->getManager();
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/PreferenceController.php

@@ -1,22 +1,22 @@
 <?php
 /**
- * PreferencesController.php
+ * PreferenceController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -30,12 +30,9 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\PreferenceTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  *
@@ -76,12 +73,10 @@ class PreferenceController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         /** @var User $user */
         $user      = auth()->user();
@@ -99,12 +94,7 @@ class PreferenceController extends Controller
             }
         }
 
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var PreferenceTransformer $transformer */
         $transformer = app(PreferenceTransformer::class);
@@ -119,20 +109,14 @@ class PreferenceController extends Controller
     /**
      * Return a single preference by name.
      *
-     * @param Request $request
      * @param Preference $preference
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, Preference $preference): JsonResponse
+    public function show(Preference $preference): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
         /** @var PreferenceTransformer $transformer */
         $transformer = app(PreferenceTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -171,12 +155,7 @@ class PreferenceController extends Controller
         }
         $result = app('preferences')->set($preference->name, $newValue);
 
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
         /** @var PreferenceTransformer $transformer */
         $transformer = app(PreferenceTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/RecurrenceController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * RecurrenceController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -37,11 +37,9 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 use Log;
 
 /**
@@ -93,16 +91,12 @@ class RecurrenceController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -116,9 +110,6 @@ class RecurrenceController extends Controller
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -133,17 +124,14 @@ class RecurrenceController extends Controller
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param Recurrence $recurrence
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, Recurrence $recurrence): JsonResponse
+    public function show(Recurrence $recurrence): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
@@ -162,13 +150,13 @@ class RecurrenceController extends Controller
      * @param RecurrenceStoreRequest $request
      *
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(RecurrenceStoreRequest $request): JsonResponse
     {
-        $recurrence = $this->repository->store($request->getAllRecurrenceData());
+        $data       = $request->getAll();
-        $manager    = new Manager();
+        $recurrence = $this->repository->store($data);
-        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager    = $this->getManager();
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
@@ -195,10 +183,7 @@ class RecurrenceController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         // whatever is returned by the query, it must be part of these journals:
         $journalIds = $this->repository->getJournalIds($recurrence);
 
@@ -273,11 +258,10 @@ class RecurrenceController extends Controller
      */
     public function update(RecurrenceUpdateRequest $request, Recurrence $recurrence): JsonResponse
     {
-        $data     = $request->getAllRecurrenceData();
+        $data     = $request->getAll();
         $category = $this->repository->update($recurrence, $data);
-        $manager  = new Manager();
+        $manager  = $this->getManager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/RuleController.php

@@ -1,31 +1,32 @@
 <?php
 /**
  * RuleController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\RuleRequest;
+use FireflyIII\Api\V1\Requests\RuleStoreRequest;
 use FireflyIII\Api\V1\Requests\RuleTestRequest;
 use FireflyIII\Api\V1\Requests\RuleTriggerRequest;
+use FireflyIII\Api\V1\Requests\RuleUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Rule;
@@ -37,18 +38,15 @@ use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 use Log;
 
 /**
  * Class RuleController
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
  */
 class RuleController extends Controller
 {
@@ -59,6 +57,7 @@ class RuleController extends Controller
 
     /**
      * RuleController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -98,16 +97,12 @@ class RuleController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
@@ -121,9 +116,6 @@ class RuleController extends Controller
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -135,21 +127,59 @@ class RuleController extends Controller
 
     }
 
+    /**
+     * @param Rule $rule
+     *
+     * @return JsonResponse
+     */
+    public function moveDown(Rule $rule): JsonResponse
+    {
+        $this->ruleRepository->moveDown($rule);
+        $rule    = $this->ruleRepository->find($rule->id);
+        $manager = $this->getManager();
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * @param Rule $rule
+     *
+     * @return JsonResponse
+     */
+    public function moveUp(Rule $rule): JsonResponse
+    {
+        $this->ruleRepository->moveUp($rule);
+        $rule    = $this->ruleRepository->find($rule->id);
+        $manager = $this->getManager();
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param Rule $rule
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, Rule $rule): JsonResponse
+    public function show(Rule $rule): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -163,17 +193,14 @@ class RuleController extends Controller
     /**
      * Store new object.
      *
-     * @param RuleRequest $request
+     * @param RuleStoreRequest $request
      *
      * @return JsonResponse
      */
-    public function store(RuleRequest $request): JsonResponse
+    public function store(RuleStoreRequest $request): JsonResponse
     {
         $rule    = $this->ruleRepository->store($request->getAll());
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -213,10 +240,7 @@ class RuleController extends Controller
         $paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
 
         // resulting list is presented as JSON thing.
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -268,18 +292,16 @@ class RuleController extends Controller
     /**
      * Update a rule.
      *
-     * @param RuleRequest $request
+     * @param RuleUpdateRequest $request
      * @param Rule              $rule
      *
      * @return JsonResponse
      */
-    public function update(RuleRequest $request, Rule $rule): JsonResponse
+    public function update(RuleUpdateRequest $request, Rule $rule): JsonResponse
     {
-        $rule = $this->ruleRepository->update($rule, $request->getAll());
+        $data    = $request->getAll();
-
+        $rule    = $this->ruleRepository->update($rule, $data);
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
@@ -289,50 +311,4 @@ class RuleController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
-
-    /**
-     * @param Request $request
-     * @param Rule $rule
-     * @return JsonResponse
-     */
-    public function moveDown(Request $request, Rule $rule): JsonResponse
-    {
-        $this->ruleRepository->moveDown($rule);
-        $rule    = $this->ruleRepository->find($rule->id);
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        /** @var RuleTransformer $transformer */
-        $transformer = app(RuleTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($rule, $transformer, 'rules');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
-
-    /**
-     * @param Request $request
-     * @param Rule $rule
-     * @return JsonResponse
-     */
-    public function moveUp(Request $request, Rule $rule): JsonResponse
-    {
-        $this->ruleRepository->moveUp($rule);
-        $rule    = $this->ruleRepository->find($rule->id);
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        /** @var RuleTransformer $transformer */
-        $transformer = app(RuleTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($rule, $transformer, 'rules');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
 }

app/Api/V1/Controllers/RuleGroupController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * RuleGroupController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -40,14 +40,11 @@ use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 use Log;
 
 /**
@@ -62,6 +59,7 @@ class RuleGroupController extends Controller
 
     /**
      * RuleGroupController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -101,17 +99,12 @@ class RuleGroupController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -124,9 +117,6 @@ class RuleGroupController extends Controller
         $paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rule_groups.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleGroupTransformer $transformer */
         $transformer = app(RuleGroupTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -138,18 +128,54 @@ class RuleGroupController extends Controller
     }
 
     /**
-     * @param Request $request
+     * @param RuleGroup $ruleGroup
+     *
+     * @return JsonResponse
+     */
+    public function moveDown(RuleGroup $ruleGroup): JsonResponse
+    {
+        $this->ruleGroupRepository->moveDown($ruleGroup);
+        $ruleGroup = $this->ruleGroupRepository->find($ruleGroup->id);
+        $manager   = $this->getManager();
+
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param RuleGroup $ruleGroup
+     *
+     * @return JsonResponse
+     */
+    public function moveUp(RuleGroup $ruleGroup): JsonResponse
+    {
+        $this->ruleGroupRepository->moveUp($ruleGroup);
+        $ruleGroup = $this->ruleGroupRepository->find($ruleGroup->id);
+        $manager   = $this->getManager();
+
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
      * @param RuleGroup $group
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function rules(Request $request, RuleGroup $group): JsonResponse
+    public function rules(RuleGroup $group): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -162,9 +188,6 @@ class RuleGroupController extends Controller
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rule_groups.rules', [$group->id]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -179,18 +202,14 @@ class RuleGroupController extends Controller
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param RuleGroup $ruleGroup
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, RuleGroup $ruleGroup): JsonResponse
+    public function show(RuleGroup $ruleGroup): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleGroupTransformer $transformer */
         $transformer = app(RuleGroupTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -211,9 +230,7 @@ class RuleGroupController extends Controller
     public function store(RuleGroupRequest $request): JsonResponse
     {
         $ruleGroup = $this->ruleGroupRepository->store($request->getAll());
-        $manager   = new Manager();
+        $manager   = $this->getManager();
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var RuleGroupTransformer $transformer */
         $transformer = app(RuleGroupTransformer::class);
@@ -231,7 +248,7 @@ class RuleGroupController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
      */
     public function testGroup(RuleGroupTestRequest $request, RuleGroup $group): JsonResponse
     {
@@ -272,11 +289,7 @@ class RuleGroupController extends Controller
         $paginator = new LengthAwarePaginator($transactions, $count, $pageSize, $parameters['page']);
         $paginator->setPath(route('api.v1.rule_groups.test', [$group->id]) . $this->buildParams());
 
-        // resulting list is presented as JSON thing.
+        $manager     = $this->getManager();
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
 
@@ -341,53 +354,7 @@ class RuleGroupController extends Controller
     public function update(RuleGroupRequest $request, RuleGroup $ruleGroup): JsonResponse
     {
         $ruleGroup = $this->ruleGroupRepository->update($ruleGroup, $request->getAll());
-        $manager   = new Manager();
+        $manager   = $this->getManager();
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        /** @var RuleGroupTransformer $transformer */
-        $transformer = app(RuleGroupTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * @param Request $request
-     * @param RuleGroup $ruleGroup
-     * @return JsonResponse
-     */
-    public function moveDown(Request $request, RuleGroup $ruleGroup): JsonResponse
-    {
-        $this->ruleGroupRepository->moveDown($ruleGroup);
-        $ruleGroup = $this->ruleGroupRepository->find($ruleGroup->id);
-        $manager   = new Manager();
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        /** @var RuleGroupTransformer $transformer */
-        $transformer = app(RuleGroupTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * @param Request $request
-     * @param RuleGroup $ruleGroup
-     * @return JsonResponse
-     */
-    public function moveUp(Request $request, RuleGroup $ruleGroup): JsonResponse
-    {
-        $this->ruleGroupRepository->moveUp($ruleGroup);
-        $ruleGroup = $this->ruleGroupRepository->find($ruleGroup->id);
-        $manager   = new Manager();
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var RuleGroupTransformer $transformer */
         $transformer = app(RuleGroupTransformer::class);

app/Api/V1/Controllers/Search/AccountController.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Search;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Search\AccountSearch;
+use FireflyIII\Transformers\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    use AccountFilter;
+
+    /** @var array */
+    private $validFields;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->validFields = [
+            AccountSearch::SEARCH_ALL,
+            AccountSearch::SEARCH_ID,
+            AccountSearch::SEARCH_NAME,
+            AccountSearch::SEARCH_IBAN,
+            AccountSearch::SEARCH_NUMBER,
+        ];
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse|Response
+     */
+    public function search(Request $request)
+    {
+        $manager = $this->getManager();
+        $query   = $request->get('query');
+        $field   = $request->get('field');
+        $type    = $request->get('type') ?? 'all';
+        if ('' === $query || !in_array($field, $this->validFields, true)) {
+            return response(null, 422);
+        }
+        $types = $this->mapAccountTypes($type);
+        /** @var AccountSearch $search */
+        $search = app(AccountSearch::class);
+        $search->setUser(auth()->user());
+        $search->setTypes($types);
+        $search->setField($field);
+        $search->setQuery($query);
+
+        $accounts = $search->search();
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $count     = $accounts->count();
+        $paginator = new LengthAwarePaginator($accounts, $count, $count, 1);
+
+        $resource = new FractalCollection($accounts, $transformer, 'accounts');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+}

app/Api/V1/Controllers/Search/TransactionController.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * TransactionController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Search;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Support\Search\SearchInterface;
+use FireflyIII\Support\Search\TransactionSearch;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+/**
+ * Class TransactionController
+ */
+class TransactionController extends Controller
+{
+    /** @var string */
+    const SEARCH_ALL = 'all';
+    /** @var string */
+    const SEARCH_DESCRIPTION = 'description';
+    /** @var string */
+    const SEARCH_NOTES = 'notes';
+    /** @var string */
+    const SEARCH_ACCOUNTS = 'accounts';
+    /** @var array */
+    private $validFields;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->validFields = [
+            self::SEARCH_ALL,
+            self::SEARCH_DESCRIPTION,
+            self::SEARCH_NOTES,
+            self::SEARCH_ACCOUNTS,
+        ];
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse|Response
+     */
+    public function search(Request $request)
+    {
+        die('the route is present but nobody\'s home.');
+    }
+
+}

app/Api/V1/Controllers/SummaryController.php

@@ -4,20 +4,20 @@
  * SummaryController.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -36,7 +36,9 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -47,6 +49,8 @@ use Illuminate\Support\Collection;
  */
 class SummaryController extends Controller
 {
+    /** @var AvailableBudgetRepositoryInterface */
+    private $abRepository;
     /** @var AccountRepositoryInterface */
     private $accountRepository;
     /** @var BillRepositoryInterface */
@@ -56,8 +60,12 @@ class SummaryController extends Controller
     /** @var CurrencyRepositoryInterface */
     private $currencyRepos;
 
+    /** @var OperationsRepositoryInterface */
+    private $opsRepository;
+
     /**
      * SummaryController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -71,11 +79,15 @@ class SummaryController extends Controller
                 $this->billRepository    = app(BillRepositoryInterface::class);
                 $this->budgetRepository  = app(BudgetRepositoryInterface::class);
                 $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->abRepository      = app(AvailableBudgetRepositoryInterface::class);
+                $this->opsRepository     = app(OperationsRepositoryInterface::class);
 
                 $this->billRepository->setUser($user);
                 $this->currencyRepos->setUser($user);
                 $this->budgetRepository->setUser($user);
                 $this->accountRepository->setUser($user);
+                $this->abRepository->setUser($user);
+                $this->opsRepository->setUser($user);
 
 
                 return $next($request);
@@ -140,6 +152,25 @@ class SummaryController extends Controller
         return $result;
     }
 
+    /**
+     * This method will scroll through the results of the spentInPeriodMc() array and return the correct info.
+     *
+     * @param array               $spentInfo
+     * @param TransactionCurrency $currency
+     *
+     * @return string
+     */
+    private function findInSpentArray(array $spentInfo, TransactionCurrency $currency): string
+    {
+        foreach ($spentInfo as $array) {
+            if ($array['currency_id'] === $currency->id) {
+                return (string)$array['amount'];
+            }
+        }
+
+        return '0'; // @codeCoverageIgnore
+    }
+
     /**
      * @param Carbon $start
      * @param Carbon $end
@@ -316,15 +347,14 @@ class SummaryController extends Controller
     {
         $return    = [];
         $today     = new Carbon;
-        $available = $this->budgetRepository->getAvailableBudgetWithCurrency($start, $end);
+        $available = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
         $budgets   = $this->budgetRepository->getActiveBudgets();
-        $spentInfo = $this->budgetRepository->spentInPeriodMc($budgets, new Collection, $start, $end);
+        $spent     = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
-        foreach ($available as $currencyId => $amount) {
+
-            $currency = $this->currencyRepos->findNull($currencyId);
+        foreach ($spent as $row) {
-            if (null === $currency) {
+            // either an amount was budgeted or 0 is available.
-                continue;
+            $amount          = $available[$row['currency_id']] ?? '0';
-            }
+            $spentInCurrency = $row['sum'];
-            $spentInCurrency = (string)$this->findInSpentArray($spentInfo, $currency);
             $leftToSpend     = bcadd($amount, $spentInCurrency);
 
             $days   = $today->diffInDays($end) + 1;
@@ -334,41 +364,26 @@ class SummaryController extends Controller
             }
 
             $return[] = [
-                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
+                'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
-                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
+                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
-                'monetary_value'          => round($leftToSpend, $currency->decimal_places),
+                'monetary_value'          => round($leftToSpend, $row['currency_decimal_places']),
-                'currency_id'             => $currency->id,
+                'currency_id'             => $row['currency_id'],
-                'currency_code'           => $currency->code,
+                'currency_code'           => $row['currency_code'],
-                'currency_symbol'         => $currency->symbol,
+                'currency_symbol'         => $row['currency_symbol'],
-                'currency_decimal_places' => $currency->decimal_places,
+                'currency_decimal_places' => $row['currency_decimal_places'],
-                'value_parsed'            => app('amount')->formatAnything($currency, $leftToSpend, false),
+                'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $leftToSpend, false),
                 'local_icon'              => 'money',
-                'sub_title'               => (string)trans('firefly.box_spend_per_day', ['amount' => app('amount')->formatAnything($currency, $perDay, false)]),
+                'sub_title'               => (string)trans(
+                    'firefly.box_spend_per_day', ['amount' => app('amount')->formatFlat(
+                    $row['currency_symbol'], $row['currency_decimal_places'], $perDay, false
+                )]
+                ),
             ];
-        }
 
+        }
         return $return;
     }
 
-    /**
-     * This method will scroll through the results of the spentInPeriodMc() array and return the correct info.
-     *
-     * @param array $spentInfo
-     * @param TransactionCurrency $currency
-     *
-     * @return float
-     */
-    private function findInSpentArray(array $spentInfo, TransactionCurrency $currency): float
-    {
-        foreach ($spentInfo as $array) {
-            if ($array['currency_id'] === $currency->id) {
-                return $array['amount'];
-            }
-        }
-
-        return 0.0; // @codeCoverageIgnore
-    }
-
     /**
      * @param Carbon $start
      * @param Carbon $end

app/Api/V1/Controllers/TagController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * TagController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -37,11 +37,9 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class TagController
@@ -111,17 +109,12 @@ class TagController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
+        $manager = $this->getManager();
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -134,9 +127,6 @@ class TagController extends Controller
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.tags.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var TagTransformer $transformer */
         $transformer = app(TagTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -150,18 +140,14 @@ class TagController extends Controller
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param Tag $tag
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, Tag $tag): JsonResponse
+    public function show(Tag $tag): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var TagTransformer $transformer */
         $transformer = app(TagTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -182,10 +168,7 @@ class TagController extends Controller
     public function store(TagRequest $request): JsonResponse
     {
         $rule    = $this->repository->store($request->getAll());
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var TagTransformer $transformer */
         $transformer = app(TagTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -211,10 +194,7 @@ class TagController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var User $admin */
         $admin = auth()->user();
 
@@ -262,9 +242,7 @@ class TagController extends Controller
     public function update(TagRequest $request, Tag $tag): JsonResponse
     {
         $rule    = $this->repository->update($tag, $request->getAll());
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
         /** @var TagTransformer $transformer */
         $transformer = app(TagTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -275,10 +253,29 @@ class TagController extends Controller
 
     }
 
+    /**
+     * @param array $cloud
+     * @param float $min
+     * @param float $max
+     *
+     * @return array
+     */
+    private function analyseTagCloud(array $cloud, float $min, float $max): array
+    {
+        foreach (array_keys($cloud['tags']) as $index) {
+            $cloud['tags'][$index]['relative'] = round($cloud['tags'][$index]['size'] / $max, 4);
+        }
+        $cloud['min'] = $min;
+        $cloud['max'] = $max;
+
+        return $cloud;
+    }
+
     /**
      * @param Collection $tags
      * @param Carbon     $start
      * @param Carbon     $end
+     *
      * @return array
      */
     private function getTagCloud(Collection $tags, Carbon $start, Carbon $end): array
@@ -307,21 +304,4 @@ class TagController extends Controller
 
         return $cloud;
     }
-
-    /**
-     * @param array $cloud
-     * @param float $min
-     * @param float $max
-     * @return array
-     */
-    private function analyseTagCloud(array $cloud, float $min, float $max): array
-    {
-        foreach (array_keys($cloud['tags']) as $index) {
-            $cloud['tags'][$index]['relative'] = round($cloud['tags'][$index]['size'] / $max, 4);
-        }
-        $cloud['min'] = $min;
-        $cloud['max'] = $max;
-
-        return $cloud;
-    }
 }

app/Api/V1/Controllers/TransactionController.php

@@ -2,22 +2,22 @@
 
 /**
  * TransactionController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\TransactionStoreRequest;
 use FireflyIII\Api\V1\Requests\TransactionUpdateRequest;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Events\UpdatedTransactionGroup;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
@@ -42,11 +41,10 @@ use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use League\Fractal\Manager;
+use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 use Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -59,11 +57,10 @@ class TransactionController extends Controller
 
     /** @var TransactionGroupRepositoryInterface Group repository. */
     private $groupRepository;
-    /** @var JournalRepositoryInterface The journal repository */
-    private $repository;
-
     /** @var JournalAPIRepositoryInterface Journal API repos */
     private $journalAPIRepository;
+    /** @var JournalRepositoryInterface The journal repository */
+    private $repository;
 
     /**
      * TransactionController constructor.
@@ -91,19 +88,18 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param Request $request
+     * @param TransactionGroup $transactionGroup
-     * @param TransactionJournal $transactionJournal
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function attachments(Request $request, TransactionJournal $transactionJournal): JsonResponse
+    public function attachments(TransactionGroup $transactionGroup): JsonResponse
     {
-        $manager = new Manager();
+        $manager     = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $attachments = new Collection;
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        foreach ($transactionGroup->transactionJournals as $transactionJournal) {
-
+            $attachments = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($attachments);
-        $attachments = $this->journalAPIRepository->getAttachments($transactionJournal);
+        }
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -160,10 +156,7 @@ class TransactionController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var User $admin */
         $admin = auth()->user();
 
@@ -200,19 +193,18 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param Request $request
+     * @param TransactionGroup $transactionGroup
-     * @param TransactionJournal $transactionJournal
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function piggyBankEvents(Request $request, TransactionJournal $transactionJournal): JsonResponse
+    public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $events  = new Collection;
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        foreach ($transactionGroup->transactionJournals as $transactionJournal) {
-
+            $events = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($events);
-        $events = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal);
+        }
 
         /** @var PiggyBankEventTransformer $transformer */
         $transformer = app(PiggyBankEventTransformer::class);
@@ -227,18 +219,14 @@ class TransactionController extends Controller
     /**
      * Show a single transaction.
      *
-     * @param Request $request
      * @param TransactionGroup $transactionGroup
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, TransactionGroup $transactionGroup): JsonResponse
+    public function show(TransactionGroup $transactionGroup): JsonResponse
     {
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var User $admin */
         $admin = auth()->user();
         // use new group collector:
@@ -269,7 +257,6 @@ class TransactionController extends Controller
      * @param TransactionStoreRequest $request
      *
      * @return JsonResponse
-     * @throws FireflyException
      */
     public function store(TransactionStoreRequest $request): JsonResponse
     {
@@ -283,10 +270,7 @@ class TransactionController extends Controller
 
         event(new StoredTransactionGroup($transactionGroup));
 
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var User $admin */
         $admin = auth()->user();
         // use new group collector:
@@ -325,9 +309,7 @@ class TransactionController extends Controller
         Log::debug('Now in update routine.');
         $data             = $request->getAll();
         $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
-        $manager          = new Manager();
+        $manager          = $this->getManager();
-        $baseUrl          = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         event(new UpdatedTransactionGroup($transactionGroup));
 

app/Api/V1/Controllers/TransactionLinkController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * TransactionLinkController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -34,11 +34,9 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class TransactionLinkController
@@ -54,6 +52,7 @@ class TransactionLinkController extends Controller
 
     /**
      * TransactionLinkController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -101,9 +100,7 @@ class TransactionLinkController extends Controller
     public function index(Request $request): JsonResponse
     {
         // create some objects:
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
         // read type from URI
         $name = $request->get('name');
 
@@ -120,9 +117,6 @@ class TransactionLinkController extends Controller
         $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.transaction_links.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var TransactionLinkTransformer $transformer */
         $transformer = app(TransactionLinkTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -137,17 +131,14 @@ class TransactionLinkController extends Controller
     /**
      * List single resource.
      *
-     * @param Request $request
      * @param TransactionJournalLink $journalLink
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, TransactionJournalLink $journalLink): JsonResponse
+    public function show(TransactionJournalLink $journalLink): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var TransactionLinkTransformer $transformer */
         $transformer = app(TransactionLinkTransformer::class);
@@ -169,7 +160,7 @@ class TransactionLinkController extends Controller
      */
     public function store(TransactionLinkRequest $request): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
         $data    = $request->getAll();
         $inward  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
         $outward = $this->journalRepository->findNull($data['outward_id'] ?? 0);
@@ -187,7 +178,6 @@ class TransactionLinkController extends Controller
         $resource = new Item($journalLink, $transformer, 'transaction_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
     }
 
     /**
@@ -201,7 +191,7 @@ class TransactionLinkController extends Controller
      */
     public function update(TransactionLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
     {
-        $manager         = new Manager;
+        $manager         = $this->getManager();
         $data            = $request->getAll();
         $data['inward']  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
         $data['outward'] = $this->journalRepository->findNull($data['outward_id'] ?? 0);

app/Api/V1/Controllers/UserController.php

@@ -2,47 +2,44 @@
 
 /**
  * UserController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\UserRequest;
+use FireflyIII\Api\V1\Requests\UserStoreRequest;
+use FireflyIII\Api\V1\Requests\UserUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Transformers\UserTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 
 /**
  * Class UserController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UserController extends Controller
 {
@@ -52,6 +49,7 @@ class UserController extends Controller
 
     /**
      * UserController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -91,20 +89,14 @@ class UserController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         // user preferences
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
+        $manager  = $this->getManager();
-        // make manager
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         // build collection
         $collection = $this->repository->all();
@@ -129,19 +121,15 @@ class UserController extends Controller
     /**
      * Show a single user.
      *
-     * @param Request $request
      * @param User $user
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, User $user): JsonResponse
+    public function show(User $user): JsonResponse
     {
         // make manager
-        $manager = new Manager();
+        $manager = $this->getManager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         // make resource
         /** @var UserTransformer $transformer */
         $transformer = app(UserTransformer::class);
@@ -155,19 +143,15 @@ class UserController extends Controller
     /**
      * Store a new user.
      *
-     * @param UserRequest $request
+     * @param UserStoreRequest $request
      *
      * @return JsonResponse
      */
-    public function store(UserRequest $request): JsonResponse
+    public function store(UserStoreRequest $request): JsonResponse
     {
         $data    = $request->getAll();
         $user    = $this->repository->store($data);
-
+        $manager = $this->getManager();
-        // make manager
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         // make resource
 
@@ -183,21 +167,16 @@ class UserController extends Controller
     /**
      * Update a user.
      *
-     * @param UserRequest $request
+     * @param UserUpdateRequest $request
      * @param User              $user
      *
      * @return JsonResponse
      */
-    public function update(UserRequest $request, User $user): JsonResponse
+    public function update(UserUpdateRequest $request, User $user): JsonResponse
     {
         $data    = $request->getAll();
         $user    = $this->repository->update($user, $data);
-
+        $manager = $this->getManager();
-        // make manager
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         // make resource
         /** @var UserTransformer $transformer */
         $transformer = app(UserTransformer::class);

app/Api/V1/Requests/AccountStoreRequest.php

@@ -4,20 +4,20 @@
  * AccountStoreRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
 
 /**
  * Class AccountStoreRequest
+ *
  * @codeCoverageIgnore
  */
 class AccountStoreRequest extends Request

app/Api/V1/Requests/AccountUpdateRequest.php

@@ -2,22 +2,22 @@
 
 /**
  * AccountUpdateRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
 
 /**
  * Class AccountUpdateRequest
+ *
  * @codeCoverageIgnore
  */
 class AccountUpdateRequest extends Request
@@ -44,6 +45,52 @@ class AccountUpdateRequest extends Request
         return auth()->check();
     }
 
+    /**
+     * @return array
+     */
+    public function getUpdateData(): array
+    {
+        $active          = null;
+        $includeNetWorth = null;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('include_net_worth')) {
+            $includeNetWorth = $this->boolean('include_net_worth');
+        }
+
+        $data = [
+            'name'                    => $this->nullableString('name'),
+            'active'                  => $active,
+            'include_net_worth'       => $includeNetWorth,
+            'account_type'            => $this->nullableString('type'),
+            'account_type_id'         => null,
+            'currency_id'             => $this->nullableInteger('currency_id'),
+            'currency_code'           => $this->nullableString('currency_code'),
+            'virtual_balance'         => $this->nullableString('virtual_balance'),
+            'iban'                    => $this->nullableString('iban'),
+            'BIC'                     => $this->nullableString('bic'),
+            'account_number'          => $this->nullableString('account_number'),
+            'account_role'            => $this->nullableString('account_role'),
+            'opening_balance'         => $this->nullableString('opening_balance'),
+            'opening_balance_date'    => $this->date('opening_balance_date'),
+            'cc_type'                 => $this->nullableString('credit_card_type'),
+            'cc_Monthly_payment_date' => $this->nullableString('monthly_payment_date'),
+            'notes'                   => $this->nullableNlString('notes'),
+            'interest'                => $this->nullableString('interest'),
+            'interest_period'         => $this->nullableString('interest_period'),
+        ];
+
+        if ('liability' === $data['account_type']) {
+            $data['opening_balance']      = bcmul($this->nullableString('liability_amount'), '-1');
+            $data['opening_balance_date'] = $this->date('liability_start_date');
+            $data['account_type']         = $this->nullableString('liability_type');
+            $data['account_type_id']      = null;
+        }
+
+        return $data;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -56,7 +103,7 @@ class AccountUpdateRequest extends Request
         $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
         $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
         $rules          = [
-            'name'                 => sprintf('required|min:1|uniqueAccountForUser:%d', $account->id),
+            'name'                 => sprintf('min:1|uniqueAccountForUser:%d', $account->id),
             'type'                 => sprintf('in:%s', $types),
             'iban'                 => 'iban|nullable',
             'bic'                  => 'bic|nullable',

app/Api/V1/Requests/AttachmentStoreRequest.php

@@ -3,20 +3,20 @@
  * AttachmentStoreRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -30,6 +30,7 @@ use FireflyIII\Rules\IsValidAttachmentModel;
 
 /**
  * Class AttachmentStoreRequest
+ *
  * @codeCoverageIgnore
  */
 class AttachmentStoreRequest extends Request
@@ -55,7 +56,7 @@ class AttachmentStoreRequest extends Request
         return [
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
-            'notes'    => $this->string('notes'),
+            'notes'    => $this->nlString('notes'),
             'model'    => $this->string('model'),
             'model_id' => $this->integer('model_id'),
         ];
@@ -77,6 +78,7 @@ class AttachmentStoreRequest extends Request
             ]
         );
         $model  = $this->string('model');
+
         return [
             'filename' => 'required|between:1,255',
             'title'    => 'between:1,255',

app/Api/V1/Requests/AttachmentUpdateRequest.php

@@ -3,20 +3,20 @@
  * AttachmentUpdateRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -51,7 +51,7 @@ class AttachmentUpdateRequest extends Request
         return [
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
-            'notes'    => $this->string('notes'),
+            'notes'    => $this->nlString('notes'),
             'model'    => $this->string('model'),
             'model_id' => $this->integer('model_id'),
         ];

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * AvailableBudgetRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);

app/Api/V1/Requests/BillRequest.php

@@ -2,22 +2,22 @@
 
 /**
  * BillRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -70,7 +70,7 @@ class BillRequest extends Request
             'repeat_freq'   => $this->string('repeat_freq'),
             'skip'          => $this->integer('skip'),
             'active'        => $active,
-            'notes'         => $this->string('notes'),
+            'notes'         => $this->nlString('notes'),
         ];
 
         return $data;

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * BudgetLimitRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);

app/Api/V1/Requests/BudgetRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * BudgetRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
 
 /**
  * Class BudgetRequest
+ *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */

app/Api/V1/Requests/CategoryRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CategoryRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -27,6 +27,7 @@ use FireflyIII\Models\Category;
 
 /**
  * Class CategoryRequest
+ *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */

app/Api/V1/Requests/ConfigurationRequest.php

@@ -2,22 +2,22 @@
 
 /**
  * ConfigurationRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
 
 /**
  * Class ConfigurationRequest
+ *
  * @codeCoverageIgnore
  */
 class ConfigurationRequest extends Request

app/Api/V1/Requests/CurrencyRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CurrencyRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
 
 /**
  * Class CurrencyRequest
+ *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */
@@ -80,7 +81,7 @@ class CurrencyRequest extends Request
         $rules = [
             'name'           => 'required|between:1,255|unique:transaction_currencies,name',
             'code'           => 'required|between:3,3|unique:transaction_currencies,code',
-            'symbol'         => 'required|between:1,5|unique:transaction_currencies,symbol',
+            'symbol'         => 'required|between:1,8|unique:transaction_currencies,symbol',
             'decimal_places' => 'between:0,20|numeric|min:0|max:20',
             'enabled'        => [new IsBoolean()],
             'default'        => [new IsBoolean()],
@@ -94,8 +95,8 @@ class CurrencyRequest extends Request
             case 'PATCH':
                 $currency        = $this->route()->parameter('currency_code');
                 $rules['name']   = 'required|between:1,255|unique:transaction_currencies,name,' . $currency->id;
-                $rules['code']   = 'required|between:1,255|unique:transaction_currencies,code,' . $currency->id;
+                $rules['code']   = 'required|between:3,3|unique:transaction_currencies,code,' . $currency->id;
-                $rules['symbol'] = 'required|between:1,255|unique:transaction_currencies,symbol,' . $currency->id;
+                $rules['symbol'] = 'required|between:1,8|unique:transaction_currencies,symbol,' . $currency->id;
                 break;
         }
 

app/Api/V1/Requests/DateRequest.php

@@ -1,24 +1,27 @@
 <?php
+
 /**
  * DateRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Requests;
 
 

app/Api/V1/Requests/LinkTypeRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * LinkTypeRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -29,6 +29,7 @@ use Illuminate\Validation\Rule;
 /**
  *
  * Class LinkTypeRequest
+ *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */

app/Api/V1/Requests/PiggyBankRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * PiggyBankRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -25,11 +25,13 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Rules\IsAssetAccountId;
+use FireflyIII\Rules\LessThanPiggyTarget;
 use FireflyIII\Rules\ZeroOrMore;
 
 /**
  *
  * Class PiggyBankRequest
+ *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */
@@ -53,17 +55,14 @@ class PiggyBankRequest extends Request
      */
     public function getAll(): array
     {
-        $current = $this->string('current_amount');
-        $current = '' === $current ? '0' : $current;
-
         return [
             'name'           => $this->string('name'),
             'account_id'     => $this->integer('account_id'),
             'targetamount'   => $this->string('target_amount'),
-            'current_amount' => $current,
+            'current_amount' => $this->string('current_amount'),
             'startdate'      => $this->date('start_date'),
             'targetdate'     => $this->date('target_date'),
-            'notes'          => $this->string('notes'),
+            'notes'          => $this->nlString('notes'),
         ];
     }
 
@@ -76,8 +75,6 @@ class PiggyBankRequest extends Request
     {
         $rules = [
             'name'           => 'required|between:1,255|uniquePiggyBankForUser',
-            'account_id'     => ['required', 'belongsToUser:accounts', new IsAssetAccountId],
-            'target_amount'  => 'required|numeric|more:0',
             'current_amount' => ['numeric', new ZeroOrMore, 'lte:target_amount'],
             'start_date'     => 'date|nullable',
             'target_date'    => 'date|nullable|after:start_date',
@@ -91,7 +88,10 @@ class PiggyBankRequest extends Request
             case 'PATCH':
                 /** @var PiggyBank $piggyBank */
                 $piggyBank               = $this->route()->parameter('piggyBank');
-                $rules['name'] = 'required|between:1,255|uniquePiggyBankForUser:' . $piggyBank->id;
+                $rules['name']           = 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id;
+                $rules['account_id']     = ['belongsToUser:accounts', new IsAssetAccountId];
+                $rules['target_amount']  = 'numeric|more:0';
+                $rules['current_amount'] = ['numeric', new ZeroOrMore, new LessThanPiggyTarget];
                 break;
         }
 

app/Api/V1/Requests/PreferenceRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * PreferenceRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests;
 /**
  *
  * Class PreferenceRequest
+ *
  * @codeCoverageIgnore
  */
 class PreferenceRequest extends Request

app/Api/V1/Requests/RecurrenceStoreRequest.php

@@ -3,26 +3,29 @@
  * RecurrenceStoreRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use Carbon\Carbon;
+use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Validation\Validator;
@@ -45,6 +48,39 @@ class RecurrenceStoreRequest extends Request
         return auth()->check();
     }
 
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $active     = true;
+        $applyRules = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('apply_rules')) {
+            $applyRules = $this->boolean('apply_rules');
+        }
+        $return = [
+            'recurrence'   => [
+                'type'         => $this->string('type'),
+                'title'        => $this->string('title'),
+                'description'  => $this->string('description'),
+                'first_date'   => $this->date('first_date'),
+                'repeat_until' => $this->date('repeat_until'),
+                'repetitions'  => $this->integer('nr_of_repetitions'),
+                'apply_rules'  => $applyRules,
+                'active'       => $active,
+            ],
+            'transactions' => $this->getTransactionData(),
+            'repetitions'  => $this->getRepetitionData(),
+        ];
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -52,7 +88,44 @@ class RecurrenceStoreRequest extends Request
      */
     public function rules(): array
     {
-        return $this->rulesRecurrence();
+        $today = Carbon::now()->addDay();
+
+        return [
+            'type'                                 => 'required|in:withdrawal,transfer,deposit',
+            'title'                                => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
+            'description'                          => 'between:1,65000',
+            'first_date'                           => 'required|date',
+            'apply_rules'                          => [new IsBoolean],
+            'active'                               => [new IsBoolean],
+            'repeat_until'                         => sprintf('date|after:%s', $today->format('Y-m-d')),
+            'nr_of_repetitions'                    => 'numeric|between:1,31',
+            'repetitions.*.type'                   => 'required|in:daily,weekly,ndom,monthly,yearly',
+            'repetitions.*.moment'                 => 'between:0,10',
+            'repetitions.*.skip'                   => 'required|numeric|between:0,31',
+            'repetitions.*.weekend'                => 'required|numeric|min:1|max:4',
+            'transactions.*.description'           => 'required|between:1,255',
+            'transactions.*.amount'                => 'required|numeric|more:0',
+            'transactions.*.foreign_amount'        => 'numeric|more:0',
+            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.destination_name'      => 'between:1,255|nullable',
+
+            // new and updated fields:
+            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
+            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.piggy_bank_id'         => ['numeric', 'mustExist:piggy_banks,id', new BelongsUser],
+            'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.tags'                  => 'between:1,64000',
+
+
+        ];
     }
 
     /**
@@ -75,4 +148,76 @@ class RecurrenceStoreRequest extends Request
             }
         );
     }
+
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     *
+     * @return array
+     */
+    private function getRepetitionData(): array
+    {
+        $return = [];
+        // repetition data:
+        /** @var array $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return [];
+        }
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $return[] = [
+                'type'    => $repetition['type'],
+                'moment'  => $repetition['moment'],
+                'skip'    => (int)$repetition['skip'],
+                'weekend' => (int)$repetition['weekend'],
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
+     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
+     *
+     * @return array
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+        // transaction data:
+        /** @var array $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return [];
+        }
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = [
+                'amount'                => $transaction['amount'],
+                'currency_id'           => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
+                'currency_code'         => $transaction['currency_code'] ?? null,
+                'foreign_amount'        => $transaction['foreign_amount'] ?? null,
+                'foreign_currency_id'   => isset($transaction['foreign_currency_id']) ? (int)$transaction['foreign_currency_id'] : null,
+                'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null,
+                'source_id'             => isset($transaction['source_id']) ? (int)$transaction['source_id'] : null,
+                'source_name'           => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
+                'destination_id'        => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
+                'destination_name'      => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
+                'description'           => $transaction['description'],
+                'type'                  => $this->string('type'),
+
+                // new and updated fields:
+                'piggy_bank_id'         => isset($transaction['piggy_bank_id']) ? (int)$transaction['piggy_bank_id'] : null,
+                'piggy_bank_name'       => $transaction['piggy_bank_name'] ?? null,
+                'tags'                  => $transaction['tags'] ?? [],
+                'budget_id'             => isset($transaction['budget_id']) ? (int)$transaction['budget_id'] : null,
+                'budget_name'           => $transaction['budget_name'] ?? null,
+                'category_id'           => isset($transaction['category_id']) ? (int)$transaction['category_id'] : null,
+                'category_name'         => $transaction['category_name'] ?? null,
+            ];
+        }
+
+        return $return;
+    }
 }

app/Api/V1/Requests/RecurrenceUpdateRequest.php

@@ -1,28 +1,31 @@
 <?php
 /**
  * RecurrenceUpdateRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Models\Recurrence;
+use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Validation\Validator;
@@ -45,6 +48,40 @@ class RecurrenceUpdateRequest extends Request
         return auth()->check();
     }
 
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $active     = null;
+        $applyRules = null;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('apply_rules')) {
+            $applyRules = $this->boolean('apply_rules');
+        }
+        $return = [
+            'recurrence'   => [
+                'type'              => $this->nullableString('type'),
+                'title'             => $this->nullableString('title'),
+                'description'       => $this->nullableString('description'),
+                'first_date'        => $this->date('first_date'),
+                'notes'             => $this->nullableNlString('notes'),
+                'repeat_until'      => $this->date('repeat_until'),
+                'nr_of_repetitions' => $this->nullableInteger('nr_of_repetitions'),
+                'apply_rules'       => $applyRules,
+                'active'            => $active,
+            ],
+            'transactions' => $this->getTransactionData(),
+            'repetitions'  => $this->getRepetitionData(),
+        ];
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -52,7 +89,45 @@ class RecurrenceUpdateRequest extends Request
      */
     public function rules(): array
     {
-        return $this->rulesRecurrence();
+        /** @var Recurrence $recurrence */
+        $recurrence = $this->route()->parameter('recurrence');
+
+        return [
+            'type'                  => 'in:withdrawal,transfer,deposit',
+            'title'                 => sprintf('between:1,255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id),
+            'description'           => 'between:1,65000',
+            'first_date'            => 'date',
+            'apply_rules'           => [new IsBoolean],
+            'active'                => [new IsBoolean],
+            'repeat_until'          => 'date',
+            'nr_of_repetitions'     => 'numeric|between:1,31',
+            'repetitions.*.type'    => 'in:daily,weekly,ndom,monthly,yearly',
+            'repetitions.*.moment'  => 'between:0,10',
+            'repetitions.*.skip'    => 'required|numeric|between:0,31',
+            'repetitions.*.weekend' => 'required|numeric|min:1|max:4',
+
+            'transactions.*.description'           => 'required|between:1,255',
+            'transactions.*.amount'                => 'required|numeric|more:0',
+            'transactions.*.foreign_amount'        => 'numeric|more:0',
+            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.destination_name'      => 'between:1,255|nullable',
+
+            // new and updated fields:
+            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
+            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.piggy_bank_id'         => ['numeric', 'mustExist:piggy_banks,id', new BelongsUser],
+            'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.tags'                  => 'between:1,64000',
+
+        ];
     }
 
     /**
@@ -66,13 +141,85 @@ class RecurrenceUpdateRequest extends Request
     {
         $validator->after(
             function (Validator $validator) {
-                $this->validateOneTransaction($validator);
+                $this->validateOneRecurrenceTransactionUpdate($validator);
-                $this->validateOneRepetition($validator);
+                $this->validateOneRepetitionUpdate($validator);
                 $this->validateRecurrenceRepetition($validator);
                 $this->validateRepetitionMoment($validator);
                 $this->validateForeignCurrencyInformation($validator);
-                $this->validateAccountInformation($validator);
+                $this->valUpdateAccountInfo($validator);
             }
         );
     }
+
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     *
+     * @return array|null
+     */
+    private function getRepetitionData(): ?array
+    {
+        $return = [];
+        // repetition data:
+        /** @var array $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return null;
+        }
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $return[] = [
+                'type'    => $repetition['type'],
+                'moment'  => $repetition['moment'],
+                'skip'    => (int)$repetition['skip'],
+                'weekend' => (int)$repetition['weekend'],
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
+     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
+     *
+     * @return array|null
+     */
+    private function getTransactionData(): ?array
+    {
+        $return = [];
+        // transaction data:
+        /** @var array $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return null;
+        }
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = [
+                'amount'                => $transaction['amount'],
+                'currency_id'           => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
+                'currency_code'         => $transaction['currency_code'] ?? null,
+                'foreign_amount'        => $transaction['foreign_amount'] ?? null,
+                'foreign_currency_id'   => isset($transaction['foreign_currency_id']) ? (int)$transaction['foreign_currency_id'] : null,
+                'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null,
+                'source_id'             => isset($transaction['source_id']) ? (int)$transaction['source_id'] : null,
+                'source_name'           => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
+                'destination_id'        => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
+                'destination_name'      => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
+                'description'           => $transaction['description'],
+                'type'                  => $this->string('type'),
+
+                // new and updated fields:
+                'piggy_bank_id'         => isset($transaction['piggy_bank_id']) ? (int)$transaction['piggy_bank_id'] : null,
+                'piggy_bank_name'       => $transaction['piggy_bank_name'] ?? null,
+                'tags'                  => $transaction['tags'] ?? [],
+                'budget_id'             => isset($transaction['budget_id']) ? (int)$transaction['budget_id'] : null,
+                'budget_name'           => $transaction['budget_name'] ?? null,
+                'category_id'           => isset($transaction['category_id']) ? (int)$transaction['category_id'] : null,
+                'category_name'         => $transaction['category_name'] ?? null,
+            ];
+        }
+
+        return $return;
+    }
 }

app/Api/V1/Requests/Request.php

@@ -2,32 +2,29 @@
 
 /**
  * Request.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-use Carbon\Carbon;
 use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
-use FireflyIII\Rules\BelongsUser;
-use FireflyIII\Rules\IsBoolean;
 
 /**
  * Class Request.
@@ -68,7 +65,7 @@ class Request extends FireflyIIIRequest
             'opening_balance_date'    => $this->date('opening_balance_date'),
             'cc_type'                 => $this->string('credit_card_type'),
             'cc_Monthly_payment_date' => $this->string('monthly_payment_date'),
-            'notes'                   => $this->string('notes'),
+            'notes'                   => $this->nlString('notes'),
             'interest'                => $this->string('interest'),
             'interest_period'         => $this->string('interest_period'),
         ];
@@ -82,147 +79,4 @@ class Request extends FireflyIIIRequest
 
         return $data;
     }
-
-    /**
-     * Get all data from the request.
-     *
-     * @return array
-     */
-    public function getAllRecurrenceData(): array
-    {
-        $active     = true;
-        $applyRules = true;
-        if (null !== $this->get('active')) {
-            $active = $this->boolean('active');
-        }
-        if (null !== $this->get('apply_rules')) {
-            $applyRules = $this->boolean('apply_rules');
-        }
-        $return = [
-            'recurrence'   => [
-                'type'         => $this->string('type'),
-                'title'        => $this->string('title'),
-                'description'  => $this->string('description'),
-                'first_date'   => $this->date('first_date'),
-                'repeat_until' => $this->date('repeat_until'),
-                'repetitions'  => $this->integer('nr_of_repetitions'),
-                'apply_rules'  => $applyRules,
-                'active'       => $active,
-            ],
-            'meta'         => [
-                'piggy_bank_id'   => $this->integer('piggy_bank_id'),
-                'piggy_bank_name' => $this->string('piggy_bank_name'),
-                'tags'            => explode(',', $this->string('tags')),
-            ],
-            'transactions' => $this->getRecurrenceTransactionData(),
-            'repetitions'  => $this->getRecurrenceRepetitionData(),
-        ];
-
-        return $return;
-    }
-
-    /**
-     * The rules that the incoming request must be matched against.
-     *
-     * @return array
-     */
-    protected function rulesRecurrence(): array
-    {
-        $today = Carbon::now()->addDay();
-
-        return [
-            'type'                                 => 'required|in:withdrawal,transfer,deposit',
-            'title'                                => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
-            'description'                          => 'between:1,65000',
-            'first_date'                           => sprintf('required|date|after:%s', $today->format('Y-m-d')),
-            'apply_rules'                          => [new IsBoolean],
-            'active'                               => [new IsBoolean],
-            'repeat_until'                         => sprintf('date|after:%s', $today->format('Y-m-d')),
-            'nr_of_repetitions'                    => 'numeric|between:1,31',
-            'tags'                                 => 'between:1,64000',
-            'piggy_bank_id'                        => 'numeric',
-            'repetitions.*.type'                   => 'required|in:daily,weekly,ndom,monthly,yearly',
-            'repetitions.*.moment'                 => 'between:0,10',
-            'repetitions.*.skip'                   => 'required|numeric|between:0,31',
-            'repetitions.*.weekend'                => 'required|numeric|min:1|max:4',
-            'transactions.*.description'           => 'required|between:1,255',
-            'transactions.*.amount'                => 'required|numeric|more:0',
-            'transactions.*.foreign_amount'        => 'numeric|more:0',
-            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
-            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
-            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
-            'transactions.*.category_name'         => 'between:1,255|nullable',
-            'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
-            'transactions.*.source_name'           => 'between:1,255|nullable',
-            'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
-            'transactions.*.destination_name'      => 'between:1,255|nullable',
-
-
-        ];
-    }
-
-    /**
-     * Returns the repetition data as it is found in the submitted data.
-     *
-     * @return array
-     */
-    protected function getRecurrenceRepetitionData(): array
-    {
-        $return = [];
-        // repetition data:
-        /** @var array $repetitions */
-        $repetitions = $this->get('repetitions');
-        /** @var array $repetition */
-        foreach ($repetitions as $repetition) {
-            $return[] = [
-                'type'    => $repetition['type'],
-                'moment'  => $repetition['moment'],
-                'skip'    => (int)$repetition['skip'],
-                'weekend' => (int)$repetition['weekend'],
-            ];
-        }
-
-        return $return;
-    }
-
-
-    /**
-     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
-     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
-     *
-     * @return array
-     */
-    protected function getRecurrenceTransactionData(): array
-    {
-        $return = [];
-        // transaction data:
-        /** @var array $transactions */
-        $transactions = $this->get('transactions');
-        /** @var array $transaction */
-        foreach ($transactions as $transaction) {
-            $return[] = [
-                'amount'                => $transaction['amount'],
-                'currency_id'           => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
-                'currency_code'         => $transaction['currency_code'] ?? null,
-                'foreign_amount'        => $transaction['foreign_amount'] ?? null,
-                'foreign_currency_id'   => isset($transaction['foreign_currency_id']) ? (int)$transaction['foreign_currency_id'] : null,
-                'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null,
-                'budget_id'             => isset($transaction['budget_id']) ? (int)$transaction['budget_id'] : null,
-                'budget_name'           => $transaction['budget_name'] ?? null,
-                'category_id'           => isset($transaction['category_id']) ? (int)$transaction['category_id'] : null,
-                'category_name'         => $transaction['category_name'] ?? null,
-                'source_id'             => isset($transaction['source_id']) ? (int)$transaction['source_id'] : null,
-                'source_name'           => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
-                'destination_id'        => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
-                'destination_name'      => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
-                'description'           => $transaction['description'],
-                'type'                  => $this->string('type'),
-            ];
-        }
-
-        return $return;
-    }
-
 }

app/Api/V1/Requests/RuleGroupRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * RuleGroupRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);

app/Api/V1/Requests/RuleGroupTestRequest.php

@@ -1,24 +1,28 @@
 <?php
+
 /**
  * RuleGroupTestRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
+
 namespace FireflyIII\Api\V1\Requests;
 
 
@@ -71,8 +75,33 @@ class RuleGroupTestRequest extends Request
         return [];
     }
 
+    /**
+     * @return Collection
+     */
+    private function getAccounts(): Collection
+    {
+        $accountList = '' === (string)$this->query('accounts') ? [] : explode(',', $this->query('accounts'));
+        $accounts    = new Collection;
+
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+
+        foreach ($accountList as $accountId) {
+            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
+            $account = $accountRepository->findNull((int)$accountId);
+            if ($this->validAccount($account)) {
+                /** @noinspection NullPointerExceptionInspection */
+                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
+                $accounts->push($account);
+            }
+        }
+
+        return $accounts;
+    }
+
     /**
      * @param string $field
+     *
      * @return Carbon|null
      */
     private function getDate(string $field): ?Carbon
@@ -108,32 +137,9 @@ class RuleGroupTestRequest extends Request
         return 0 === (int)$this->query('triggered_limit') ? (int)config('firefly.test-triggers.range') : (int)$this->query('triggered_limit');
     }
 
-    /**
-     * @return Collection
-     */
-    private function getAccounts(): Collection
-    {
-        $accountList = '' === (string)$this->query('accounts') ? [] : explode(',', $this->query('accounts'));
-        $accounts    = new Collection;
-
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-
-        foreach ($accountList as $accountId) {
-            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
-            $account = $accountRepository->findNull((int)$accountId);
-            if ($this->validAccount($account)) {
-                /** @noinspection NullPointerExceptionInspection */
-                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
-                $accounts->push($account);
-            }
-        }
-
-        return $accounts;
-    }
-
     /**
      * @param Account|null $account
+     *
      * @return bool
      */
     private function validAccount(?Account $account): bool

app/Api/V1/Requests/RuleGroupTriggerRequest.php

@@ -1,24 +1,28 @@
 <?php
+
 /**
  * RuleGroupTriggerRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
+
 namespace FireflyIII\Api\V1\Requests;
 
 
@@ -71,18 +75,6 @@ class RuleGroupTriggerRequest extends Request
         ];
     }
 
-    /**
-     * @param string $field
-     * @return Carbon|null
-     */
-    private function getDate(string $field): ?Carbon
-    {
-        /** @var Carbon $result */
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
-
-        return $result;
-    }
-
     /**
      * @return Collection
      */
@@ -107,8 +99,22 @@ class RuleGroupTriggerRequest extends Request
         return $accounts;
     }
 
+    /**
+     * @param string $field
+     *
+     * @return Carbon|null
+     */
+    private function getDate(string $field): ?Carbon
+    {
+        /** @var Carbon $result */
+        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+
+        return $result;
+    }
+
     /**
      * @param Account|null $account
+     *
      * @return bool
      */
     private function validAccount(?Account $account): bool

app/Api/V1/Requests/RuleStoreRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
- * RuleRequest.php
+ * RuleStoreRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -29,10 +29,10 @@ use function is_array;
 
 
 /**
- * Class RuleRequest
+ * Class RuleStoreRequest
  *
  */
-class RuleRequest extends Request
+class RuleStoreRequest extends Request
 {
     /**
      * Authorize logged in users.
@@ -133,21 +133,6 @@ class RuleRequest extends Request
         );
     }
 
-    /**
-     * Adds an error to the validator when there are no repetitions in the array of data.
-     *
-     * @param Validator $validator
-     */
-    protected function atLeastOneTrigger(Validator $validator): void
-    {
-        $data     = $validator->getData();
-        $triggers = $data['triggers'] ?? [];
-        // need at least one trigger
-        if (0 === count($triggers)) {
-            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
-        }
-    }
-
     /**
      * Adds an error to the validator when there are no repetitions in the array of data.
      *
@@ -164,26 +149,20 @@ class RuleRequest extends Request
     }
 
     /**
-     * @return array
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
      */
-    private function getRuleTriggers(): array
+    protected function atLeastOneTrigger(Validator $validator): void
     {
-        $triggers = $this->get('triggers');
+        $data     = $validator->getData();
-        $return   = [];
+        $triggers = $data['triggers'] ?? [];
-        if (is_array($triggers)) {
+        // need at least one trigger
-            foreach ($triggers as $trigger) {
+        if (0 === count($triggers)) {
-                $return[] = [
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
-                    'type'            => $trigger['type'],
-                    'value'           => $trigger['value'],
-                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'false')),
-                    'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
-                ];
         }
     }
 
-        return $return;
-    }
-
     /**
      * @return array
      */
@@ -204,4 +183,25 @@ class RuleRequest extends Request
 
         return $return;
     }
+
+    /**
+     * @return array
+     */
+    private function getRuleTriggers(): array
+    {
+        $triggers = $this->get('triggers');
+        $return   = [];
+        if (is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
 }

app/Api/V1/Requests/RuleTestRequest.php

@@ -1,24 +1,28 @@
 <?php
+
 /**
  * RuleTestRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
+
 namespace FireflyIII\Api\V1\Requests;
 
 
@@ -71,8 +75,33 @@ class RuleTestRequest extends Request
         return [];
     }
 
+    /**
+     * @return Collection
+     */
+    private function getAccounts(): Collection
+    {
+        $accountList = '' === (string)$this->query('accounts') ? [] : explode(',', $this->query('accounts'));
+        $accounts    = new Collection;
+
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+
+        foreach ($accountList as $accountId) {
+            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
+            $account = $accountRepository->findNull((int)$accountId);
+            if ($this->validAccount($account)) {
+                /** @noinspection NullPointerExceptionInspection */
+                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
+                $accounts->push($account);
+            }
+        }
+
+        return $accounts;
+    }
+
     /**
      * @param string $field
+     *
      * @return Carbon|null
      */
     private function getDate(string $field): ?Carbon
@@ -108,32 +137,9 @@ class RuleTestRequest extends Request
         return 0 === (int)$this->query('triggered_limit') ? (int)config('firefly.test-triggers.range') : (int)$this->query('triggered_limit');
     }
 
-    /**
-     * @return Collection
-     */
-    private function getAccounts(): Collection
-    {
-        $accountList = '' === (string)$this->query('accounts') ? [] : explode(',', $this->query('accounts'));
-        $accounts    = new Collection;
-
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-
-        foreach ($accountList as $accountId) {
-            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
-            $account = $accountRepository->findNull((int)$accountId);
-            if ($this->validAccount($account)) {
-                /** @noinspection NullPointerExceptionInspection */
-                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
-                $accounts->push($account);
-            }
-        }
-
-        return $accounts;
-    }
-
     /**
      * @param Account|null $account
+     *
      * @return bool
      */
     private function validAccount(?Account $account): bool

app/Api/V1/Requests/RuleTriggerRequest.php

@@ -1,24 +1,27 @@
 <?php
+
 /**
  * RuleTriggerRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Requests;
 
 
@@ -71,18 +74,6 @@ class RuleTriggerRequest extends Request
         ];
     }
 
-    /**
-     * @param string $field
-     * @return Carbon|null
-     */
-    private function getDate(string $field): ?Carbon
-    {
-        /** @var Carbon $result */
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
-
-        return $result;
-    }
-
     /**
      * @return Collection
      */
@@ -107,8 +98,22 @@ class RuleTriggerRequest extends Request
         return $accounts;
     }
 
+    /**
+     * @param string $field
+     *
+     * @return Carbon|null
+     */
+    private function getDate(string $field): ?Carbon
+    {
+        /** @var Carbon $result */
+        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+
+        return $result;
+    }
+
     /**
      * @param Account|null $account
+     *
      * @return bool
      */
     private function validAccount(?Account $account): bool

app/Api/V1/Requests/RuleUpdateRequest.php

@@ -0,0 +1,214 @@
+<?php
+/**
+ * RuleUpdateRequest.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Rules\IsBoolean;
+use Illuminate\Validation\Validator;
+use function is_array;
+
+
+/**
+ * Class RuleUpdateRequest
+ *
+ */
+class RuleUpdateRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $strict         = null;
+        $active         = null;
+        $stopProcessing = null;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('strict')) {
+            $strict = $this->boolean('strict');
+        }
+        if (null !== $this->get('stop_processing')) {
+            $stopProcessing = $this->boolean('stop_processing');
+        }
+
+        $data = [
+            'title'            => $this->nullableString('title'),
+            'description'      => $this->nullableString('description'),
+            'rule_group_id'    => $this->nullableInteger('rule_group_id'),
+            'rule_group_title' => $this->nullableString('rule_group_title'),
+            'trigger'          => $this->nullableString('trigger'),
+            'strict'           => $strict,
+            'stop_processing'  => $stopProcessing,
+            'active'           => $active,
+            'triggers'         => $this->getRuleTriggers(),
+            'actions'          => $this->getRuleActions(),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $validTriggers = array_keys(config('firefly.rule-triggers'));
+        $validActions  = array_keys(config('firefly.rule-actions'));
+        $rule          = $this->route()->parameter('rule');
+
+        // some triggers and actions require text:
+        $contextTriggers = implode(',', config('firefly.context-rule-triggers'));
+        $contextActions  = implode(',', config('firefly.context-rule-actions'));
+        $rules           = [
+            'title'                      => sprintf('between:1,100|uniqueObjectForUser:rules,title,%d', $rule->id),
+            'description'                => 'between:1,5000|nullable',
+            'rule_group_id'              => 'belongsToUser:rule_groups',
+            'rule_group_title'           => 'nullable|between:1,255|belongsToUser:rule_groups,title',
+            'trigger'                    => 'in:store-journal,update-journal',
+            'triggers.*.type'            => 'required|in:' . implode(',', $validTriggers),
+            'triggers.*.value'           => 'required_if:actions.*.type,' . $contextTriggers . '|min:1|ruleTriggerValue',
+            'triggers.*.stop_processing' => [new IsBoolean],
+            'triggers.*.active'          => [new IsBoolean],
+            'actions.*.type'             => 'required|in:' . implode(',', $validActions),
+            'actions.*.value'            => 'required_if:actions.*.type,' . $contextActions . '|ruleActionValue',
+            'actions.*.stop_processing'  => [new IsBoolean],
+            'actions.*.active'           => [new IsBoolean],
+            'strict'                     => [new IsBoolean],
+            'stop_processing'            => [new IsBoolean],
+            'active'                     => [new IsBoolean],
+        ];
+
+        return $rules;
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->atLeastOneTrigger($validator);
+                $this->atLeastOneAction($validator);
+            }
+        );
+    }
+
+    /**
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneAction(Validator $validator): void
+    {
+        $data    = $validator->getData();
+        $actions = $data['actions'] ?? null;
+        // need at least one action
+        if (is_array($actions) && 0 === count($actions)) {
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_action'));
+        }
+    }
+
+    /**
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneTrigger(Validator $validator): void
+    {
+        $data     = $validator->getData();
+        $triggers = $data['triggers'] ?? null;
+        // need at least one trigger
+        if (is_array($triggers) && 0 === count($triggers)) {
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
+        }
+    }
+
+    /**
+     * @return array|null
+     */
+    private function getRuleActions(): ?array
+    {
+        if (!$this->has('actions')) {
+            return null;
+        }
+        $actions = $this->get('actions');
+        $return  = [];
+        if (is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'type'            => $action['type'],
+                    'value'           => $action['value'],
+                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return array|null
+     */
+    private function getRuleTriggers(): ?array
+    {
+        if (!$this->has('triggers')) {
+            return null;
+        }
+        $triggers = $this->get('triggers');
+        $return   = [];
+        if (is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+}

app/Api/V1/Requests/TagRequest.php

@@ -2,22 +2,22 @@
 
 /**
  * TagRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);

app/Api/V1/Requests/TransactionLinkRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * TransactionLinkRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -57,7 +57,7 @@ class TransactionLinkRequest extends Request
             'link_type_name' => $this->string('link_type_name'),
             'inward_id'      => $this->integer('inward_id'),
             'outward_id'     => $this->integer('outward_id'),
-            'notes'          => $this->string('notes'),
+            'notes'          => $this->nlString('notes'),
         ];
     }
 

app/Api/V1/Requests/TransactionStoreRequest.php

@@ -2,22 +2,22 @@
 
 /**
  * TransactionStoreRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -74,7 +74,7 @@ class TransactionStoreRequest extends Request
     {
         $rules = [
             // basic fields for group:
-            'group_title'                          => 'between:1,255',
+            'group_title'                          => 'between:1,1000',
 
             // transaction rules (in array for splits):
             'transactions.*.type'                  => 'required|in:withdrawal,deposit,transfer,opening-balance,reconciliation',
@@ -92,7 +92,7 @@ class TransactionStoreRequest extends Request
             'transactions.*.foreign_amount'        => 'numeric|more:0',
 
             // description
-            'transactions.*.description'           => 'nullable|between:1,255',
+            'transactions.*.description'           => 'nullable|between:1,1000',
 
             // source of transaction
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
@@ -115,7 +115,7 @@ class TransactionStoreRequest extends Request
             // other interesting fields
             'transactions.*.reconciled'            => [new IsBoolean],
             'transactions.*.notes'                 => 'min:1,max:50000|nullable',
-            'transactions.*.tags'                  => 'between:1,255',
+            'transactions.*.tags'                  => 'between:0,255',
 
             // meta info fields
             'transactions.*.internal_reference'    => 'min:1,max:255|nullable',
@@ -242,7 +242,7 @@ class TransactionStoreRequest extends Request
 
                 // some other interesting properties
                 'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
-                'notes'                 => $this->stringFromValue($object['notes']),
+                'notes'                 => $this->nlStringFromValue($object['notes']),
                 'tags'                  => $this->arrayFromValue($object['tags']),
 
                 // all custom fields:

app/Api/V1/Requests/TransactionUpdateRequest.php

@@ -4,20 +4,20 @@
  * TransactionUpdateRequest.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -49,6 +49,8 @@ class TransactionUpdateRequest extends Request
     private $integerFields;
     /** @var array Fields that contain string values. */
     private $stringFields;
+    /** @var array Fields that contain text (with newlines) */
+    private $textareaFields;
 
     /**
      * Authorize logged in users.
@@ -91,6 +93,10 @@ class TransactionUpdateRequest extends Request
             'invoice_date',
         ];
 
+        $this->textareaFields = [
+            'notes',
+        ];
+
         $this->stringFields  = [
             'type',
             'currency_code',
@@ -103,7 +109,6 @@ class TransactionUpdateRequest extends Request
             'budget_name',
             'category_name',
             'bill_name',
-            'notes',
             'internal_reference',
             'external_id',
             'bunq_payment_id',
@@ -144,7 +149,7 @@ class TransactionUpdateRequest extends Request
     {
         $rules = [
             // basic fields for group:
-            'group_title'                          => 'between:1,255',
+            'group_title'                          => 'between:1,1000',
 
             // transaction rules (in array for splits):
             'transactions.*.type'                  => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
@@ -158,11 +163,11 @@ class TransactionUpdateRequest extends Request
             'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
 
             // amount
-            'transactions.*.amount'                => 'numeric|more:0',
+            'transactions.*.amount'                => 'numeric|more:0|max:100000000000',
             'transactions.*.foreign_amount'        => 'numeric|gte:0',
 
             // description
-            'transactions.*.description'           => 'nullable|between:1,255',
+            'transactions.*.description'           => 'nullable|between:1,1000',
 
             // source of transaction
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
@@ -256,7 +261,6 @@ class TransactionUpdateRequest extends Request
                 //                // validate foreign currency info
                 //                $this->validateForeignCurrencyInformation($validator);
                 //
-                //
 
                 //
                 //                // make sure all splits have valid source + dest info
@@ -297,6 +301,12 @@ class TransactionUpdateRequest extends Request
                 }
             }
 
+            foreach ($this->textareaFields as $fieldName) {
+                if (array_key_exists($fieldName, $transaction)) {
+                    $current[$fieldName] = $this->nlStringFromValue((string)$transaction[$fieldName]);
+                }
+            }
+
             foreach ($this->dateFields as $fieldName) {
                 Log::debug(sprintf('Now at date field %s', $fieldName));
                 if (array_key_exists($fieldName, $transaction)) {

app/Api/V1/Requests/UserStoreRequest.php

@@ -1,23 +1,23 @@
 <?php
 
 /**
- * UserRequest.php
+ * UserStoreRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -30,11 +30,9 @@ use FireflyIII\User;
 
 
 /**
- * Class UserRequest
+ * Class UserStoreRequest
- * @codeCoverageIgnore
- * TODO AFTER 4.8,0: split this into two request classes.
  */
-class UserRequest extends Request
+class UserStoreRequest extends Request
 {
     /**
      * Authorize logged in users.
@@ -68,7 +66,7 @@ class UserRequest extends Request
     public function getAll(): array
     {
         $blocked = false;
-        if (null === $this->get('blocked')) {
+        if (null !== $this->get('blocked')) {
             $blocked = $this->boolean('blocked');
         }
         $data = [
@@ -88,23 +86,12 @@ class UserRequest extends Request
      */
     public function rules(): array
     {
-        $rules = [
+        return [
-            'email'        => 'required|email|unique:users,email,',
+            'email'        => 'required|email|unique:users,email',
             'blocked'      => [new IsBoolean],
             'blocked_code' => 'in:email_changed',
             'role'         => 'in:owner,demo',
         ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                $user           = $this->route()->parameter('user');
-                $rules['email'] = 'required|email|unique:users,email,' . $user->id;
-                break;
-        }
-
-        return $rules;
     }
 
 }

app/Api/V1/Requests/UserUpdateRequest.php

@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * UserUpdateRequest.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\User;
+
+
+/**
+ * Class UserUpdateRequest
+ */
+class UserUpdateRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        $result = false;
+        // Only allow authenticated users
+        if (auth()->check()) {
+            /** @var User $user */
+            $user = auth()->user();
+
+            /** @var UserRepositoryInterface $repository */
+            $repository = app(UserRepositoryInterface::class);
+
+            if ($repository->hasRole($user, 'owner')) {
+                $result = true; // @codeCoverageIgnore
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $blocked = false;
+        if (null !== $this->get('blocked')) {
+            $blocked = $this->boolean('blocked');
+        }
+        $data = [
+            'email'        => $this->string('email'),
+            'blocked'      => $blocked,
+            'blocked_code' => $this->string('blocked_code'),
+            'role'         => $this->string('role'),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $user  = $this->route()->parameter('user');
+        $rules = [
+            'email'        => sprintf('email|unique:users,email,%d', $user->id),
+            'blocked'      => [new IsBoolean],
+            'blocked_code' => 'in:email_changed',
+            'role'         => 'in:owner,demo,',
+        ];
+
+        return $rules;
+    }
+
+}

app/Console/Commands/Correction/CorrectDatabase.php

@@ -3,20 +3,20 @@
  * CorrectDatabase.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -70,6 +70,9 @@ class CorrectDatabase extends Command
             'firefly-iii:delete-empty-groups',
             'firefly-iii:fix-account-types',
             'firefly-iii:rename-meta-fields',
+            'firefly-iii:fix-ob-currencies',
+            'firefly-iii:fix-long-descriptions',
+            'firefly-iii:restore-oauth-keys'
         ];
         foreach ($commands as $command) {
             $this->line(sprintf('Now executing %s', $command));

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -0,0 +1,158 @@
+<?php
+/**
+ * CorrectOpeningBalanceCurrencies.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Illuminate\Console\Command;
+use Log;
+
+/**
+ * Class CorrectOpeningBalanceCurrencies
+ */
+class CorrectOpeningBalanceCurrencies extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Will make sure that opening balance transaction currencies match the account they\'re for.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-ob-currencies';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        // get all OB journals:
+        $set = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->whereNull('transaction_journals.deleted_at')
+            ->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*']);
+
+        $this->line(sprintf('Going to verify %d opening balance transactions.', $set->count()));
+        $count = 0;
+        /** @var TransactionJournal $journal */
+        foreach ($set as $journal) {
+            $count += $this->correctJournal($journal);
+        }
+
+        if ($count > 0) {
+            $this->line(sprintf('Corrected %d opening balance transactions.', $count));
+        }
+        if (0 === $count) {
+            $this->info('There was nothing to fix in the opening balance transactions.');
+        }
+
+        return 0;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return int
+     */
+    private function correctJournal(TransactionJournal $journal): int
+    {
+        Log::debug(sprintf('Going to correct journal #%d', $journal->id));
+        // get the asset account for this opening balance:
+        $account = $this->getAccount($journal);
+        if (null === $account) {
+            $this->warn(sprintf('Transaction journal #%d has no valid account. Cant fix this line.', $journal->id));
+
+            return 0;
+        }
+        Log::debug(sprintf('Found %s #%d "%s".', $account->accountType->type, $account->id, $account->name));
+        $currency = $this->getCurrency($account);
+        Log::debug(sprintf('Found currency #%d (%s)', $currency->id, $currency->code));
+
+        // update journal and all transactions:
+        $this->setCurrency($journal, $currency);
+
+        return 1;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Account|null
+     */
+    private function getAccount(TransactionJournal $journal): ?Account
+    {
+        $excluded     = [];
+        $transactions = $journal->transactions()->with(['account', 'account.accountType'])->get();
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $account = $transaction->account;
+            if (null !== $account) {
+                if (AccountType::INITIAL_BALANCE !== $account->accountType->type) {
+                    return $account;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return TransactionCurrency
+     */
+    private function getCurrency(Account $account): TransactionCurrency
+    {
+        /** @var AccountRepositoryInterface $repos */
+        $repos = app(AccountRepositoryInterface::class);
+        $repos->setUser($account->user);
+
+        return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user);
+    }
+
+    /**
+     * @param TransactionJournal  $journal
+     * @param TransactionCurrency $currency
+     */
+    private function setCurrency(TransactionJournal $journal, TransactionCurrency $currency): void
+    {
+        $journal->transaction_currency_id = $currency->id;
+        $journal->save();
+
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions as $transaction) {
+            $transaction->transaction_currency_id = $currency->id;
+            $transaction->save();
+        }
+    }
+}

app/Console/Commands/Correction/CorrectionSkeleton.php.stub

@@ -1,23 +1,4 @@
 <?php
-/**
- * VerifySkeleton.php
- * Copyright (c) 2019 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/>.
- */
 
 namespace FireflyIII\Console\Commands\Correction;
 

app/Console/Commands/Correction/CreateAccessTokens.php

@@ -3,22 +3,25 @@
  * CreateAccessTokens.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use Exception;

app/Console/Commands/Correction/CreateLinkTypes.php

@@ -3,22 +3,24 @@
  * CreateLinkTypes.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\LinkType;

app/Console/Commands/Correction/DeleteEmptyGroups.php

@@ -3,22 +3,24 @@
  * DeleteEmptyGroups.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use Exception;
@@ -54,13 +56,28 @@ class DeleteEmptyGroups extends Command
     {
         $start  = microtime(true);
         $groups = array_unique(TransactionJournal::get(['transaction_group_id'])->pluck('transaction_group_id')->toArray());
-        $count  = TransactionGroup::whereNull('deleted_at')->whereNotIn('id', $groups)->count();
+
-        if (0 === $count) {
+        // make chunks so SQLite can take the strain:
+        $chunks = array_chunk($groups, 500);
+        $total  = 0;
+        foreach ($chunks as $chunk) {
+            $count = TransactionGroup::whereNull('deleted_at')->whereNotIn('id', $chunk)->count();
+            $total += $count;
+        }
+        if (0 === $total) {
             $this->info('No empty transaction groups.');
         }
-        if ($count > 0) {
+
-            $this->info(sprintf('Deleted %d empty transaction group(s).', $count));
+        unset($chunks, $chunk, $count);
-            TransactionGroup::whereNull('deleted_at')->whereNotIn('id', $groups)->delete();
+
+        if ($total > 0) {
+            $this->info(sprintf('Deleted %d empty transaction group(s).', $total));
+
+            // again, chunks for SQLite.
+            $chunks = array_chunk($groups, 500);
+            foreach ($chunks as $chunk) {
+                TransactionGroup::whereNull('deleted_at')->whereNotIn('id', $chunk)->delete();
+            }
         }
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified empty groups in %s seconds', $end));

app/Console/Commands/Correction/DeleteEmptyJournals.php

@@ -3,22 +3,24 @@
  * DeleteEmptyJournals.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use DB;

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -3,22 +3,24 @@
  * DeleteOrphanedTransactions.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use Exception;

app/Console/Commands/Correction/DeleteZeroAmount.php

@@ -3,22 +3,24 @@
  * DeleteZeroAmount.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use Exception;

app/Console/Commands/Correction/EnableCurrencies.php

@@ -3,22 +3,24 @@
  * EnableCurrencies.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\AccountMeta;

app/Console/Commands/Correction/FixAccountTypes.php

@@ -3,22 +3,24 @@
  * FixAccountTypes.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Exceptions\FireflyException;

app/Console/Commands/Correction/FixLongDescriptions.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * FixLongDescriptions.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Console\Command;
+
+/**
+ * Class FixLongDescriptions
+ */
+class FixLongDescriptions extends Command
+{
+    private const MAX_LENGTH = 1000;
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes long descriptions in journals and groups.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-long-descriptions';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $start = microtime(true);
+        $journals = TransactionJournal::get(['id', 'description']);
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            if (strlen($journal->description) > self::MAX_LENGTH) {
+                $journal->description = substr($journal->description, 0, self::MAX_LENGTH);
+                $journal->save();
+                $this->line(sprintf('Truncated description of transaction journal #%d', $journal->id));
+            }
+        }
+
+        $groups = TransactionGroup::get(['id', 'title']);
+        /** @var TransactionGroup $group */
+        foreach ($groups as $group) {
+            if (strlen($group->title) > self::MAX_LENGTH) {
+                $group->title = substr($group->title, 0, self::MAX_LENGTH);
+                $group->save();
+                $this->line(sprintf('Truncated description of transaction group #%d', $group->id));
+            }
+        }
+        $end = round(microtime(true) - $start, 2);
+        $this->info(sprintf('Verified all transaction group and journal title lengths in %s seconds.', $end));
+        return 0;
+    }
+}

app/Console/Commands/Correction/FixPiggies.php

@@ -3,22 +3,24 @@
  * FixPiggies.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\PiggyBankEvent;

app/Console/Commands/Correction/FixUnevenAmount.php

@@ -3,22 +3,24 @@
  * FixUnevenAmount.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use DB;

app/Console/Commands/Correction/RemoveBills.php

@@ -3,22 +3,24 @@
  * RemoveBills.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\TransactionJournal;

app/Console/Commands/Correction/RenameMetaFields.php

@@ -3,22 +3,24 @@
  * RenameMetaFields.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use DB;

app/Console/Commands/Correction/TransferBudgets.php

@@ -3,22 +3,24 @@
  * TransferBudgets.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\TransactionJournal;

app/Console/Commands/DecryptDatabase.php

@@ -4,20 +4,20 @@
  * DecryptDatabase.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
@@ -148,7 +148,7 @@ class DecryptDatabase extends Command
     private function tryDecrypt($value)
     {
         try {
-            $value = Crypt::decrypt($value);
+            $value = Crypt::decrypt($value); // verified
         } catch (DecryptException $e) {
             if ('The MAC is invalid.' === $e->getMessage()) {
                 throw new FireflyException($e->getMessage()); // @codeCoverageIgnore

app/Console/Commands/Import/CreateCSVImport.php

@@ -3,20 +3,20 @@
  * CreateCSVImport.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /** @noinspection MultipleReturnStatementsInspection */

app/Console/Commands/Integrity/ReportEmptyObjects.php

@@ -3,22 +3,24 @@
  * ReportEmptyObjects.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Integrity;
 
 use FireflyIII\Models\Account;

app/Console/Commands/Integrity/ReportIntegrity.php

@@ -3,20 +3,20 @@
  * ReportIntegrity.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);

app/Console/Commands/Integrity/ReportSkeleton.php.stub

@@ -1,23 +1,4 @@
 <?php
-/**
- * VerifySkeleton.php
- * Copyright (c) 2019 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/>.
- */
 
 namespace FireflyIII\Console\Commands\Integrity;
 

app/Console/Commands/Integrity/ReportSum.php

@@ -3,22 +3,24 @@
  * ReportSum.php
  * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Integrity;
 
 use FireflyIII\Repositories\User\UserRepositoryInterface;

app/Console/Commands/Integrity/RestoreOAuthKeys.php

@@ -0,0 +1,137 @@
+<?php
+/**
+ * RestoreOAuthKeys.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Console\Commands\Integrity;
+
+use Artisan;
+use Crypt;
+use Illuminate\Console\Command;
+
+/**
+ * Class RestoreOAuthKeys
+ */
+class RestoreOAuthKeys extends Command
+{
+    private const PRIVATE_KEY = 'oauth_private_key';
+    private const PUBLIC_KEY  = 'oauth_public_key';
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Will restore the OAuth keys generated for the system.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:restore-oauth-keys';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $this->restoreOAuthKeys();
+
+        return 0;
+    }
+
+    /**
+     *
+     */
+    private function generateKeys(): void
+    {
+        Artisan::call('passport:keys');
+    }
+
+    /**
+     * @return bool
+     */
+    private function keysInDatabase(): bool
+    {
+        return app('fireflyconfig')->has(self::PRIVATE_KEY) && app('fireflyconfig')->has(self::PUBLIC_KEY);
+    }
+
+    /**
+     * @return bool
+     */
+    private function keysOnDrive(): bool
+    {
+        $private = storage_path('oauth-private.key');
+        $public  = storage_path('oauth-public.key');
+
+        return file_exists($private) && file_exists($public);
+    }
+
+    /**
+     *
+     */
+    private function restoreKeysFromDB(): void
+    {
+        $privateContent = Crypt::decrypt(app('fireflyconfig')->get(self::PRIVATE_KEY)->data);
+        $publicContent  = Crypt::decrypt(app('fireflyconfig')->get(self::PUBLIC_KEY)->data);
+        $private        = storage_path('oauth-private.key');
+        $public         = storage_path('oauth-public.key');
+        file_put_contents($private, $privateContent);
+        file_put_contents($public, $publicContent);
+    }
+
+    /**
+     *
+     */
+    private function restoreOAuthKeys(): void
+    {
+        if (!$this->keysInDatabase() && !$this->keysOnDrive()) {
+            $this->generateKeys();
+            $this->storeKeysInDB();
+            $this->line('Generated and stored new keys.');
+
+            return;
+        }
+        if ($this->keysInDatabase() && !$this->keysOnDrive()) {
+            $this->restoreKeysFromDB();
+            $this->line('Restored OAuth keys from database.');
+
+            return;
+        }
+        if (!$this->keysInDatabase() && $this->keysOnDrive()) {
+            $this->storeKeysInDB();
+            $this->line('Stored OAuth keys in database.');
+
+            return;
+        }
+        $this->line('OAuth keys are OK');
+    }
+
+    /**
+     *
+     */
+    private function storeKeysInDB(): void
+    {
+        $private = storage_path('oauth-private.key');
+        $public  = storage_path('oauth-public.key');
+        app('fireflyconfig')->set(self::PRIVATE_KEY, Crypt::encrypt(file_get_contents($private)));
+        app('fireflyconfig')->set(self::PUBLIC_KEY, Crypt::encrypt(file_get_contents($public)));
+    }
+}

app/Console/Commands/ScanAttachments.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * ScanAttachments.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Affero General Public License as
- * the Free Software Foundation, either version 3 of the License, or
+ * published by the Free Software Foundation, either version 3 of the
- * (at your option) any later version.
+ * License, or (at your option) any later version.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * This program 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /** @noinspection PhpDynamicAsStaticMethodCallInspection */
@@ -30,6 +30,7 @@ use FireflyIII\Models\Attachment;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Log;
 use Storage;
 
 /**
@@ -51,7 +52,7 @@ class ScanAttachments extends Command
      *
      * @var string
      */
-    protected $signature = 'firefly:scan-attachments';
+    protected $signature = 'firefly-iii:scan-attachments';
 
     /**
      * Execute the console command.
@@ -63,20 +64,21 @@ class ScanAttachments extends Command
         /** @var Attachment $attachment */
         foreach ($attachments as $attachment) {
             $fileName         = $attachment->fileName();
+            $decryptedContent = '';
             try {
-                $content = $disk->get($fileName);
+                $encryptedContent = $disk->get($fileName);
             } catch (FileNotFoundException $e) {
                 $this->error(sprintf('Could not find data for attachment #%d: %s', $attachment->id, $e->getMessage()));
                 continue;
             }
             try {
-                $decrypted = Crypt::decrypt($content);
+                $decryptedContent = Crypt::decrypt($encryptedContent); // verified
             } catch (DecryptException $e) {
-                $this->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
+                Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
-                continue;
+                $decryptedContent = $encryptedContent;
             }
             $tempFileName = tempnam(sys_get_temp_dir(), 'FireflyIII');
-            file_put_contents($tempFileName, $decrypted);
+            file_put_contents($tempFileName, $decryptedContent);
             $md5              = md5_file($tempFileName);
             $mime             = mime_content_type($tempFileName);
             $attachment->md5  = $md5;