Merge branch 'release/5.4.6' into main

Forward REMOTE_USER (remote_user_guard auth mode)

.ci/.env.ci

@@ -0,0 +1,326 @@
+# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
+# Never set it to "testing".
+APP_ENV=local
+
+# Set to true if you want to see debug information in error screens.
+APP_DEBUG=false
+
+# This should be your email address.
+# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
+SITE_OWNER=mail@example.com
+
+# The encryption key for your sessions. Keep this very secure.
+# If you generate a new one all existing attachments must be considered LOST.
+# Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
+# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
+APP_KEY=SomeRandomStringOf32CharsExactly
+
+#
+# Firefly III will launch using this language (for new users and unauthenticated visitors)
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
+#
+# If text is still in English, remember that not everything may have been translated.
+DEFAULT_LANGUAGE=en_US
+
+# The locale defines how numbers are formatted.
+# by default this value is the same as whatever the language is.
+DEFAULT_LOCALE=equal
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+# For a list of supported time zones, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+TZ=Europe/Amsterdam
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+# Set it to ** and reverse proxies work just fine.
+TRUSTED_PROXIES=
+
+# The log channel defines where your log entries go to.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+# A rotating log option is 'daily', creates 5 files that (surprise) rotate.
+# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
+
+# - Docker + versions <= 4.8.1.8 and before: use "stdout"
+# - Docker + versions >  4.8.1.8           : use "docker_out"
+# - Docker + versions >=  5.1.1            : use "stack"
+# - For everything else (als not Docker)   : use 'stack'
+
+LOG_CHANNEL=single
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=info
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+# Use "pgsql" for PostgreSQL
+# Use "mysql" for MySQL and MariaDB.
+# Use "sqlite" for SQLite.
+DB_CONNECTION=sqlite_test
+
+# MySQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MYSQL_USE_SSL=false
+MYSQL_SSL_VERIFY_SERVER_CERT=true
+# You need to set at least of these options
+MYSQL_SSL_CAPATH=/etc/ssl/certs/
+MYSQL_SSL_CA=
+MYSQL_SSL_CERT=
+MYSQL_SSL_KEY=
+MYSQL_SSL_CIPHER=
+
+# PostgreSQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+PGSQL_SSL_MODE=prefer
+PGSQL_SSL_ROOT_CERT=null
+PGSQL_SSL_CERT=null
+PGSQL_SSL_KEY=null
+PGSQL_SSL_CRL_FILE=null
+
+# If you're looking for performance improvements, you could install memcached.
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+
+# If you set either of these to 'redis', you might want to update these settings too
+# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
+# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
+
+# can be tcp, unix or http
+REDIS_SCHEME=tcp
+
+# use only when using 'unix' for REDIS_SCHEME. Leave empty otherwise.
+REDIS_PATH=
+
+# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+
+REDIS_PASSWORD=null
+# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
+REDIS_DB="0"
+REDIS_CACHE_DB="1"
+
+# Cookie settings. Should not be necessary to change these.
+# If you use Docker or similar, you can set COOKIE_DOMAIN_FILE to set
+# the value from a file instead of from an environment variable
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+# If you want Firefly III to mail you, update these settings
+# For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MAIL_MAILER=log
+MAIL_HOST=null
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+# Other mail drivers:
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=
+
+
+# If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+MAILGUN_ENDPOINT=api.mailgun.net
+
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MANDRILL_SECRET=
+SPARKPOST_SECRET=
+
+
+# Firefly III can send you the following messages
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+
+# These messages contain (sensitive) transaction information:
+SEND_REPORT_JOURNALS=true
+
+# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+MAPBOX_API_KEY=
+
+# The map will default to this location:
+MAP_DEFAULT_LAT=51.983333
+MAP_DEFAULT_LONG=5.916667
+MAP_DEFAULT_ZOOM=6
+
+# Firefly III currently supports two provider for live Currency Exchange Rates:
+# "fixer", and "ratesapi".
+# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
+# built compatible with Fixer.IO, based on data published by European Central Bank, and doesn't require API key.
+CER_PROVIDER=ratesapi
+
+# If you have select "fixer" as default currency exchange rates,
+# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
+# the free API up to the point where you might as well offer nothing.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+FIXER_API_KEY=
+
+# Firefly III has two options for user authentication. "eloquent" is the default,
+# and "ldap" for LDAP servers.
+# For full instructions on these settings please visit:
+# https://docs.firefly-iii.org/advanced-installation/authentication
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+LOGIN_PROVIDER=eloquent
+
+#
+# It's also possible to change the way users are authenticated. You could use Authelia for example.
+# Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard".
+#
+# If you do this please read the documentation for instructions and warnings:
+# https://docs.firefly-iii.org/advanced-installation/authentication
+#
+# This function is available in Firefly III v5.3.0 and higher.
+AUTHENTICATION_GUARD=web
+
+#
+# Likewise, it's impossible to log out users who's authentication is handled by an external system.
+# Enter a custom URL here that will force a logout (your authentication provider can tell you).
+# Setting this variable only works when AUTHENTICATION_GUARD != web
+#
+CUSTOM_LOGOUT_URI=
+
+# LDAP connection configuration
+# OpenLDAP, FreeIPA or ActiveDirectory
+# # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
+ADLDAP_AUTO_CONNECT=true
+
+# LDAP connection settings
+# You can set the following variables from a file by appending them with _FILE:
+# ADLDAP_CONTROLLERS, ADLDAP_PORT, ADLDAP_BASEDN
+ADLDAP_CONTROLLERS=
+ADLDAP_PORT=389
+ADLDAP_TIMEOUT=5
+ADLDAP_BASEDN=""
+ADLDAP_FOLLOW_REFFERALS=false
+
+# SSL/TLS settings
+ADLDAP_USE_SSL=false
+ADLDAP_USE_TLS=false
+ADLDAP_SSL_CACERTDIR=
+ADLDAP_SSL_CACERTFILE=
+ADLDAP_SSL_CERTFILE=
+ADLDAP_SSL_KEYFILE=
+ADLDAP_SSL_CIPHER_SUITE=
+ADLDAP_SSL_REQUIRE_CERT=
+
+# You can set the following variables from a file by appending them with _FILE:
+ADLDAP_ADMIN_USERNAME=
+ADLDAP_ADMIN_PASSWORD=
+
+# You can set the following variables from a file by appending them with _FILE:
+ADLDAP_ACCOUNT_PREFIX=
+ADLDAP_ACCOUNT_SUFFIX=
+
+
+# LDAP authentication settings.
+ADLDAP_PASSWORD_SYNC=false
+ADLDAP_LOGIN_FALLBACK=false
+
+ADLDAP_DISCOVER_FIELD=distinguishedname
+ADLDAP_AUTH_FIELD=distinguishedname
+
+# Will allow SSO if your server provides an AUTH_USER field.
+# You can set the following variables from a file by appending them with _FILE:
+WINDOWS_SSO_ENABLED=false
+WINDOWS_SSO_DISCOVER=samaccountname
+WINDOWS_SSO_KEY=AUTH_USER
+
+# field to sync as local username.
+# You can set the following variable from a file by appending it with _FILE:
+ADLDAP_SYNC_FIELD=userprincipalname
+
+# You can disable the X-Frame-Options header if it interferes with tools like
+# Organizr. This is at your own risk. Applications running in frames run the risk
+# of leaking information to their parent frame.
+DISABLE_FRAME_HEADER=false
+
+# You can disable the Content Security Policy header when you're using an ancient browser
+# or any version of Microsoft Edge / Internet Explorer (which amounts to the same thing really)
+# This leaves you with the risk of not being able to stop XSS bugs should they ever surface.
+# This is at your own risk.
+DISABLE_CSP_HEADER=false
+
+# If you wish to track your own behavior over Firefly III, set valid analytics tracker information here.
+# Nobody uses this except for me on the demo site. But hey, feel free to use this if you want to.
+# Do not prepend the TRACKER_URL with http:// or https://
+# The only tracker supported is Matomo.
+# You can set the following variables from a file by appending them with _FILE:
+TRACKER_SITE_ID=
+TRACKER_URL=
+
+#
+# Firefly III can collect telemetry on how you use Firefly III. This is opt-in.
+# In order to allow this, change the following variable to true.
+# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
+SEND_TELEMETRY=false
+
+# You can fine tune the start-up of a Docker container by editing these environment variables.
+# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
+# However if you know what you're doing you can significantly speed up container start times.
+# Set each value to true to enable, or false to disable.
+
+# Check if the SQLite database exists. Can be skipped if you're not using SQLite.
+# Won't significantly speed up things.
+DKR_CHECK_SQLITE=true
+
+# Run database creation and migration commands. Disable this only if you're 100% sure the DB exists
+# and is up to date.
+DKR_RUN_MIGRATION=true
+
+# Run database upgrade commands. Disable this only when you're 100% sure your DB is up-to-date
+# with the latest fixes (outside of migrations!)
+DKR_RUN_UPGRADE=true
+
+# Verify database integrity. Includes all data checks and verifications.
+# Disabling this makes Firefly III assume your DB is intact.
+DKR_RUN_VERIFY=true
+
+# Run database reporting commands. When disabled, Firefly III won't go over your data to report current state.
+# Disabling this should have no impact on data integrity or safety but it won't warn you of possible issues.
+DKR_RUN_REPORT=true
+
+# Generate OAuth2 keys.
+# When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
+# you had previously generated keys already and they're stored in your database for restoration.
+DKR_RUN_PASSPORT_INSTALL=true
+
+# Leave the following configuration vars as is.
+# Unless you like to tinker and know what you're doing.
+APP_NAME=FireflyIII
+ADLDAP_CONNECTION=default
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
+CACHE_PREFIX=firefly
+SEARCH_RESULT_LIMIT=50
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_ID=
+DEMO_USERNAME=
+DEMO_PASSWORD=
+USE_ENCRYPTION=false
+IS_HEROKU=false
+FIREFLY_III_LAYOUT=v1
+
+#
+# If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.
+# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
+# This configuration value WILL NOT HELP.
+#
+# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
+# So when configuring anything WEB related this variable doesn't do anything. Nothing
+#
+# If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
+#
+APP_URL=http://localhost

.ci/firefly-iii-standard.yml

@@ -0,0 +1,250 @@
+parameters:
+    indentation: spaces
+
+    file_extensions:
+        - php
+
+    exclude_files:
+        - fixtures/*
+        - fixtures*/*
+        - temp/*
+        - tmp/*
+
+services:
+    # Checkers bellow aim on 1:1 copy of https://nette.org/en/coding-standard
+
+    # General rules - https://nette.org/en/coding-standard#toc-general-rules
+
+    # use tabs over spaces
+    # PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\DisallowSpaceIndentSniff: ~
+    # PHP code must use only UTF-8 without BOM
+    PhpCsFixer\Fixer\Basic\EncodingFixer: ~
+    # <?php opening tag
+    PhpCsFixer\Fixer\PhpTag\FullOpeningTagFixer: ~
+    # Ensure there is no code on the same line as the PHP open tag.
+    PhpCsFixer\Fixer\PhpTag\LinebreakAfterOpeningTagFixer: ~
+    # The closing ?> tag must be omitted from files containing only PHP.
+    PhpCsFixer\Fixer\PhpTag\NoClosingTagFixer: ~
+    # There must not be trailing whitespace at the end of lines.
+    PhpCsFixer\Fixer\Whitespace\NoTrailingWhitespaceFixer: ~
+    # ...and at the end of blank lines.
+    PhpCsFixer\Fixer\Whitespace\NoWhitespaceInBlankLineFixer: ~
+    # All files must end with a single blank line.
+    PhpCsFixer\Fixer\Whitespace\SingleBlankLineAtEofFixer: ~
+    # File name should match class name if possible.
+    PhpCsFixer\Fixer\Basic\Psr4Fixer: ~
+    # Enforces using shorthand scalar typehint variants in phpDocs: `int` instead of `integer` and `bool` instead of `boolean`
+    SlevomatCodingStandard\Sniffs\TypeHints\LongTypeHintsSniff: ~
+
+    # File Header - https://nette.org/en/coding-standard#toc-file-header
+
+    # empty line before namespace
+    PhpCsFixer\Fixer\NamespaceNotation\SingleBlankLineBeforeNamespaceFixer: ~
+    # 1 Use statement per line
+    PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer: ~
+    # Use statements are alphabetically ordered
+    PhpCsFixer\Fixer\Import\OrderedImportsFixer: ~
+    # disallow group use declarations use FooLibrary\Bar\Baz\{ ClassA, ClassB, ClassC, ClassD as Fizbo }
+    SlevomatCodingStandard\Sniffs\Namespaces\DisallowGroupUseSniff: ~
+    # Disallows leading backslash in use statement: use \Foo\Bar;
+    SlevomatCodingStandard\Sniffs\Namespaces\UseDoesNotStartWithBackslashSniff: ~
+    # Looks for unused imports from other namespaces.
+    Nette\CodingStandard\Sniffs\Namespaces\UnusedUsesSniff:
+        searchAnnotations: yes
+        ignoredAnnotationNames: ['@testCase']
+        ignoredAnnotations: ['@internal']
+
+    # Language Construct (should be placed before some other fixers)
+
+    # Functions should be used with `$strict` param set to `true`
+    PhpCsFixer\Fixer\Strict\StrictParamFixer: ~
+    # replaces is_null(parameter) expression with `null === parameter`.
+    PhpCsFixer\Fixer\LanguageConstruct\IsNullFixer:
+        use_yoda_style: true
+    # Calling `unset` on multiple items should be done in one call.
+    PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveUnsetsFixer: ~
+    # Replace all `<>` with `!=`.
+    PhpCsFixer\Fixer\Operator\StandardizeNotEqualsFixer: ~
+    # Include/Require and file path should be divided with a single space. File path should not be placed under brackets.
+    PhpCsFixer\Fixer\ControlStructure\IncludeFixer: ~
+    # Requires short ternary operator ?: when possible
+    SlevomatCodingStandard\Sniffs\ControlStructures\RequireShortTernaryOperatorSniff: ~
+
+    # Arrays - https://nette.org/en/coding-standard#toc-arrays
+
+    # use short array fixes
+    PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer:
+        syntax: short
+    # use trailing command in last array element
+    PhpCsFixer\Fixer\ArrayNotation\TrailingCommaInMultilineArrayFixer: ~
+    # PHP single-line arrays should not have trailing comma.
+    # PhpCsFixer\Fixer\ArrayNotation\NoTrailingCommaInSinglelineArrayFixer: ~
+    # In array declaration, there MUST NOT be a whitespace before each comma.
+    PhpCsFixer\Fixer\ArrayNotation\NoWhitespaceBeforeCommaInArrayFixer: ~
+    # Arrays should be formatted like function/method arguments, without leading or trailing single line space.
+    PhpCsFixer\Fixer\ArrayNotation\TrimArraySpacesFixer: ~
+    # In array declaration, there MUST be a whitespace after each comma.
+    PhpCsFixer\Fixer\ArrayNotation\WhitespaceAfterCommaInArrayFixer: ~
+
+    # Strings
+
+    # Convert `heredoc` to `nowdoc` where possible.
+    PhpCsFixer\Fixer\StringNotation\HeredocToNowdocFixer: ~
+    # Convert double quotes to single quotes for simple strings.
+    PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer: ~
+
+    # Keywords and True/False/Null - https://nette.org/en/coding-standard#toc-keywords-and-true-false-null
+
+    # PHP keywords must be in lower case
+    PhpCsFixer\Fixer\Casing\LowercaseKeywordsFixer: ~
+    # The PHP constants `true`, `false`, and `null` MUST be in lower case
+    PhpCsFixer\Fixer\Casing\LowercaseConstantsFixer: ~
+
+    # Method and Functions Calls - https://nette.org/en/coding-standard#toc-method-and-function-calls
+
+    # Function defined by PHP should be called using the correct casing
+    PhpCsFixer\Fixer\Casing\NativeFunctionCasingFixer: ~
+    # In the argument list, there must be one space after each comma, and there must no be a space before each comma
+    PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer: ~
+    # This sniff checks that there are two blank lines between functions declarations and single between signatures.
+    #Nette\CodingStandard\Sniffs\WhiteSpace\FunctionSpacingSniff: ~
+
+    # Classes - https://nette.org/en/coding-standard#toc-classes
+
+    # Inside a classy element "self" should be preferred to the class name itself.
+    PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer: ~
+    # class element order: constants, properties, from public to private
+    PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer:
+        order:
+            - use_trait
+            - constant
+            - constant_public
+            - constant_protected
+            - constant_private
+            - property_public
+            - property_protected
+            - property_private
+
+    # Constants - https://nette.org/en/coding-standard#toc-constants
+
+    # constant names are CAPITALIZED (manuall fixing only :()
+    PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\UpperCaseConstantNameSniff: ~
+
+    # Class Properties - https://nette.org/en/coding-standard#toc-class-properties
+
+    # There MUST NOT be more than one property declared per statement.
+    PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer:
+        elements: ['property']
+
+    # Methods - https://nette.org/en/coding-standard#toc-methods
+
+    # They must be declared in camelCase.
+    PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff: ~
+    # Checks that there's a single space between a typehint and a parameter name and no whitespace between a nullability symbol and a typehint
+    SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSpacingSniff: ~
+    # Spaces should be properly placed in a function declaration.
+    PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer: ~
+    # In function arguments there must not be arguments with default values before non-default ones.
+    PhpCsFixer\Fixer\FunctionNotation\NoUnreachableDefaultArgumentValueFixer: ~
+
+    # Constans, Class Properties, Methods
+
+    # Constants and Properties should be separated by 1 blank line
+    #PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer:
+    #    elements: [const, property]
+
+    # Last property and 1st method should be separated by 2 spaces
+    Nette\CodingStandard\Fixer\ClassNotation\LastPropertyAndFirstMethodSeparationFixer:
+        space_count: 2
+
+    # Control Statements - https://nette.org/en/coding-standard#toc-control-statements
+
+    # The keyword `elseif` should be used instead of `else if` so that all control keywords look like single words.
+    PhpCsFixer\Fixer\ControlStructure\ElseifFixer: ~
+    # Remove useless semicolon statements.
+    PhpCsFixer\Fixer\Semicolon\NoEmptyStatementFixer: ~
+    # Remove trailing commas in list() calls.
+    PhpCsFixer\Fixer\ControlStructure\NoTrailingCommaInListCallFixer: ~
+    # Removes unneeded parentheses around control statements.
+    PhpCsFixer\Fixer\ControlStructure\NoUnneededControlParenthesesFixer: ~
+    # A case should be followed by a colon and not a semicolon.
+    PhpCsFixer\Fixer\ControlStructure\SwitchCaseSemicolonToColonFixer: ~
+    # The structure body must be indented once.
+    # The closing brace must be on the next line after the body.
+    # There should not be more than one statement per line.
+    #Nette\CodingStandard\Fixer\Basic\BracesFixer:
+    #    allow_single_line_closure: true
+    # changes if (1 === $cond) to if ($cond === 1)
+    #SlevomatCodingStandard\Sniffs\ControlStructures\DisallowYodaComparisonSniff: ~
+    # finds unreachable catch blocks:
+    SlevomatCodingStandard\Sniffs\Exceptions\DeadCatchSniff: ~
+
+    # Casting
+
+    # A single space or none should be between cast and variable (int) $val
+    PhpCsFixer\Fixer\CastNotation\CastSpacesFixer: ~
+    # Cast should be written in lower case.
+    PhpCsFixer\Fixer\CastNotation\LowercaseCastFixer: ~
+    # Replaces `intval`, `floatval`, `doubleval`, `strval` and `boolval` function calls with according type casting operator
+    PhpCsFixer\Fixer\CastNotation\ModernizeTypesCastingFixer: ~
+    # Short cast `bool` using double exclamation mark should not be used
+    PhpCsFixer\Fixer\CastNotation\NoShortBoolCastFixer: ~
+    # Cast `(boolean)` and `(integer)` should be written as `(bool)` and `(int)`, `(double)` and `(real)` as `(float)`
+    PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer: ~
+
+    # Language Whitespace
+
+    # Binary operators should be surrounded by at least one space. DO NOT USE
+    #PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer: ~
+    # Unary operators should be placed adjacent to their operands.
+    PhpCsFixer\Fixer\Operator\UnaryOperatorSpacesFixer: ~
+    # No space after the opening parenthesis and before the closing parenthesis
+    PhpCsFixer\Fixer\Whitespace\NoSpacesInsideParenthesisFixer: ~
+    # There MUST NOT be spaces around offset braces $a[0]
+    PhpCsFixer\Fixer\Whitespace\NoSpacesAroundOffsetFixer: ~
+    # There should not be space before or after object `T_OBJECT_OPERATOR` `->`.
+    PhpCsFixer\Fixer\Operator\ObjectOperatorWithoutWhitespaceFixer: ~
+    # Standardize spaces around ternary operator.
+    PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer: ~
+    # Concatenation $a . $b should be spaced according configuration
+    PhpCsFixer\Fixer\Operator\ConcatSpaceFixer:
+        spacing: one
+    # Removes extra spaces between colon and case value.
+    PhpCsFixer\Fixer\ControlStructure\SwitchCaseSpaceFixer: ~
+
+    # Comments
+
+    # Docblocks should have the same indentation as the documented subject.
+    PhpCsFixer\Fixer\Phpdoc\PhpdocIndentFixer: ~
+    # There should not be any empty comments.
+    PhpCsFixer\Fixer\Comment\NoEmptyCommentFixer: ~
+    # There should not be empty PHPDoc blocks.
+    #PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer: ~
+    # Phpdocs should start and end with content, excluding the very first and last line of the docblocks.
+    PhpCsFixer\Fixer\Phpdoc\PhpdocTrimFixer: ~
+    # Single-line comments comments with only one line of actual content should use the `//` syntax.
+    PhpCsFixer\Fixer\Comment\SingleLineCommentStyleFixer:
+        comment_types: ['hash']
+    # Require comments with single-line content to be written as one-liners
+    SlevomatCodingStandard\Sniffs\Commenting\RequireOneLinePropertyDocCommentSniff: ~
+
+
+    # Properties MUST not be explicitly initialized with `null`.
+    #PhpCsFixer\Fixer\ClassNotation\NoNullPropertyInitializationFixer: ~
+
+    PhpCsFixer\Fixer\ControlStructure\NoBreakCommentFixer:
+        comment_text: 'break omitted'
+
+    # declare(strict_types=1);
+    PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer: ~
+    # Enforces consistent formatting of return typehints: function foo(): ?int
+    SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSpacingSniff: ~
+    # Use `null` coalescing operator `??` where possible.
+    PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer: ~
+
+    Nette\CodingStandard\Fixer\ClassNotation\ClassAndTraitVisibilityRequiredFixer:
+        elements: ['const', 'property', 'method']
+
+    # short list() syntax []
+    PhpCsFixer\Fixer\ListNotation\ListSyntaxFixer:
+        syntax: short

.ci/phpstan.neon

@@ -0,0 +1,20 @@
+includes:
+  - ../vendor/nunomaduro/larastan/extension.neon
+  - ../vendor/ergebnis/phpstan-rules/rules.neon
+  - ../vendor/phpstan/phpstan-deprecation-rules/rules.neon
+  - ../vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
+
+parameters:
+  ignoreErrors:
+    - '#is not allowed to extend#'
+    - '#is neither abstract nor final#'
+    - '#Control structures using switch should not be used\.#'
+    - '#has a nullable return type declaration#'
+  paths:
+    - ../app
+    - ../database
+    - ../routes
+    - ../bootstrap/app.php
+
+  # The level 8 is the highest level. original was 5
+  level: 5

.ci/phpstan.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Install composer packages
+composer install --no-suggest --no-scripts --no-ansi
+
+# enable test .env file.
+cp .ci/.env.ci .env
+
+# Do static code analysis.
+./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress
+
+exit 0

.ci/phpunit.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# enable test .env file.
+cp .ci/.env.ci ../.env
+
+# download test database
+wget --quiet https://raw.githubusercontent.com/firefly-iii/test-data/main/test_db.sqlite -o storage/database/test_db.sqlite
+
+# run phpunit
+./vendor/bin/phpunit --configuration phpunit.coverage.xml
+
+exit 0

.deploy/heroku/.env.heroku

@@ -5,77 +5,118 @@ APP_ENV=heroku
 # Set to true if you want to see debug information in error screens.
 APP_DEBUG=false
 
-# This should be your email address
+# This should be your email address.
+# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
 SITE_OWNER=heroku@example.com
 
-# The encryption key for your database and sessions. Keep this very secure.
-# If you generate a new one all existing data must be considered LOST.
-# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
+# The encryption key for your sessions. Keep this very secure.
+# If you generate a new one all existing attachments must be considered LOST.
+# Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
+# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
 
+#
+# Firefly III will launch using this language (for new users and unauthenticated visitors)
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
+#
+# If text is still in English, remember that not everything may have been translated.
+DEFAULT_LANGUAGE=en_US
+
+# The locale defines how numbers are formatted.
+# by default this value is the same as whatever the language is.
+DEFAULT_LOCALE=equal
+
 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
+# For a list of supported time zones, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 TZ=UTC
 
-# This variable must match your installation's external address but keep in mind that
-# it's only used on the command line as a fallback value.
-APP_URL=http://localhost
-
 # TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+# Set it to ** and reverse proxies work just fine.
 TRUSTED_PROXIES=**
 
 # The log channel defines where your log entries go to.
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
 # Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+# A rotating log option is 'daily', creates 5 files that (surprise) rotate.
+# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
+
+# - Docker + versions <= 4.8.1.8 and before: use "stdout"
+# - Docker + versions >  4.8.1.8           : use "docker_out"
+# - Docker + versions >=  5.1.1            : use "stack"
+# - For everything else (als not Docker)   : use 'stack'
+
 LOG_CHANNEL=stdout
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
 # nothing will get logged, ever.
-APP_LOG_LEVEL=debug
+APP_LOG_LEVEL=notice
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
+# For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+# Use "pgsql" for PostgreSQL
+# Use "mysql" for MySQL and MariaDB.
+# Use "sqlite" for SQLite.
 DB_CONNECTION=pgsql
 
 
+# MySQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MYSQL_USE_SSL=false
+MYSQL_SSL_VERIFY_SERVER_CERT=true
+# You need to set at least of these options
+MYSQL_SSL_CAPATH=/etc/ssl/certs/
+MYSQL_SSL_CA=
+MYSQL_SSL_CERT=
+MYSQL_SSL_KEY=
+MYSQL_SSL_CIPHER=
 
 # PostgreSQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 PGSQL_SSL_MODE=prefer
 PGSQL_SSL_ROOT_CERT=null
 PGSQL_SSL_CERT=null
 PGSQL_SSL_KEY=null
 PGSQL_SSL_CRL_FILE=null
 
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
-# You can configure another file storage backend if you cannot use the local storage option.
-# To set this up, fill in the following variables. The upload path is used to store uploaded
-# files and the export path is to store exported data (before download).
-SFTP_HOST=
-SFTP_PORT=
-SFTP_UPLOAD_PATH=
-SFTP_EXPORT_PATH=
+# If you set either of these to 'redis', you might want to update these settings too
+# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
+# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
 
-# SFTP uses either the username/password combination or the private key to authenticate.
-SFTP_USERNAME=
-SFTP_PASSWORD=
-SFTP_PRIV_KEY=
+# can be tcp, unix or http
+REDIS_SCHEME=tcp
+
+# use only when using 'unix' for REDIS_SCHEME. Leave empty otherwise.
+REDIS_PATH=
+
+# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+
+REDIS_PASSWORD=null
+# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
+REDIS_DB="0"
+REDIS_CACHE_DB="1"
 
 # Cookie settings. Should not be necessary to change these.
+# If you use Docker or similar, you can set COOKIE_DOMAIN_FILE to set
+# the value from a file instead of from an environment variable
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
 # If you want Firefly III to mail you, update these settings
-# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
-MAIL_DRIVER=log
-MAIL_HOST=smtp.mailtrap.io
+# For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MAIL_MAILER=log
+MAIL_HOST=null
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -83,11 +124,20 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 # Other mail drivers:
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=
+
+
+# If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+MAILGUN_ENDPOINT=api.mailgun.net
+
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
+
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
@@ -96,53 +146,85 @@ SEND_ERROR_MESSAGE=true
 SEND_REPORT_JOURNALS=true
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 MAPBOX_API_KEY=
 
+# The map will default to this location:
+MAP_DEFAULT_LAT=51.983333
+MAP_DEFAULT_LONG=5.916667
+MAP_DEFAULT_ZOOM=6
+
 # Firefly III currently supports two provider for live Currency Exchange Rates:
-# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# "fixer", and "ratesapi".
 # RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
-# built compatible with Fixer.IO, based on data published by European Central Bank, and don't require API key.
-CER_PROVIDER=fixer
+# built compatible with Fixer.IO, based on data published by European Central Bank, and doesn't require API key.
+CER_PROVIDER=ratesapi
+
 # If you have select "fixer" as default currency exchange rates,
 # set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
 # Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 FIXER_API_KEY=
 
-# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-TRACKER_SITE_ID=
-TRACKER_URL=
-
-# Most parts of the database are encrypted by default, but you can turn this off if you want to.
-# This makes it easier to migrate your database. Not that some fields will never be decrypted.
-USE_ENCRYPTION=true
-
 # Firefly III has two options for user authentication. "eloquent" is the default,
 # and "ldap" for LDAP servers.
 # For full instructions on these settings please visit:
-# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
+# https://docs.firefly-iii.org/advanced-installation/authentication
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 LOGIN_PROVIDER=eloquent
 
+#
+# It's also possible to change the way users are authenticated. You could use Authelia for example.
+# Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard".
+#
+# If you do this please read the documentation for instructions and warnings:
+# https://docs.firefly-iii.org/advanced-installation/authentication
+#
+# This function is available in Firefly III v5.3.0 and higher.
+AUTHENTICATION_GUARD=web
+
+#
+# Likewise, it's impossible to log out users who's authentication is handled by an external system.
+# Enter a custom URL here that will force a logout (your authentication provider can tell you).
+# Setting this variable only works when AUTHENTICATION_GUARD != web
+#
+CUSTOM_LOGOUT_URI=
+
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
+# # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
+# You can set the following variables from a file by appending them with _FILE:
+# ADLDAP_CONTROLLERS, ADLDAP_PORT, ADLDAP_BASEDN
 ADLDAP_CONTROLLERS=
 ADLDAP_PORT=389
 ADLDAP_TIMEOUT=5
 ADLDAP_BASEDN=""
 ADLDAP_FOLLOW_REFFERALS=false
+
+# SSL/TLS settings
 ADLDAP_USE_SSL=false
 ADLDAP_USE_TLS=false
+ADLDAP_SSL_CACERTDIR=
+ADLDAP_SSL_CACERTFILE=
+ADLDAP_SSL_CERTFILE=
+ADLDAP_SSL_KEYFILE=
+ADLDAP_SSL_CIPHER_SUITE=
+ADLDAP_SSL_REQUIRE_CERT=
 
+# You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ADMIN_USERNAME=
 ADLDAP_ADMIN_PASSWORD=
 
+# You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ACCOUNT_PREFIX=
 ADLDAP_ACCOUNT_SUFFIX=
 
+
 # LDAP authentication settings.
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
@@ -151,25 +233,76 @@ ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
 # Will allow SSO if your server provides an AUTH_USER field.
+# You can set the following variables from a file by appending them with _FILE:
+WINDOWS_SSO_ENABLED=false
 WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
+# You can set the following variable from a file by appending it with _FILE:
 ADLDAP_SYNC_FIELD=userprincipalname
 
-# You can disable the X-Frame-Options header if it interfears with tools like
-# Organizr. This is at your own risk.
+# You can disable the X-Frame-Options header if it interferes with tools like
+# Organizr. This is at your own risk. Applications running in frames run the risk
+# of leaking information to their parent frame.
 DISABLE_FRAME_HEADER=false
 
+# You can disable the Content Security Policy header when you're using an ancient browser
+# or any version of Microsoft Edge / Internet Explorer (which amounts to the same thing really)
+# This leaves you with the risk of not being able to stop XSS bugs should they ever surface.
+# This is at your own risk.
+DISABLE_CSP_HEADER=false
+
+# If you wish to track your own behavior over Firefly III, set valid analytics tracker information here.
+# Nobody uses this except for me on the demo site. But hey, feel free to use this if you want to.
+# Do not prepend the TRACKER_URL with http:// or https://
+# The only tracker supported is Matomo.
+# You can set the following variables from a file by appending them with _FILE:
+TRACKER_SITE_ID=
+TRACKER_URL=
+
+#
+# Firefly III can collect telemetry on how you use Firefly III. This is opt-in.
+# In order to allow this, change the following variable to true.
+# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
+SEND_TELEMETRY=false
+
+# You can fine tune the start-up of a Docker container by editing these environment variables.
+# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
+# However if you know what you're doing you can significantly speed up container start times.
+# Set each value to true to enable, or false to disable.
+
+# Check if the SQLite database exists. Can be skipped if you're not using SQLite.
+# Won't significantly speed up things.
+DKR_CHECK_SQLITE=true
+
+# Run database creation and migration commands. Disable this only if you're 100% sure the DB exists
+# and is up to date.
+DKR_RUN_MIGRATION=true
+
+# Run database upgrade commands. Disable this only when you're 100% sure your DB is up-to-date
+# with the latest fixes (outside of migrations!)
+DKR_RUN_UPGRADE=true
+
+# Verify database integrity. Includes all data checks and verifications.
+# Disabling this makes Firefly III assume your DB is intact.
+DKR_RUN_VERIFY=true
+
+# Run database reporting commands. When disabled, Firefly III won't go over your data to report current state.
+# Disabling this should have no impact on data integrity or safety but it won't warn you of possible issues.
+DKR_RUN_REPORT=true
+
+# Generate OAuth2 keys.
+# When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
+# you had previously generated keys already and they're stored in your database for restoration.
+DKR_RUN_PASSPORT_INSTALL=true
+
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII
 ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
 CACHE_PREFIX=firefly
 SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=
@@ -177,7 +310,18 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_SANDSTORM=false
-IS_HEROKU=true
-BUNQ_USE_SANDBOX=false
-FFIII_LAYOUT=v1
+USE_ENCRYPTION=false
+IS_HEROKU=false
+FIREFLY_III_LAYOUT=v1
+
+#
+# If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.
+# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
+# This configuration value WILL NOT HELP.
+#
+# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
+# So when configuring anything WEB related this variable doesn't do anything. Nothing
+#
+# If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
+#
+APP_URL=http://localhost

.deploy/heroku/.locales

@@ -1,8 +1,13 @@
-en_US
+bg_BG
 cs_CZ
-es_ES
 de_DE
+el_GR
+en_GB
+en_US
+es_ES
+fi_FI
 fr_FR
+hu_HU
 it_IT
 nb_NO
 nl_NL
@@ -10,10 +15,8 @@ pl_PL
 pt_BR
 ro_RO
 ru_RU
-hu_HU
-el_GR
+sk_SK
 sv_SE
+vi_VN
 zh-hans_CN
 zh-hant_CN
-fi_FI
-vi_VN

.env.example

@@ -10,14 +10,12 @@ APP_DEBUG=false
 SITE_OWNER=mail@example.com
 
 # The encryption key for your sessions. Keep this very secure.
-# If you generate a new one existing data must be considered LOST.
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=SomeRandomStringOf32CharsExactly
 
-#
 # Firefly III will launch using this language (for new users and unauthenticated visitors)
-# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/master/resources/lang
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
 #
 # If text is still in English, remember that not everything may have been translated.
 DEFAULT_LANGUAGE=en_US
@@ -31,10 +29,6 @@ DEFAULT_LOCALE=equal
 # For a list of supported time zones, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 TZ=Europe/Amsterdam
 
-# This variable must match your installation's external address but keep in mind that
-# it's only used on the command line as a fallback value.
-APP_URL=http://localhost
-
 # TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 # Set it to ** and reverse proxies work just fine.
 TRUSTED_PROXIES=
@@ -61,14 +55,27 @@ 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: https://docs.firefly-iii.org/support/faq
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-# Use "mysql" for MySQL and MariaDB. Use "sqlite" for SQLite.
-DB_CONNECTION=pgsql
+# Use "pgsql" for PostgreSQL
+# Use "mysql" for MySQL and MariaDB.
+# Use "sqlite" for SQLite.
+DB_CONNECTION=mysql
 DB_HOST=fireflyiiidb
-DB_PORT=5432
+DB_PORT=3306
 DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=secret_firefly_password
 
+# MySQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MYSQL_USE_SSL=false
+MYSQL_SSL_VERIFY_SERVER_CERT=true
+# You need to set at least of these options
+MYSQL_SSL_CAPATH=/etc/ssl/certs/
+MYSQL_SSL_CA=
+MYSQL_SSL_CERT=
+MYSQL_SSL_KEY=
+MYSQL_SSL_CIPHER=
+
 # PostgreSQL supports SSL. You can configure it here.
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 PGSQL_SSL_MODE=prefer
@@ -84,9 +91,18 @@ SESSION_DRIVER=file
 # If you set either of these to 'redis', you might want to update these settings too
 # If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
 # REDIS_PORT_FILE to set the value from a file instead of from an environment variable
+
+# can be tcp, unix or http
+REDIS_SCHEME=tcp
+
+# use only when using 'unix' for REDIS_SCHEME. Leave empty otherwise.
+REDIS_PATH=
+
+# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
 REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
 REDIS_PORT=6379
+
+REDIS_PASSWORD=null
 # always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
 REDIS_DB="0"
 REDIS_CACHE_DB="1"
@@ -101,8 +117,8 @@ COOKIE_SECURE=false
 # If you want Firefly III to mail you, update these settings
 # For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MAIL_DRIVER=log
-MAIL_HOST=smtp.mailtrap.io
+MAIL_MAILER=log
+MAIL_HOST=null
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -123,10 +139,10 @@ MAILGUN_ENDPOINT=api.mailgun.net
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
-
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
+SEND_LOGIN_NEW_IP_WARNING=true
 
 # These messages contain (sensitive) transaction information:
 SEND_REPORT_JOURNALS=true
@@ -140,19 +156,6 @@ MAP_DEFAULT_LAT=51.983333
 MAP_DEFAULT_LONG=5.916667
 MAP_DEFAULT_ZOOM=6
 
-# Firefly III currently supports two provider for live Currency Exchange Rates:
-# "fixer", and "ratesapi".
-# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
-# built compatible with Fixer.IO, based on data published by European Central Bank, and doesn't require API key.
-CER_PROVIDER=ratesapi
-
-# If you have select "fixer" as default currency exchange rates,
-# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
-# the free API up to the point where you might as well offer nothing.
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-FIXER_API_KEY=
-
 # Firefly III has two options for user authentication. "eloquent" is the default,
 # and "ldap" for LDAP servers.
 # For full instructions on these settings please visit:
@@ -160,6 +163,46 @@ FIXER_API_KEY=
 # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 LOGIN_PROVIDER=eloquent
 
+# It's also possible to change the way users are authenticated. You could use Authelia for example.
+# Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard".
+#
+# This will also allow Windows SSO.
+#
+# If you do this please read the documentation for instructions and warnings:
+# https://docs.firefly-iii.org/advanced-installation/authentication
+#
+# This function is available in Firefly III v5.3.0 and higher.
+AUTHENTICATION_GUARD=web
+
+# If the guard is changed, Firefly III uses the 'REMOTE_USER' header as per RFC 3875.
+# You can also use another header, like AUTH_USER when using Windows SSO.
+# Some systems use X-Auth headers. In that case, use HTTP_X_AUTH_USERNAME or HTTP_X_AUTH_EMAIL
+# Depending on your system, REMOTE_USER may need to be changed to HTTP_REMOTE_USER
+#
+# If this header is 'unexpectedly empty', check out the documentation.
+# https://docs.firefly-iii.org/advanced-installation/authentication
+#
+AUTHENTICATION_GUARD_HEADER=REMOTE_USER
+
+#
+# Firefly III uses email addresses as user identifiers. When you're using an external authentication guard
+# that doesn't do this, Firefly III is incapable of emailing you. Messages sent to "Bill Gates" always fail.
+#
+# However, if you set this value, Firefly III will store the value from this header as the user's backup
+# email address and use it to communicate. So user "Bill Gates" could still have
+# the email address "bill@microsoft.com".
+#
+# Example value: AUTHENTICATION_GUARD_EMAIL=HTTP_X_AUTH_EMAIL
+#
+AUTHENTICATION_GUARD_EMAIL=
+
+
+# It's impossible to log out users who's authentication is handled by an external system.
+# Enter a custom URL here that will force a logout (your authentication provider can tell you).
+# Setting this variable only works when AUTHENTICATION_GUARD != web
+#
+CUSTOM_LOGOUT_URI=
+
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
 # # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
@@ -174,8 +217,16 @@ ADLDAP_PORT=389
 ADLDAP_TIMEOUT=5
 ADLDAP_BASEDN=""
 ADLDAP_FOLLOW_REFFERALS=false
+
+# SSL/TLS settings
 ADLDAP_USE_SSL=false
 ADLDAP_USE_TLS=false
+ADLDAP_SSL_CACERTDIR=
+ADLDAP_SSL_CACERTFILE=
+ADLDAP_SSL_CERTFILE=
+ADLDAP_SSL_KEYFILE=
+ADLDAP_SSL_CIPHER_SUITE=
+ADLDAP_SSL_REQUIRE_CERT=
 
 # You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ADMIN_USERNAME=
@@ -185,7 +236,6 @@ ADLDAP_ADMIN_PASSWORD=
 ADLDAP_ACCOUNT_PREFIX=
 ADLDAP_ACCOUNT_SUFFIX=
 
-
 # LDAP authentication settings.
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
@@ -193,11 +243,6 @@ ADLDAP_LOGIN_FALLBACK=false
 ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
-# Will allow SSO if your server provides an AUTH_USER field.
-# You can set the following variables from a file by appending them with _FILE:
-WINDOWS_SSO_DISCOVER=samaccountname
-WINDOWS_SSO_KEY=AUTH_USER
-
 # field to sync as local username.
 # You can set the following variable from a file by appending it with _FILE:
 ADLDAP_SYNC_FIELD=userprincipalname
@@ -221,9 +266,9 @@ DISABLE_CSP_HEADER=false
 TRACKER_SITE_ID=
 TRACKER_URL=
 
-#
-# Firefly III could (in the future) collect telemetry on how you use Firefly III.
-# In order to allow this, change the following variable to true:
+# Firefly III can collect telemetry on how you use Firefly III. This is opt-in.
+# In order to allow this, change the following variable to true.
+# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
 SEND_TELEMETRY=false
 
 # You can fine tune the start-up of a Docker container by editing these environment variables.
@@ -263,14 +308,22 @@ ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 CACHE_PREFIX=firefly
-SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=
 PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-USE_ENCRYPTION=false
-IS_SANDSTORM=false
-IS_DOCKER=false
 IS_HEROKU=false
-BUNQ_USE_SANDBOX=false
+FIREFLY_III_LAYOUT=v1
+
+#
+# If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.
+# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
+# This configuration value WILL NOT HELP.
+#
+# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
+# So when configuring anything WEB related this variable doesn't do anything. Nothing
+#
+# If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
+#
+APP_URL=http://localhost

.gitattributes

@@ -3,3 +3,6 @@
 *.scss linguist-vendored
 *.js linguist-vendored
 CHANGELOG.md export-ignore
+/tests       export-ignore
+/phpunit.xml export-ignore
+/.ci export-ignore

.github/.mergify.yml

@@ -0,0 +1,7 @@
+pull_request_rules:
+  - name: PR on main is never approved.
+    conditions:
+      - base=main
+    actions:
+      close:
+        message: Please reopen this PR on the `develop` branch. Thank you.

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -16,10 +16,10 @@ I am running Firefly III version x.x.x, and my problem is:
 <!-- 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 checking the boxes -->
+<!-- Before you submit, verify the following please: -->
 
-- [ ] Nobody reported this bug before
-- [ ] I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
-- [ ] I have added a screenshot.
-- [ ] I was able to replicate it on the demo site https://demo.firefly-iii.org/
-<!-- - [ ] I donated money (this is a joke :wink:)-->
+- I searched and nobody reported this bug before
+- I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
+- I have added a screenshot.
+- I was able to replicate it on the demo site https://demo.firefly-iii.org/
+<!-- - I donated money (this is a joke ;)-->

.github/ISSUE_TEMPLATE/Custom.md

@@ -16,8 +16,8 @@ I am running Firefly III version x.x.x.
 
 <!-- Complete the following checklist for bonus points -->
 
-- [ ] I have read the FAQ at https://bit.ly/FF3-FAQ
-- [ ] I added a screenshot
-- [ ] I added log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
-- [ ] I was able to replicate the issue on the demo site.
-<!-- - [ ] I donated money (this is a joke :wink:)-->
+- I have read the FAQ at https://bit.ly/FF3-FAQ
+- I added a screenshot
+- I added log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
+- I was able to replicate the issue on the demo site.
+<!-- - I donated money (this is a joke :wink:)-->

.github/contributing.md

@@ -8,7 +8,7 @@ I am always interested in expanding Firefly III's many features. Just open a tic
 
 ## Pull requests
 
-When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `master` branch.
+When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `main` branch.
 
 ## Translations :us: :fr: :de:
 

.github/dependabot.yml

@@ -0,0 +1,26 @@
+version: 2
+updates:
+
+  # composer updates
+  - package-ecosystem: "composer"
+    directory: "/" # Location of package manifests
+    target-branch: develop
+    labels: ["bug"]
+    schedule:
+      interval: "weekly"
+
+  # yarn / JS updates
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: develop
+    labels: ["bug"]
+    schedule:
+      interval: "weekly"
+
+  # yarn / JS updates for new frontend
+  - package-ecosystem: "npm"
+    directory: "/frontend"
+    target-branch: develop
+    labels: ["bug"]
+    schedule:
+      interval: "weekly"

.github/funding.yml

@@ -2,4 +2,3 @@
 
 github: jc5
 patreon: JC5
-custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA

.github/lock.yml

@@ -32,4 +32,4 @@ setLockReason: true
 #   daysUntilLock: 30
 
 # Repository to extend settings from
-# _extends: repo
+# _extends: repo

.github/pull_request_template.md

@@ -1,8 +1,9 @@
 <!--
-Before you create a new PR, please consider the following two considerations.
+Before you create a new PR, please consider:
 
-1) Pull request for the MASTER branch will be closed.
+1) Pull requests for the MAIN branch will be closed.
 2) We cannot accept pull requests to add new currencies.
+3) DO NOT include translations in your PR. Only English US sentences.
 
 Thanks.
 -->

.github/security.md

@@ -1,12 +1,54 @@
 # Security Policy
 
+Firefly III is an application to manage your personal finances. As such, the developer has adopted this security disclosure and response policy to ensure that critical issues are responsibly handled.
+
 ## Supported Versions
+Only the latest Firefly III release is maintained. Applicable fixes, including security fixes, will not backported to older release branches. Please refer to [releases.md](https://github.com/firefly-iii/firefly-iii/blob/main/releases.md) for details.
 
-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 - Private Disclosure Process
+Security is of the highest importance and all security vulnerabilities or suspected security vulnerabilities should be reported to Firefly III privately, to minimize attacks against current users of Firefly III before they are fixed. Vulnerabilities will be investigated and patched on the next patch (or minor) release as soon as possible. This information could be kept entirely internal to the project.  
 
-## Reporting a Vulnerability
+If you know of a publicly disclosed security vulnerability for Firefly III, please **IMMEDIATELY** contact james@firefly-iii.org to inform the Firefly III developer. You can use my [GPG key](https://keybase.io/jc5) for extra security.
 
-If you find something that compromises the security of Firefly III, you should [send me a message](mailto:james@firefly-iii.org) 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.
+**IMPORTANT: Do not file public issues on GitHub for security vulnerabilities**
 
-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.
+To report a vulnerability or a security-related issue, please email the private address james@firefly-iii.org with the details of the vulnerability. The email will be received by the developer of Firefly III. Emails will be addressed within 3 business days, including a detailed plan to investigate the issue and any potential workarounds to perform in the meantime. Do not report non-security-impacting bugs through this channel. Use [GitHub issues](https://github.com/firefly-iii/firefly-iii/issues/new/choose) instead.
 
+### Proposed Email Content
+Provide a descriptive subject line and in the body of the email include the following information:
+* Basic identity information, such as your name and your affiliation or company.
+* Detailed steps to reproduce the vulnerability  (POC scripts, screenshots, and compressed packet captures are all helpful to us).
+* Description of the effects of the vulnerability on Firefly III and the related hardware and software configurations, so that the developer can reproduce it.
+* How the vulnerability affects Firefly III usage and an estimation of the attack surface, if there is one.
+* List other projects or dependencies that were used in conjunction with Firefly III to produce the vulnerability.
+
+## When to report a vulnerability
+* When you think Firefly III has a potential security vulnerability.
+* When you suspect a potential vulnerability but you are unsure that it impacts Firefly III.
+* When you know of or suspect a potential vulnerability on another project that is used by Firefly III. For example Firefly III has a dependency on Docker, MySQL, etc.
+  
+## Patch, Release, and Disclosure
+The Firefly III developer will respond to vulnerability reports as follows:
+ 
+1.  The developer will investigate the vulnerability and determine its effects and criticality.
+2.  If the issue is not deemed to be a vulnerability, the developer will follow up with a detailed reason for rejection.
+3.  The developer will initiate a conversation with the reporter within 3 business days.
+4.  If a vulnerability is acknowledged and the timeline for a fix is determined, the developer will work on a plan to communicate with the appropriate community, including identifying mitigating steps that affected users can take to protect themselves until the fix is rolled out.
+5.  The developer will also create a [CVSS](https://www.first.org/cvss/specification-document) using the [CVSS Calculator](https://www.first.org/cvss/calculator/3.0). The developer makes the final call on the calculated CVSS; it is better to move quickly than making the CVSS perfect. Issues may also be reported to [Mitre](https://cve.mitre.org/) using this [scoring calculator](https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator). The CVE will initially be set to private.
+6.  The developer will work on fixing the vulnerability and perform internal testing before preparing to roll out the fix.
+7. A public disclosure date is negotiated by the Firefly III developer and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation or patch is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for distributor coordination. The timeframe for disclosure is from immediate (especially if it’s already publicly known) to a few weeks. For a critical vulnerability with a straightforward mitigation, we expect report date to public disclosure date to be on the order of 14 business days. The Firefly III developer holds the final say when setting a public disclosure date.
+9.  Once the fix is confirmed, the developer will patch the vulnerability in the next patch or minor release. Upon release of the patched version of Firefly III, we will follow the **Public Disclosure Process**.
+
+### Public Disclosure Process
+The developer publishes a public [advisory](https://github.com/firefly-iii/firefly-iii/security/advisories) to the Firefly III community via GitHub. In most cases, additional communication via Twitter, reddit and other channels will assist in educating Firefly III users and rolling out the patched release to affected users. 
+
+The develop will also publish any mitigating steps users can take until the fix can be applied to their Firefly III instances.
+ 
+## Confidentiality, integrity and availability
+We consider vulnerabilities leading to the compromise of data confidentiality, elevation of privilege, or integrity to be our highest priority concerns. Availability, in particular in areas relating to DoS and resource exhaustion, is also a serious security concern. The Firefly III developer takes all vulnerabilities, potential vulnerabilities, and suspected vulnerabilities seriously and will investigate them in an urgent and expeditious manner.
+
+Note that we do not currently consider the default settings for Firefly III to be secure-by-default. It is necessary for operators to explicitly configure settings, role based access control, and other resource related features in Firefly III to provide a hardened Firefly III environment. We will not act on any security disclosure that relates to a lack of safe defaults. Over time, we will work towards improved safe-by-default configuration, taking into account backwards compatibility.
+
+## Credits
+
+This security policy is based on [Harbor](https://github.com/goharbor/harbor)'s security policy.

.github/workflows/laravel.yml

@@ -0,0 +1,146 @@
+name: Firefly III
+
+on:
+  push:
+    branches-ignore:
+      - '**'
+
+jobs:
+  prepare:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Copy .env
+        run: test -f .env || cp .ci/.env.ci .env
+      - name: Prepare dependencies
+        run: |
+          set -euxo pipefail
+          export PATH=$PATH:$HOME/.composer/vendor/bin/
+          composer global require hirak/prestissimo --no-plugins --no-scripts
+          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
+
+          touch ./storage/database/database.sqlite
+      - name: Prepare Firefly III
+        run: |
+          chmod -R 777 storage bootstrap/cache
+          php artisan migrate --seed
+          php artisan firefly-iii:upgrade-database
+      - name: Upload database
+        uses: actions/upload-artifact@v2
+        with:
+          name: database
+          path: storage/database/database.sqlite
+      - name: Upload cache
+        uses: actions/upload-artifact@v2
+        with:
+          name: cache
+          path: bootstrap/cache/
+      - name: Upload composer cache
+        uses: actions/upload-artifact@v2
+        with:
+          name: composer
+          path: ~/.composer
+
+  laravel-tests:
+
+    runs-on: ubuntu-latest
+
+    needs:
+      - prepare
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Copy .env
+        run: test -f .env || cp .ci/.env.ci .env
+      - name: Download database
+        uses: actions/download-artifact@v2
+        with:
+          name: database
+          path: storage/database/database.sqlite
+      - name: Download cache
+        uses: actions/download-artifact@v2
+        with:
+          name: cache
+          path: bootstrap/cache/
+      - name: Download vendor
+        uses: actions/download-artifact@v2
+        with:
+          name: composer
+          path: ~/.composer
+      - name: Install composer
+        run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
+
+      - name: PHPUnit tests
+        uses: php-actions/phpunit@v1
+        with:
+          config: phpunit.xml
+          memory: 512M
+
+  coding-standards:
+
+    runs-on: ubuntu-latest
+
+    needs:
+      - prepare
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Copy .env
+        run: test -f .env || cp .ci/.env.ci .env
+      - name: Download database
+        uses: actions/download-artifact@v2
+        with:
+          name: database
+          path: storage/database/database.sqlite
+      - name: Download cache
+        uses: actions/download-artifact@v2
+        with:
+          name: cache
+          path: bootstrap/cache/
+      - name: Download vendor
+        uses: actions/download-artifact@v2
+        with:
+          name: composer
+          path: ~/.composer
+      - name: install depenencies
+        run: |
+          composer global require nette/coding-standard
+          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
+
+      - name: Execute code standard
+        run: /home/runner/.composer/vendor/bin/ecs check app tests --config ./.ci/firefly-iii-standard.yml
+
+  phpstan:
+
+    runs-on: ubuntu-latest
+
+    needs:
+      - prepare
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Copy .env
+        run: test -f .env || cp .ci/.env.ci .env
+      - name: Download database
+        uses: actions/download-artifact@v2
+        with:
+          name: database
+          path: storage/database/database.sqlite
+      - name: Download cache
+        uses: actions/download-artifact@v2
+        with:
+          name: cache
+          path: bootstrap/cache/
+      - name: Download vendor
+        uses: actions/download-artifact@v2
+        with:
+          name: composer
+          path: ~/.composer
+      - name: Install depenencies
+        run: |
+          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
+
+      - name: Execute PHPStan
+        run: vendor/bin/phpstan analyse -c .ci/phpstan.neon

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /frontend/node_modules
+/frontend/fonts
 /public/hot
 /public/storage
 /storage/*.key

.travis.yml

@@ -0,0 +1,21 @@
+language: php
+php:
+- '7.4'
+dist: xenial
+os: linux
+cache:
+  directories:
+  - "/home/travis/.config"
+  - "/home/travis/build/firefly-iii/firefly-iii/vendor"
+
+branches:
+  only:
+  - develop
+
+before_script:
+- phpenv config-rm xdebug.ini || return 0
+- composer global require hirak/prestissimo --no-plugins --no-scripts
+
+script:
+- "./.ci/phpstan.sh"
+- "./.ci/phpunit.sh"

app.json

@@ -3,7 +3,7 @@
   "description": "A free and open source personal finances manager",
   "repository": "https://github.com/firefly-iii/firefly-iii",
   "website": "https://firefly-iii.org/",
-  "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png",
+  "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/public/mstile-150x150.png",
   "keywords": [
     "finance",
     "finances",
@@ -41,7 +41,7 @@
     {
       "plan": "heroku-postgresql",
       "options": {
-        "version": "9.5"
+        "version": "12"
       }
     }
   ],
@@ -58,8 +58,8 @@
   ],
   "env": {
     "APP_KEY": {
-      "description": "This key is used to encrypt your data.",
+      "description": "This key is used to create app cookies en secure attachments.",
       "value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
     }
   }
-}
+}

app/Api/V1/Controllers/AboutController.php

@@ -60,7 +60,7 @@ class AboutController extends Controller
             'driver'      => $currentDriver,
         ];
 
-        return response()->json(['data' => $data])->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -78,6 +78,6 @@ class AboutController extends Controller
 
         $resource = new Item(auth()->user(), $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/AccountController.php

@@ -45,13 +45,15 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class AccountController.
- *
  */
 class AccountController extends Controller
 {
     use AccountFilter, TransactionFilter;
-    /** @var AccountRepositoryInterface The account repository */
-    private $repository;
+
+    public const RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
 
     /**
      * AccountController constructor.
@@ -100,7 +102,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -150,10 +152,10 @@ class AccountController extends Controller
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new FractalCollection($accounts, $transformer, 'accounts');
+        $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -164,7 +166,6 @@ class AccountController extends Controller
      *
      * @return JsonResponse
      * @codeCoverageIgnore
-     *
      */
     public function piggyBanks(Account $account): JsonResponse
     {
@@ -190,7 +191,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -208,9 +209,9 @@ class AccountController extends Controller
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource = new Item($account, $transformer, 'accounts');
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -230,9 +231,9 @@ class AccountController extends Controller
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new Item($account, $transformer, 'accounts');
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -244,7 +245,6 @@ class AccountController extends Controller
      * @param Account $account
      *
      * @return JsonResponse
-     *
      */
     public function transactions(Request $request, Account $account): JsonResponse
     {
@@ -283,7 +283,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($groups, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -304,8 +304,8 @@ class AccountController extends Controller
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource = new Item($account, $transformer, 'accounts');
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/AttachmentController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
+use FireflyIII\Api\V1\Middleware\ApiDemoUser;
 use FireflyIII\Api\V1\Requests\AttachmentStoreRequest;
 use FireflyIII\Api\V1\Requests\AttachmentUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -43,13 +44,13 @@ use function strlen;
 
 /**
  * Class AttachmentController.
- *
  */
 class AttachmentController extends Controller
 {
     /** @var AttachmentRepositoryInterface The attachment repository */
     private $repository;
 
+
     /**
      * AccountController constructor.
      *
@@ -58,6 +59,7 @@ class AttachmentController extends Controller
     public function __construct()
     {
         parent::__construct();
+        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
@@ -65,6 +67,7 @@ class AttachmentController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
+
                 return $next($request);
             }
         );
@@ -92,8 +95,8 @@ class AttachmentController extends Controller
      * @param Attachment $attachment
      *
      * @codeCoverageIgnore
-     * @throws   FireflyException
      * @return LaravelResponse
+     * @throws   FireflyException
      */
     public function download(Attachment $attachment): LaravelResponse
     {
@@ -157,7 +160,7 @@ class AttachmentController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -176,7 +179,7 @@ class AttachmentController extends Controller
 
         $resource = new Item($attachment, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -184,8 +187,8 @@ class AttachmentController extends Controller
      *
      * @param AttachmentStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(AttachmentStoreRequest $request): JsonResponse
     {
@@ -199,7 +202,7 @@ class AttachmentController extends Controller
 
         $resource = new Item($attachment, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -222,7 +225,7 @@ class AttachmentController extends Controller
 
         $resource = new Item($attachment, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**

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

@@ -0,0 +1,116 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    use AccountFilter;
+
+    private array                      $balanceTypes;
+    private AccountRepositoryInterface $repository;
+
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+        $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE,];
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function accounts(AutocompleteRequest $request): JsonResponse
+    {
+        $data  = $request->getData();
+        $types = $data['types'];
+        $query = $data['query'];
+        $date  = $data['date'] ?? today(config('app.timezone'));
+
+        $return          = [];
+        $result          = $this->repository->searchAccount((string) $query, $types, $data['limit']);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+
+        /** @var Account $account */
+        foreach ($result as $account) {
+            $nameWithBalance = $account->name;
+            $currency        = $this->repository->getAccountCurrency($account) ?? $defaultCurrency;
+
+            if (in_array($account->accountType->type, $this->balanceTypes, true)) {
+                $balance         = app('steam')->balance($account, $date);
+                $nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false));
+            }
+
+            $return[] = [
+                'id'                      => $account->id,
+                'name'                    => $account->name,
+                'name_with_balance'       => $nameWithBalance,
+                'type'                    => $account->accountType->type,
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        // custom order.
+        $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
+
+
+        usort($return, function ($a, $b) use ($order) {
+            $pos_a = array_search($a['type'], $order);
+            $pos_b = array_search($b['type'], $order);
+            return $pos_a - $pos_b;
+        });
+
+        return response()->json($return);
+    }
+}

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * BillController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BillController
+ */
+class BillController extends Controller
+{
+    private BillRepositoryInterface $repository;
+
+
+    /**
+     * BillController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function bills(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchBill($data['query'], $data['limit']);
+        $filtered = $result->map(
+            static function (Bill $item) {
+                return [
+                    'id'   => $item->id,
+                    'name' => $item->name,
+                ];
+            }
+        );
+
+
+        return response()->json($filtered->toArray());
+    }
+
+}

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * BudgetController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    private BudgetRepositoryInterface $repository;
+
+
+    /**
+     * BudgetController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function budgets(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchBudget($data['query'], $data['limit']);
+        $filtered = $result->map(
+            static function (Budget $item) {
+                return [
+                    'id'   => $item->id,
+                    'name' => $item->name,
+                ];
+            }
+        );
+
+        return response()->json($filtered);
+    }
+}

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

@@ -0,0 +1,79 @@
+<?php
+/**
+ * CategoryController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class CategoryController
+ */
+class CategoryController extends Controller
+{
+    private CategoryRepositoryInterface $repository;
+
+
+    /**
+     * CategoryController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(CategoryRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function categories(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchCategory($data['query'], $data['limit']);
+        $filtered = $result->map(
+            static function (Category $item) {
+                return [
+                    'id'   => $item->id,
+                    'name' => $item->name,
+                ];
+            }
+        );
+
+        return response()->json($filtered);
+    }
+}

app/Api/V1/Controllers/Autocomplete/CurrencyController.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * CurrencyController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class CurrencyController
+ */
+class CurrencyController extends Controller
+{
+    private CurrencyRepositoryInterface $repository;
+
+
+    /**
+     * CurrencyController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(CurrencyRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
+    {
+        $data       = $request->getData();
+        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $result     = [];
+
+        /** @var TransactionCurrency $currency */
+        foreach ($collection as $currency) {
+            $result[] = [
+                'id'             => $currency->id,
+                'name'           => sprintf('%s (%s)', $currency->name, $currency->code),
+                'code'           => $currency->code,
+                'symbol'         => $currency->symbol,
+                'decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function currencies(AutocompleteRequest $request): JsonResponse
+    {
+        $data       = $request->getData();
+        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $result     = [];
+
+        /** @var TransactionCurrency $currency */
+        foreach ($collection as $currency) {
+            $result[] = [
+                'id'             => $currency->id,
+                'name'           => $currency->name,
+                'code'           => $currency->code,
+                'symbol'         => $currency->symbol,
+                'decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($result);
+    }
+}

app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * ObjectGroupController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class ObjectGroupController
+ */
+class ObjectGroupController extends Controller
+{
+    private ObjectGroupRepositoryInterface $repository;
+
+
+    /**
+     * CurrencyController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ObjectGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function objectGroups(AutocompleteRequest $request): JsonResponse
+    {
+        $data   = $request->getData();
+        $return = [];
+        $result = $this->repository->search($data['query'], $data['limit']);
+
+        /** @var ObjectGroup $account */
+        foreach ($result as $objectGroup) {
+            $return[] = [
+                'id'    => $objectGroup->id,
+                'name'  => $objectGroup->title,
+                'title' => $objectGroup->title,
+            ];
+        }
+
+        return response()->json($return);
+    }
+
+}

app/Api/V1/Controllers/Autocomplete/PiggyBankController.php

@@ -0,0 +1,125 @@
+<?php
+/**
+ * PiggyBankController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class PiggyBankController
+ */
+class PiggyBankController extends Controller
+{
+    private PiggyBankRepositoryInterface $piggyRepository;
+
+    private AccountRepositoryInterface   $accountRepository;
+
+
+    /**
+     * PiggyBankController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                    = auth()->user();
+                $this->piggyRepository   = app(PiggyBankRepositoryInterface::class);
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->piggyRepository->setUser($user);
+                $this->accountRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function piggyBanks(AutocompleteRequest $request): JsonResponse
+    {
+        $data            = $request->getData();
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $response        = [];
+
+        /** @var PiggyBank $piggy */
+        foreach ($piggies as $piggy) {
+            $currency   = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $response[] = [
+                'id'                      => $piggy->id,
+                'name'                    => $piggy->name,
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($response);
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
+    {
+        $data            = $request->getData();
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $response        = [];
+        /** @var PiggyBank $piggy */
+        foreach ($piggies as $piggy) {
+            $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
+            $response[]    = [
+                'id'                      => $piggy->id,
+                'name'                    => $piggy->name,
+                'name_with_balance'       => sprintf(
+                    '%s (%s / %s)', $piggy->name, app('amount')->formatAnything($currency, $currentAmount, false),
+                    app('amount')->formatAnything($currency, $piggy->targetamount, false),
+                ),
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($response);
+    }
+
+}

app/Api/V1/Controllers/Autocomplete/RecurrenceController.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * RecurrenceController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+
+/**
+ * Class RecurrenceController
+ */
+class RecurrenceController extends Controller
+{
+
+}

app/Api/V1/Controllers/Autocomplete/RuleController.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * GithubRequest.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * RuleController.php
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,14 +21,15 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Services\Github\Request;
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
 
 /**
- * Interface GithubRequest
- * @deprecated
+ * Class RuleController
  */
-interface GithubRequest
+class RuleController extends Controller
 {
-    public function call(): void;
 
 }

app/Api/V1/Controllers/Autocomplete/RuleGroupController.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * SpectreException.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * RuleGroupController.php
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,16 +21,15 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Services\Spectre\Exception;
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-use Exception;
+
+use FireflyIII\Api\V1\Controllers\Controller;
 
 /**
- * @codeCoverageIgnore
- * Class SpectreException
- * @deprecated
+ * Class RuleGroupController
  */
-class SpectreException extends Exception
+class RuleGroupController extends Controller
 {
 
 }

app/Api/V1/Controllers/Autocomplete/TagController.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * TagController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TagController
+ */
+class TagController extends Controller
+{
+    private TagRepositoryInterface $repository;
+
+
+    /**
+     * TagController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(TagRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tags(AutocompleteRequest $request): JsonResponse
+    {
+        $data = $request->getData();
+
+        $result = $this->repository->searchTags($data['query'], $data['limit']);
+        $array  = [];
+        /** @var Tag $tag */
+        foreach ($result as $tag) {
+            $array[] = [
+                'id'   => $tag->id,
+                'name' => $tag->tag,
+                'tag'  => $tag->tag,
+            ];
+        }
+
+        return response()->json($array);
+    }
+}

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

@@ -0,0 +1,132 @@
+<?php
+/**
+ * TransactionController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class TransactionController
+ */
+class TransactionController extends Controller
+{
+    private JournalRepositoryInterface          $repository;
+
+    private TransactionGroupRepositoryInterface $groupRepository;
+
+
+    /**
+     * TransactionController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                  = auth()->user();
+                $this->repository      = app(JournalRepositoryInterface::class);
+                $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+                $this->groupRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function transactions(AutocompleteRequest $request): JsonResponse
+    {
+        $data   = $request->getData();
+        $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+
+        // limit and unique
+        $filtered = $result->unique('description');
+        $array    = [];
+
+        /** @var TransactionJournal $journal */
+        foreach ($filtered as $journal) {
+            $array[] = [
+                'id'                   => $journal->id,
+                'transaction_group_id' => $journal->transaction_group_id,
+                'name'                 => $journal->description,
+                'description'          => $journal->description,
+            ];
+        }
+
+        return response()->json($array);
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function transactionsWithID(AutocompleteRequest $request): JsonResponse
+    {
+        $data   = $request->getData();
+        $result = new Collection;
+        if (is_numeric($data['query'])) {
+            // search for group, not journal.
+            $firstResult = $this->groupRepository->find((int) $data['query']);
+            if (null !== $firstResult) {
+                // group may contain multiple journals, each a result:
+                foreach ($firstResult->transactionJournals as $journal) {
+                    $result->push($journal);
+                }
+            }
+        }
+        if (!is_numeric($data['query'])) {
+            $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+        }
+
+        // limit and unique
+        $array = [];
+
+        /** @var TransactionJournal $journal */
+        foreach ($result as $journal) {
+            $array[] = [
+                'id'                   => $journal->id,
+                'transaction_group_id' => $journal->transaction_group_id,
+                'name'                 => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
+                'description'          => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
+            ];
+        }
+
+        return response()->json($array);
+    }
+}

app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * TransactionTypeController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Autocomplete;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TransactionTypeController
+ */
+class TransactionTypeController extends Controller
+{
+    private TransactionTypeRepositoryInterface $repository;
+
+
+    /**
+     * TransactionTypeController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(TransactionTypeRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactionTypes(AutocompleteRequest $request): JsonResponse
+    {
+        $data  = $request->getData();
+        $types = $this->repository->searchTypes($data['query'], $data['limit']);
+        $array = [];
+
+        /** @var TransactionType $type */
+        foreach ($types as $type) {
+            // different key for consistency.
+            $array[] = [
+                'id'   => $type->id,
+                'name' => $type->type,
+                'type' => $type->type,
+            ];
+        }
+
+        return response()->json($array);
+    }
+}

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -38,12 +38,10 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class AvailableBudgetController.
- *
  */
 class AvailableBudgetController extends Controller
 {
-    /** @var AvailableBudgetRepositoryInterface */
-    private $abRepository;
+    private AvailableBudgetRepositoryInterface $abRepository;
 
     /**
      * AvailableBudgetController constructor.
@@ -113,7 +111,7 @@ class AvailableBudgetController extends Controller
         $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -134,7 +132,7 @@ class AvailableBudgetController extends Controller
 
         $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -147,6 +145,9 @@ class AvailableBudgetController extends Controller
     public function store(AvailableBudgetRequest $request): JsonResponse
     {
         $data = $request->getAll();
+        $data['start']->startOfDay();
+        $data['end']->endOfDay();
+
         /** @var TransactionCurrencyFactory $factory */
         $factory  = app(TransactionCurrencyFactory::class);
         $currency = $factory->find($data['currency_id'], $data['currency_code']);
@@ -164,7 +165,7 @@ class AvailableBudgetController extends Controller
 
         $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -204,7 +205,7 @@ class AvailableBudgetController extends Controller
 
         $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/BillController.php

@@ -24,7 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\BillRequest;
+use FireflyIII\Api\V1\Requests\BillUpdateRequest;
+use FireflyIII\Api\V1\Requests\BillStoreRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Bill;
@@ -44,13 +45,13 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class BillController.
- *
  */
 class BillController extends Controller
 {
     use TransactionFilter;
-    /** @var BillRepositoryInterface The bill repository */
-    private $repository;
+
+    private BillRepositoryInterface $repository;
+
 
     /**
      * BillController constructor.
@@ -102,7 +103,7 @@ class BillController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -142,7 +143,7 @@ class BillController extends Controller
         $resource = new FractalCollection($bills, $transformer, 'bills');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -177,7 +178,7 @@ class BillController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -198,18 +199,18 @@ class BillController extends Controller
 
         $resource = new Item($bill, $transformer, 'bills');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Store a bill.
      *
-     * @param BillRequest $request
+     * @param BillStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function store(BillRequest $request): JsonResponse
+    public function store(BillStoreRequest $request): JsonResponse
     {
         $bill    = $this->repository->store($request->getAll());
         $manager = $this->getManager();
@@ -220,7 +221,7 @@ class BillController extends Controller
 
         $resource = new Item($bill, $transformer, 'bills');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -278,18 +279,18 @@ class BillController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Update a bill.
      *
-     * @param BillRequest $request
+     * @param BillUpdateRequest $request
      * @param Bill        $bill
      *
      * @return JsonResponse
      */
-    public function update(BillRequest $request, Bill $bill): JsonResponse
+    public function update(BillUpdateRequest $request, Bill $bill): JsonResponse
     {
         $data    = $request->getAll();
         $bill    = $this->repository->update($bill, $data);
@@ -301,7 +302,7 @@ class BillController extends Controller
 
         $resource = new Item($bill, $transformer, 'bills');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/BudgetController.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use Exception;
-use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
 use FireflyIII\Api\V1\Requests\BudgetStoreRequest;
 use FireflyIII\Api\V1\Requests\BudgetUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -47,16 +45,18 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class BudgetController.
- *
  */
 class BudgetController extends Controller
 {
     use TransactionFilter;
+
     /** @var BudgetLimitRepositoryInterface */
     private $blRepository;
+
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
+
     /**
      * BudgetController constructor.
      *
@@ -107,7 +107,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -136,7 +136,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -183,7 +183,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($budgets, $transformer, 'budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -204,7 +204,7 @@ class BudgetController extends Controller
 
         $resource = new Item($budget, $transformer, 'budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -212,9 +212,9 @@ class BudgetController extends Controller
      *
      * @param BudgetStoreRequest $request
      *
+     * @return JsonResponse
      * @throws FireflyException
      *
-     * @return JsonResponse
      */
     public function store(BudgetStoreRequest $request): JsonResponse
     {
@@ -227,32 +227,7 @@ class BudgetController extends Controller
 
         $resource = new Item($budget, $transformer, 'budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param BudgetLimitRequest $request
-     * @param Budget             $budget
-     *
-     * @throws Exception
-     * @return JsonResponse
-     */
-    public function storeBudgetLimit(BudgetLimitRequest $request, Budget $budget): JsonResponse
-    {
-        $data           = $request->getAll();
-        $data['budget'] = $budget;
-        $budgetLimit    = $this->blRepository->storeBudgetLimit($data);
-        $manager        = $this->getManager();
-
-        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -316,7 +291,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -339,7 +314,7 @@ class BudgetController extends Controller
 
         $resource = new Item($budget, $transformer, 'budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 

app/Api/V1/Controllers/BudgetLimitController.php

@@ -44,16 +44,18 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class BudgetLimitController.
- *
  */
 class BudgetLimitController extends Controller
 {
     use TransactionFilter;
+
     /** @var BudgetLimitRepositoryInterface */
     private $blRepository;
+
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
+
     /**
      * BudgetLimitController constructor.
      *
@@ -127,7 +129,7 @@ class BudgetLimitController extends Controller
         $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -148,7 +150,7 @@ class BudgetLimitController extends Controller
 
         $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -156,20 +158,19 @@ class BudgetLimitController extends Controller
      *
      * @param BudgetLimitRequest $request
      *
+     * @return JsonResponse
      * @throws FireflyException
      *
-     * @return JsonResponse
      */
     public function store(BudgetLimitRequest $request): JsonResponse
     {
-        $data   = $request->getAll();
-        $budget = $this->repository->findNull($data['budget_id']);
-        if (null === $budget) {
-            throw new FireflyException('200004: Budget does not exist.'); // @codeCoverageIgnore
-        }
-        $data['budget'] = $budget;
-        $budgetLimit    = $this->blRepository->storeBudgetLimit($data);
-        $manager        = $this->getManager();
+        $data               = $request->getAll();
+        $data['start_date'] = $data['start'];
+        $data['end_date']   = $data['end'];
+
+        $budgetLimit = $this->blRepository->store($data);
+        $manager     = $this->getManager();
+
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -177,7 +178,7 @@ class BudgetLimitController extends Controller
 
         $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -230,7 +231,7 @@ class BudgetLimitController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -243,10 +244,9 @@ class BudgetLimitController extends Controller
      */
     public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
     {
-        $data           = $request->getAll();
-        $data['budget'] = $budgetLimit->budget;
-        $budgetLimit    = $this->blRepository->updateBudgetLimit($budgetLimit, $data);
-        $manager        = $this->getManager();
+        $data        = $request->getAll();
+        $budgetLimit = $this->blRepository->update($budgetLimit, $data);
+        $manager     = $this->getManager();
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -254,7 +254,7 @@ class BudgetLimitController extends Controller
 
         $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/CategoryController.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\CategoryRequest;
+use FireflyIII\Api\V1\Requests\CategoryStoreRequest;
+use FireflyIII\Api\V1\Requests\CategoryUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Category;
@@ -42,13 +43,12 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class CategoryController.
- *
  */
 class CategoryController extends Controller
 {
     use TransactionFilter;
-    /** @var CategoryRepositoryInterface The category repository */
-    private $repository;
+    private CategoryRepositoryInterface $repository;
+
 
     /**
      * CategoryController constructor.
@@ -98,7 +98,7 @@ class CategoryController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -146,7 +146,7 @@ class CategoryController extends Controller
         $resource = new FractalCollection($categories, $transformer, 'categories');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -168,18 +168,18 @@ class CategoryController extends Controller
 
         $resource = new Item($category, $transformer, 'categories');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Store new category.
      *
-     * @param CategoryRequest $request
+     * @param CategoryStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function store(CategoryRequest $request): JsonResponse
+    public function store(CategoryStoreRequest $request): JsonResponse
     {
         $category = $this->repository->store($request->getAll());
         $manager  = $this->getManager();
@@ -190,7 +190,7 @@ class CategoryController extends Controller
 
         $resource = new Item($category, $transformer, 'categories');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -246,18 +246,18 @@ class CategoryController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Update the category.
      *
-     * @param CategoryRequest $request
+     * @param CategoryUpdateRequest $request
      * @param Category        $category
      *
      * @return JsonResponse
      */
-    public function update(CategoryRequest $request, Category $category): JsonResponse
+    public function update(CategoryUpdateRequest $request, Category $category): JsonResponse
     {
         $data     = $request->getAll();
         $category = $this->repository->update($category, $data);
@@ -269,7 +269,7 @@ class CategoryController extends Controller
 
         $resource = new Item($category, $transformer, 'categories');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 

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

@@ -42,10 +42,11 @@ use Illuminate\Http\JsonResponse;
 class AccountController extends Controller
 {
     use ApiSupport;
-    /** @var CurrencyRepositoryInterface */
-    private $currencyRepository;
-    /** @var AccountRepositoryInterface */
-    private $repository;
+
+    private CurrencyRepositoryInterface $currencyRepository;
+
+    private AccountRepositoryInterface $repository;
+
 
     /**
      * AccountController constructor.
@@ -196,6 +197,8 @@ class AccountController extends Controller
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
+                'start_date'              => $start->format('Y-m-d'),
+                'end_date'                => $end->format('Y-m-d'),
                 'type'                    => 'line', // line, area or bar
                 'yAxisID'                 => 0, // 0, 1, 2
                 'entries'                 => [],
@@ -207,7 +210,7 @@ class AccountController extends Controller
             while ($currentStart <= $end) {
                 $format   = $currentStart->format('Y-m-d');
                 $label    = $currentStart->format('Y-m-d');
-                $balance  = isset($range[$format]) ? round($range[$format], 12) : $previous;
+                $balance  = array_key_exists($format, $range) ? round($range[$format], 12) : $previous;
                 $previous = $balance;
                 $currentStart->addDay();
                 $currentSet['entries'][$label] = $balance;

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

@@ -31,17 +31,14 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Collection;
 
 /**
  * Class AvailableBudgetController
  */
 class AvailableBudgetController extends Controller
 {
-    /** @var OperationsRepositoryInterface */
-    private $opsRepository;
-    /** @var BudgetRepositoryInterface */
-    private $repository;
+    private OperationsRepositoryInterface $opsRepository;
+    private BudgetRepositoryInterface     $repository;
 
     /**
      * AvailableBudgetController constructor.
@@ -72,18 +69,18 @@ class AvailableBudgetController extends Controller
      */
     public function overview(AvailableBudget $availableBudget): JsonResponse
     {
-        $currency          = $availableBudget->transactionCurrency;
-        $budgets           = $this->repository->getActiveBudgets();
-        $budgetInformation = $this->opsRepository->spentInPeriodMc($budgets, new Collection, $availableBudget->start_date, $availableBudget->end_date);
-        $spent             = 0.0;
+        $currency             = $availableBudget->transactionCurrency;
+        $budgets              = $this->repository->getActiveBudgets();
+        $newBudgetInformation = $this->opsRepository->sumExpenses($availableBudget->start_date, $availableBudget->end_date, null, $budgets);
+        $spent                = '0';
 
-        // get for current currency
-        foreach ($budgetInformation as $spentInfo) {
-            if ($spentInfo['currency_id'] === $availableBudget->transaction_currency_id) {
-                $spent = $spentInfo['amount'];
+        foreach ($newBudgetInformation as $currencyId => $info) {
+            if ($currencyId === (int) $availableBudget->transaction_currency_id) {
+                $spent = $info['sum'];
             }
         }
-        $left = bcadd($availableBudget->amount, (string) $spent);
+
+        $left = bcadd($availableBudget->amount, $spent);
         // left less than zero? Set to zero.
         if (-1 === bccomp($left, '0')) {
             $left = '0';

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

@@ -0,0 +1,297 @@
+<?php
+/**
+ * BudgetController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Chart;
+
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\DateRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    private BudgetLimitRepositoryInterface $blRepository;
+
+    private OperationsRepositoryInterface  $opsRepository;
+
+    private BudgetRepositoryInterface      $repository;
+
+
+    /**
+     * BudgetController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository    = app(BudgetRepositoryInterface::class);
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * [
+     *   'label'                   => 'label for entire set'
+     *   'currency_id'             => 0,
+     *   'currency_code'           => 'EUR',
+     *   'currency_symbol'         => '$',
+     *   'currency_decimal_places' => 2,
+     *   'type'                    => 'bar', // line, area or bar
+     *   'yAxisID'                 => 0, // 0, 1, 2
+     *   'entries'                 => ['a' => 1, 'b' => 4],
+     * ],
+     *
+     * @param DateRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function overview(DateRequest $request): JsonResponse
+    {
+        $dates         = $request->getAll();
+        $budgets       = $this->repository->getActiveBudgets();
+        $budgetNames   = [];
+        $currencyNames = [];
+        $sets          = [];
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            $expenses = $this->getExpenses($budget, $dates['start'], $dates['end']);
+            $expenses = $this->filterNulls($expenses);
+            foreach ($expenses as $set) {
+                $budgetNames[]   = $set['budget_name'];
+                $currencyNames[] = $set['currency_name'];
+                $sets[]          = $set;
+            }
+        }
+        $budgetNames   = array_unique($budgetNames);
+        $currencyNames = array_unique($currencyNames);
+        $basic         = $this->createSets($budgetNames, $currencyNames);
+        $filled        = $this->fillSets($basic, $sets);
+        $keys          = array_values($filled);
+
+        return response()->json($keys);
+    }
+
+    /**
+     * @param Collection $limits
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    protected function getExpenses(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        $limits = $this->blRepository->getBudgetLimits($budget, $start, $end);
+        if (0 === $limits->count()) {
+            return $this->getExpenseInRange($budget, $start, $end);
+        }
+        $arr = [];
+        /** @var BudgetLimit $limit */
+        foreach ($limits as $limit) {
+            $arr[] = $this->getExpensesForLimit($limit);
+        }
+
+        return $arr;
+    }
+
+    /**
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getExpenseInRange(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        $spent  = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$budget]), null);
+        $return = [];
+        /** @var array $set */
+        foreach ($spent as $set) {
+            $current                            = [
+                'label'                   => sprintf('%s (%s)', $budget->name, $set['currency_name']),
+                'budget_name'             => $budget->name,
+                'start_date'              => $start->format('Y-m-d'),
+                'end_date'                => $end->format('Y-m-d'),
+                'currency_id'             => (int) $set['currency_id'],
+                'currency_code'           => $set['currency_code'],
+                'currency_name'           => $set['currency_name'],
+                'currency_symbol'         => $set['currency_symbol'],
+                'currency_decimal_places' => (int) $set['currency_decimal_places'],
+                'type'                    => 'bar', // line, area or bar,
+                'entries'                 => [],
+            ];
+            $sumSpent                           = bcmul($set['sum'], '-1'); // spent
+            $current['entries']['spent']        = $sumSpent;
+            $current['entries']['amount']       = '0';
+            $current['entries']['spent_capped'] = $sumSpent;
+            $current['entries']['left']         = '0';
+            $current['entries']['overspent']    = '0';
+            $return[]                           = $current;
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param BudgetLimit $limit
+     *
+     * @return array
+     */
+    private function getExpensesForLimit(BudgetLimit $limit): array
+    {
+        $budget   = $limit->budget;
+        $spent    = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $limit->transactionCurrency);
+        $currency = $limit->transactionCurrency;
+        // when limited to a currency, the count is always one. Or it's empty.
+        $set = array_shift($spent);
+        if (null === $set) {
+            return [];
+        }
+        $return                            = [
+            'label'                   => sprintf('%s (%s)', $budget->name, $set['currency_name']),
+            'budget_name'             => $budget->name,
+            'start_date'              => $limit->start_date->format('Y-m-d'),
+            'end_date'                => $limit->end_date->format('Y-m-d'),
+            'currency_id'             => (int) $currency->id,
+            'currency_code'           => $currency->code,
+            'currency_name'           => $currency->name,
+            'currency_symbol'         => $currency->symbol,
+            'currency_decimal_places' => (int) $currency->decimal_places,
+            'type'                    => 'bar', // line, area or bar,
+            'entries'                 => [],
+        ];
+        $sumSpent                          = bcmul($set['sum'], '-1'); // spent
+        $return['entries']['spent']        = $sumSpent;
+        $return['entries']['amount']       = $limit->amount;
+        $return['entries']['spent_capped'] = 1 === bccomp($sumSpent, $limit->amount) ? $limit->amount : $sumSpent;
+        $return['entries']['left']         = 1 === bccomp($limit->amount, $sumSpent) ? bcadd($set['sum'], $limit->amount) : '0';              // left
+        $return['entries']['overspent']    = 1 === bccomp($limit->amount, $sumSpent) ? '0' : bcmul(bcadd($set['sum'], $limit->amount), '-1'); // overspent
+
+        return $return;
+    }
+
+    /**
+     * @param array $expenses
+     *
+     * @return array
+     */
+    private function filterNulls(array $expenses): array
+    {
+        $return = [];
+        /** @var array|null $arr */
+        foreach ($expenses as $arr) {
+            if ([] !== $arr) {
+                $return[] = $arr;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param array $budgetNames
+     * @param array $currencyNames
+     *
+     * @return array
+     */
+    private function createSets(array $budgetNames, array $currencyNames): array
+    {
+        $return = [];
+        foreach ($currencyNames as $currencyName) {
+            $entries = [];
+            foreach ($budgetNames as $budgetName) {
+                $label           = sprintf('%s (%s)', $budgetName, $currencyName);
+                $entries[$label] = '0';
+            }
+
+            // left
+            $return['left'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.left'), $currencyName),
+                'data_type'     => 'left',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+            // spent_capped
+            $return['spent_capped'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.spent'), $currencyName),
+                'data_type'     => 'spent_capped',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+            // overspent
+            $return['overspent'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.overspent'), $currencyName),
+                'data_type'     => 'overspent',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param array $basic
+     * @param array $sets
+     *
+     * @return array
+     */
+    private function fillSets(array $basic, array $sets): array
+    {
+        foreach ($sets as $set) {
+            $label                                    = $set['label'];
+            $basic['spent_capped']['entries'][$label] = $set['entries']['spent_capped'];
+            $basic['left']['entries'][$label]         = $set['entries']['left'];
+            $basic['overspent']['entries'][$label]    = $set['entries']['overspent'];
+        }
+
+        return $basic;
+    }
+
+}

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

@@ -38,12 +38,10 @@ use Illuminate\Http\JsonResponse;
  */
 class CategoryController extends Controller
 {
-    /** @var CategoryRepositoryInterface */
-    private $categoryRepository;
-    /** @var NoCategoryRepositoryInterface */
-    private $noCatRepository;
-    /** @var OperationsRepositoryInterface */
-    private $opsRepository;
+    private CategoryRepositoryInterface   $categoryRepository;
+    private NoCategoryRepositoryInterface $noCatRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private array                         $categories;
 
     /**
      * AccountController constructor.
@@ -60,6 +58,7 @@ class CategoryController extends Controller
                 $this->categoryRepository = app(CategoryRepositoryInterface::class);
                 $this->opsRepository      = app(OperationsRepositoryInterface::class);
                 $this->noCatRepository    = app(NoCategoryRepositoryInterface::class);
+                $this->categories         = [];
                 $this->categoryRepository->setUser($user);
                 $this->opsRepository->setUser($user);
                 $this->noCatRepository->setUser($user);
@@ -74,8 +73,6 @@ class CategoryController extends Controller
      * @param DateRequest $request
      *
      * @return JsonResponse
-     *
-     * TODO after 4.8,0, simplify
      */
     public function overview(DateRequest $request): JsonResponse
     {
@@ -86,117 +83,75 @@ class CategoryController extends Controller
         /** @var Carbon $end */
         $end = $dates['end'];
 
+        $tempData     = [];
+        $spentWith    = $this->opsRepository->listExpenses($start, $end);
+        $spentWithout = $this->noCatRepository->listExpenses($start, $end);
 
-        $tempData      = [];
-        $spentWith     = $this->opsRepository->listExpenses($start, $end);
-        $earnedWith    = $this->opsRepository->listIncome($start, $end);
-        $spentWithout  = $this->noCatRepository->listExpenses($start, $end);
-        $earnedWithout = $this->noCatRepository->listIncome($start, $end);
-        $categories    = [];
+        /** @var array $set */
+        foreach ([$spentWith, $spentWithout,] as $set) {
+            $tempData = $this->processArray($tempData, $set);
+        }
 
+        $chartData = $this->sortArray($tempData);
 
-        foreach ([$spentWith, $earnedWith, $spentWithout, $earnedWithout] as $set) {
-            foreach ($set as $currency) {
-                foreach ($currency['categories'] as $category) {
-                    $categories[] = $category['name'];
-                    $inKey        = sprintf('%d-i', $currency['currency_id']);
-                    $outKey       = sprintf('%d-e', $currency['currency_id']);
-                    // make data arrays if not yet present.
-                    $tempData[$inKey]  = $tempData[$inKey] ?? [
-                            'currency_id'             => $currency['currency_id'],
-                            'label'                   => (string) trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-                            'currency_code'           => $currency['currency_code'],
-                            'currency_symbol'         => $currency['currency_symbol'],
-                            'currency_decimal_places' => $currency['currency_decimal_places'],
-                            'type'                    => 'bar', // line, area or bar
-                            'yAxisID'                 => 0, // 0, 1, 2
-                            'entries'                 => [
-                                // per category:
-                                // "category" => 5,
-                            ],
-                        ];
-                    $tempData[$outKey] = $tempData[$outKey] ?? [
-                            'currency_id'             => $currency['currency_id'],
-                            'label'                   => (string) trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-                            'currency_code'           => $currency['currency_code'],
-                            'currency_symbol'         => $currency['currency_symbol'],
-                            'currency_decimal_places' => $currency['currency_decimal_places'],
-                            'type'                    => 'bar', // line, area or bar
-                            'yAxisID'                 => 0, // 0, 1, 2
-                            'entries'                 => [
-                                // per category:
-                                // "category" => 5,
-                            ],
-                        ];
+        return response()->json($chartData);
+    }
 
-                    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']);
-                    }
+    /**
+     * @param array $tempData
+     * @param array $set
+     *
+     * @return array
+     */
+    private function processArray(array $tempData, array $set): array
+    {
+        foreach ($set as $currency) {
+            foreach ($currency['categories'] as $category) {
+                $this->categories[] = $category['name'];
+                $outKey             = sprintf('%d-e', $currency['currency_id']);
+                $tempData[$outKey]  = $tempData[$outKey] ?? [
+                        'currency_id'             => $currency['currency_id'],
+                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
+                        'currency_code'           => $currency['currency_code'],
+                        'currency_symbol'         => $currency['currency_symbol'],
+                        'currency_decimal_places' => $currency['currency_decimal_places'],
+                        'type'                    => 'bar', // line, area or bar
+                        'yAxisID'                 => 0, // 0, 1, 2
+                        'entries'                 => [],
+                    ];
+
+                foreach ($category['transaction_journals'] as $journal) {
+                    // is it expense or income?
+                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], 'e');
+                    $name                                    = $category['name'];
+                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
+                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
                 }
             }
         }
 
-        //        foreach ([] as $set) {
-        //            foreach ($set as $currency) {
-        //                $inKey        = sprintf('%d-i', $currency['currency_id']);
-        //                $outKey       = sprintf('%d-e', $currency['currency_id']);
-        //                $categories[] = (string)trans('firefly.no_category');
-        //                // make data arrays if not yet present.
-        //                $tempData[$inKey]  = $tempData[$inKey] ?? [
-        //                        'currency_id'             => $currency['currency_id'],
-        //                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-        //                        'currency_code'           => $currency['currency_code'],
-        //                        'currency_symbol'         => $currency['currency_symbol'],
-        //                        'currency_decimal_places' => $currency['currency_decimal_places'],
-        //                        'type'                    => 'bar', // line, area or bar
-        //                        'yAxisID'                 => 0, // 0, 1, 2
-        //                        'entries'                 => [
-        //                            // per category:
-        //                            // "category" => 5,
-        //                        ],
-        //                    ];
-        //                $tempData[$outKey] = $tempData[$outKey] ?? [
-        //                        'currency_id'             => $currency['currency_id'],
-        //                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-        //                        'currency_code'           => $currency['currency_code'],
-        //                        'currency_symbol'         => $currency['currency_symbol'],
-        //                        'currency_decimal_places' => $currency['currency_decimal_places'],
-        //                        'type'                    => 'bar', // line, area or bar
-        //                        'yAxisID'                 => 0, // 0, 1, 2
-        //                        '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']);
-        //                }
-        //            }
-        //        }
+        return $tempData;
+    }
 
+    /**
+     * @param array $tempData
+     *
+     * @return array
+     */
+    private function sortArray(array $tempData): array
+    {
         // re-sort every spent array and add 0 for missing entries.
         foreach ($tempData as $index => $set) {
             $oldSet = $set['entries'];
             $newSet = [];
-            foreach ($categories as $category) {
+            foreach ($this->categories as $category) {
                 $value             = $oldSet[$category] ?? '0';
                 $value             = -1 === bccomp($value, '0') ? bcmul($value, '-1') : $value;
                 $newSet[$category] = $value;
             }
             $tempData[$index]['entries'] = $newSet;
         }
-        $chartData = array_values($tempData);
 
-        return response()->json($chartData);
+        return array_values($tempData);
     }
 }

app/Api/V1/Controllers/ConfigurationController.php

@@ -37,14 +37,12 @@ use Illuminate\Http\JsonResponse;
  */
 class ConfigurationController extends Controller
 {
-
-
     /** @var UserRepositoryInterface The user repository */
     private $repository;
 
+
     /**
      * ConfigurationController constructor.
-     *
      */
     public function __construct()
     {
@@ -73,24 +71,7 @@ class ConfigurationController extends Controller
     {
         $configData = $this->getConfigData();
 
-        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update the configuration.
-     *
-     * @param ConfigurationRequest $request
-     * @param string               $name
-     *
-     * @return JsonResponse
-     */
-    public function update(ConfigurationRequest $request, string $name): JsonResponse
-    {
-        $data = $request->getAll();
-        app('fireflyconfig')->set($name, $data['value']);
-        $configData = $this->getConfigData();
-
-        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $configData])->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -116,4 +97,21 @@ class ConfigurationController extends Controller
             'single_user_mode'        => null === $singleUser ? null : $singleUser->data,
         ];
     }
+
+    /**
+     * Update the configuration.
+     *
+     * @param ConfigurationRequest $request
+     * @param string               $name
+     *
+     * @return JsonResponse
+     */
+    public function update(ConfigurationRequest $request, string $name): JsonResponse
+    {
+        $data = $request->getAll();
+        app('fireflyconfig')->set($name, $data['value']);
+        $configData = $this->getConfigData();
+
+        return response()->json(['data' => $configData])->header('Content-Type', self::CONTENT_TYPE);
+    }
 }

app/Api/V1/Controllers/Controller.php

@@ -39,61 +39,32 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  * Class Controller.
  *
  * @codeCoverageIgnore
- *
  */
-class Controller extends BaseController
+abstract class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
-    /** @var ParameterBag Parameters from the URI are stored here. */
-    protected $parameters;
+    protected const CONTENT_TYPE = 'application/vnd.api+json';
+    protected ParameterBag $parameters;
 
     /**
      * Controller constructor.
-     *
      */
     public function __construct()
     {
         // get global parameters
         $this->parameters = $this->getParameters();
-    }
+        $this->middleware(
+            function ($request, $next) {
+                if (auth()->check()) {
+                    $language = app('steam')->getLanguage();
+                    app()->setLocale($language);
+                }
 
-    /**
-     * Method to help build URI's.
-     *
-     * @return string
-     *
-     */
-    protected function buildParams(): string
-    {
-        $return = '?';
-        $params = [];
-        foreach ($this->parameters as $key => $value) {
-            if ('page' === $key) {
-                continue;
+                return $next($request);
             }
-            if ($value instanceof Carbon) {
-                $params[$key] = $value->format('Y-m-d');
-                continue;
-            }
-            $params[$key] = $value;
-        }
-        $return .= http_build_query($params);
+        );
 
-        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;
     }
 
     /**
@@ -104,7 +75,7 @@ class Controller extends BaseController
     private function getParameters(): ParameterBag
     {
         $bag  = new ParameterBag;
-        $page = (int) request()->get('page');
+        $page = (int)request()->get('page');
         if (0 === $page) {
             $page = 1;
         }
@@ -131,11 +102,47 @@ class Controller extends BaseController
         foreach ($integers as $integer) {
             $value = request()->query->get($integer);
             if (null !== $value) {
-                $bag->set($integer, (int) $value);
+                $bag->set($integer, (int)$value);
             }
         }
 
         return $bag;
 
     }
+
+    /**
+     * Method to help build URI's.
+     *
+     * @return string
+     */
+    final protected function buildParams(): string
+    {
+        $return = '?';
+        $params = [];
+        foreach ($this->parameters as $key => $value) {
+            if ('page' === $key) {
+                continue;
+            }
+            if ($value instanceof Carbon) {
+                $params[$key] = $value->format('Y-m-d');
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        return $return . http_build_query($params);
+    }
+
+    /**
+     * @return Manager
+     */
+    final protected function getManager(): Manager
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        return $manager;
+    }
 }

app/Api/V1/Controllers/CurrencyController.php

@@ -21,7 +21,6 @@
 
 declare(strict_types=1);
 
-
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\CurrencyRequest;
@@ -38,7 +37,6 @@ 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;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
@@ -64,15 +62,14 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class CurrencyController.
- *
  */
 class CurrencyController extends Controller
 {
     use AccountFilter, TransactionFilter;
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $repository;
-    /** @var UserRepositoryInterface The user repository */
-    private $userRepository;
+
+    private CurrencyRepositoryInterface $repository;
+    private UserRepositoryInterface     $userRepository;
+
 
     /**
      * CurrencyRepository constructor.
@@ -147,7 +144,7 @@ class CurrencyController extends Controller
         $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');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -160,22 +157,14 @@ class CurrencyController extends Controller
      */
     public function availableBudgets(TransactionCurrency $currency): JsonResponse
     {
-        /** @var User $admin */
-        $admin = auth()->user();
-
         $manager = $this->getManager();
         // types to get, page size:
         $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of available budgets. Count it and split it.
-
-        /** @var BudgetRepositoryInterface $repository */
-        $repository = app(BudgetRepositoryInterface::class);
-
         /** @var AvailableBudgetRepositoryInterface $abRepository */
         $abRepository = app(AvailableBudgetRepositoryInterface::class);
 
-        $repository->setUser($admin);
         $collection       = $abRepository->getAvailableBudgetsByCurrency($currency);
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -192,7 +181,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -207,10 +196,10 @@ class CurrencyController extends Controller
     {
         $manager = $this->getManager();
 
-        /** @var BillRepositoryInterface $repository */
-        $repository = app(BillRepositoryInterface::class);
+        /** @var BillRepositoryInterface $billRepos */
+        $billRepos  = app(BillRepositoryInterface::class);
         $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $unfiltered = $repository->getBills();
+        $unfiltered = $billRepos->getBills();
 
         // filter and paginate list:
         $collection = $unfiltered->filter(
@@ -232,7 +221,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($bills, $transformer, 'bills');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -263,7 +252,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -294,7 +283,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($exchangeRates, $transformer, 'currency_exchange_rates');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -302,9 +291,9 @@ class CurrencyController extends Controller
      *
      * @param TransactionCurrency $currency
      *
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function delete(TransactionCurrency $currency): JsonResponse
     {
@@ -353,7 +342,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -379,7 +368,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -411,7 +400,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($currencies, $transformer, 'currencies');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -439,7 +428,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -458,9 +447,9 @@ class CurrencyController extends Controller
         $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
-        /** @var RecurringRepositoryInterface $repository */
-        $repository = app(RecurringRepositoryInterface::class);
-        $unfiltered = $repository->getAll();
+        /** @var RecurringRepositoryInterface $recurringRepos */
+        $recurringRepos = app(RecurringRepositoryInterface::class);
+        $unfiltered     = $recurringRepos->getAll();
 
         // filter selection
         $collection = $unfiltered->filter(
@@ -491,7 +480,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -509,9 +498,9 @@ class CurrencyController extends Controller
         $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
-        /** @var RuleRepositoryInterface $repository */
-        $repository = app(RuleRepositoryInterface::class);
-        $unfiltered = $repository->getAll();
+        /** @var RuleRepositoryInterface $ruleRepos */
+        $ruleRepos  = app(RuleRepositoryInterface::class);
+        $unfiltered = $ruleRepos->getAll();
 
         $collection = $unfiltered->filter(
             static function (Rule $rule) use ($currency) {
@@ -540,7 +529,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -564,7 +553,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -577,6 +566,7 @@ class CurrencyController extends Controller
     {
         $manager  = $this->getManager();
         $currency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $currency);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -584,7 +574,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -592,8 +582,8 @@ class CurrencyController extends Controller
      *
      * @param CurrencyRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(CurrencyRequest $request): JsonResponse
     {
@@ -612,7 +602,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -668,7 +658,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -700,7 +690,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -43,9 +43,9 @@ class CurrencyExchangeRateController extends Controller
     /** @var CurrencyRepositoryInterface The currency repository */
     private $repository;
 
+
     /**
      * CurrencyExchangeRateController constructor.
-     *
      */
     public function __construct()
     {
@@ -69,8 +69,8 @@ class CurrencyExchangeRateController extends Controller
      *
      * @param Request $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function index(Request $request): JsonResponse
     {
@@ -107,6 +107,6 @@ class CurrencyExchangeRateController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($rate, $transformer, 'currency_exchange_rates');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/Data/DestroyController.php

@@ -0,0 +1,278 @@
+<?php
+/**
+ * DestroyController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Controllers\Data;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\DataDestroyRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+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\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
+use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    /**
+     * @return JsonResponse
+     */
+    public function destroy(DataDestroyRequest $request): JsonResponse
+    {
+        $objects = $request->getObjects();
+
+        switch ($objects) {
+            default:
+                throw new FireflyException(sprintf('This endpoint can\'t handle object "%s"', $objects));
+            case 'budgets':
+                $this->destroyBudgets();
+                break;
+            case 'bills':
+                $this->destroyBills();
+                break;
+            case 'piggy_banks':
+                $this->destroyPiggyBanks();
+                break;
+            case 'rules':
+                $this->destroyRules();
+                break;
+            case 'recurring':
+                $this->destroyRecurringTransactions();
+                break;
+            case 'categories':
+                $this->destroyCategories();
+                break;
+            case 'tags':
+                $this->destroyTags();
+                break;
+            case 'object_groups':
+                $this->destroyObjectGroups();
+                break;
+            case 'accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::ASSET, AccountType::DEFAULT,
+                        AccountType::BENEFICIARY, AccountType::EXPENSE,
+                        AccountType::REVENUE, AccountType::INITIAL_BALANCE,
+                        AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
+                    ]
+                );
+                break;
+            case 'asset_accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::ASSET, AccountType::DEFAULT,
+                    ]
+                );
+                break;
+            case 'expense_accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::BENEFICIARY, AccountType::EXPENSE,
+                    ]
+                );
+                break;
+            case 'revenue_accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::REVENUE,
+                    ]
+                );
+                break;
+            case 'liabilities':
+                $this->destroyAccounts(
+                    [
+                        AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
+                    ]
+                );
+                break;
+            case 'transactions':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::WITHDRAWAL,
+                        TransactionType::DEPOSIT,
+                        TransactionType::TRANSFER,
+                        TransactionType::RECONCILIATION,
+                        TransactionType::OPENING_BALANCE,
+                    ]
+                );
+                break;
+            case 'withdrawals':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::WITHDRAWAL,
+                    ]
+                );
+                break;
+            case 'deposits':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::DEPOSIT,
+                    ]
+                );
+                break;
+            case 'transfers':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::TRANSFER,
+                    ]
+                );
+                break;
+        }
+
+        return response()->json([], 204);
+    }
+
+    /**
+     *
+     */
+    private function destroyBudgets(): void
+    {
+        /** @var AvailableBudgetRepositoryInterface $abRepository */
+        $abRepository = app(AvailableBudgetRepositoryInterface::class);
+        $abRepository->destroyAll();
+
+        /** @var BudgetLimitRepositoryInterface $blRepository */
+        $blRepository = app(BudgetLimitRepositoryInterface::class);
+        $blRepository->destroyAll();
+
+        /** @var BudgetRepositoryInterface $budgetRepository */
+        $budgetRepository = app(BudgetRepositoryInterface::class);
+        $budgetRepository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyBills(): void
+    {
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyPiggyBanks(): void
+    {
+        /** @var PiggyBankRepositoryInterface $repository */
+        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyRules(): void
+    {
+        /** @var RuleGroupRepositoryInterface $repository */
+        $repository = app(RuleGroupRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyRecurringTransactions(): void
+    {
+        /** @var RecurringRepositoryInterface $repository */
+        $repository = app(RecurringRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyCategories(): void
+    {
+        /** @var CategoryRepositoryInterface $categoryRepos */
+        $categoryRepos = app(CategoryRepositoryInterface::class);
+        $categoryRepos->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyTags(): void
+    {
+        /** @var TagRepositoryInterface $tagRepository */
+        $tagRepository = app(TagRepositoryInterface::class);
+        $tagRepository->destroyAll();
+    }
+
+    private function destroyObjectGroups(): void
+    {
+        /** @var ObjectGroupRepositoryInterface $repository */
+        $repository = app(ObjectGroupRepositoryInterface::class);
+        $repository->deleteAll();
+    }
+
+    /**
+     * @param array $types
+     */
+    private function destroyAccounts(array $types): void
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $collection = $repository->getAccountsByType($types);
+        $service    = app(AccountDestroyService::class);
+        /** @var Account $account */
+        foreach ($collection as $account) {
+            $service->destroy($account, null);
+        }
+    }
+
+    /**
+     * @param array $types
+     */
+    private function destroyTransactions(array $types): void
+    {
+        /** @var JournalRepositoryInterface $repository */
+        $repository = app(JournalRepositoryInterface::class);
+        $journals   = $repository->findByType($types);
+        $service    = app(JournalDestroyService::class);
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $service->destroy($journal);
+        }
+    }
+
+}

app/Api/V1/Controllers/ImportController.php

@@ -1,181 +0,0 @@
-<?php
-/**
- * ImportController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * 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\Controllers;
-
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
-use FireflyIII\Transformers\ImportJobTransformer;
-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\Pagination\IlluminatePaginatorAdapter;
-use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
-
-/**
- * Class ImportController
- *
- * @deprecated
- * @codeCoverageIgnore
- */
-class ImportController extends Controller
-{
-    use TransactionFilter;
-    /** @var ImportJobRepositoryInterface Import job repository. */
-    private $repository;
-
-    /**
-     * ImportController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(ImportJobRepositoryInterface::class);
-                $this->repository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function listAll(): JsonResponse
-    {
-        // create some objects:
-        $manager  = $this->getManager();
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // get list of accounts. Count it and split it.
-        $collection = $this->repository->get();
-        $count      = $collection->count();
-        $importJobs = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator = new LengthAwarePaginator($importJobs, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.import.list') . $this->buildParams());
-
-        /** @var ImportJobTransformer $transformer */
-        $transformer = app(ImportJobTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($importJobs, $transformer, 'import_jobs');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * @param ImportJob $importJob
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function show(ImportJob $importJob): JsonResponse
-    {
-        $manager = $this->getManager();
-        /** @var ImportJobTransformer $transformer */
-        $transformer = app(ImportJobTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($importJob, $transformer, 'import_jobs');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Show all transactions
-     *
-     * @param Request   $request
-     * @param ImportJob $importJob
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function transactions(Request $request, ImportJob $importJob): JsonResponse
-    {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $type     = $request->get('type') ?? 'default';
-        $this->parameters->set('type', $type);
-
-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
-
-        $tag          = $importJob->tag;
-        $transactions = new Collection();
-        $paginator    = new LengthAwarePaginator($transactions, 0, $pageSize);
-        $paginator->setPath(route('api.v1.import.transactions', [$importJob->key]) . $this->buildParams());
-
-        if (null !== $tag) {
-            /** @var User $admin */
-            $admin = auth()->user();
-
-            // use new group collector:
-            /** @var GroupCollectorInterface $collector */
-            $collector = app(GroupCollectorInterface::class);
-            $collector
-                ->setUser($admin)
-                // filter on tag.
-                ->setTag($tag)
-                // all info needed for the API:
-                ->withAPIInformation()
-                // set page size:
-                ->setLimit($pageSize)
-                // set page to retrieve
-                ->setPage($this->parameters->get('page'))
-                // set types of transactions to return.
-                ->setTypes($types);
-
-            if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-                $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
-            }
-            $paginator = $collector->getPaginatedGroups();
-            $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
-            $transactions = $paginator->getCollection();
-        }
-
-        /** @var TransactionGroupTransformer $transformer */
-        $transformer = app(TransactionGroupTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($transactions, $transformer, 'transactions');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-}

app/Api/V1/Controllers/LinkTypeController.php

@@ -42,17 +42,18 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class LinkTypeController.
- *
  */
 class LinkTypeController extends Controller
 {
     use TransactionFilter;
+
     /** @var LinkTypeRepositoryInterface The link type repository */
     private $repository;
 
     /** @var UserRepositoryInterface The user repository */
     private $userRepository;
 
+
     /**
      * LinkTypeController constructor.
      *
@@ -79,9 +80,9 @@ class LinkTypeController extends Controller
      *
      * @param LinkType $linkType
      *
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function delete(LinkType $linkType): JsonResponse
     {
@@ -121,7 +122,7 @@ class LinkTypeController extends Controller
         $resource = new FractalCollection($linkTypes, $transformer, 'link_types');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -142,7 +143,7 @@ class LinkTypeController extends Controller
 
         $resource = new Item($linkType, $transformer, 'link_types');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -151,8 +152,8 @@ class LinkTypeController extends Controller
      *
      * @param LinkTypeRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(LinkTypeRequest $request): JsonResponse
     {
@@ -172,7 +173,7 @@ class LinkTypeController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($linkType, $transformer, 'link_types');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -231,7 +232,7 @@ class LinkTypeController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -241,8 +242,8 @@ class LinkTypeController extends Controller
      * @param LinkTypeRequest $request
      * @param LinkType        $linkType
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function update(LinkTypeRequest $request, LinkType $linkType): JsonResponse
     {
@@ -266,7 +267,7 @@ class LinkTypeController extends Controller
 
         $resource = new Item($linkType, $transformer, 'link_types');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/ObjectGroupController.php

@@ -0,0 +1,195 @@
+<?php
+/**
+ * GroupController.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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\Controllers;
+
+use FireflyIII\Api\V1\Requests\ObjectGroupUpdateRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\Transformers\ObjectGroupTransformer;
+use FireflyIII\Transformers\PiggyBankTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class GroupController.
+ */
+class ObjectGroupController extends Controller
+{
+    private ObjectGroupRepositoryInterface $repository;
+
+
+    /**
+     * ObjectGroupController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ObjectGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function delete(ObjectGroup $objectGroup): JsonResponse
+    {
+        $this->repository->destroy($objectGroup);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        // types to get, page size:
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of accounts. Count it and split it.
+        $collection   = $this->repository->get();
+        $count        = $collection->count();
+        $objectGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.object-groups.index') . $this->buildParams());
+
+        /** @var ObjectGroupTransformer $transformer */
+        $transformer = app(ObjectGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($objectGroups, $transformer, 'object_groups');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+
+    /**
+     * List all piggies under the object group.
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
+    {
+        // create some objects:
+        $manager = $this->getManager();
+
+        // types to get, page size:
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of piggy banks. Count it and split it.
+        $collection = $this->repository->getPiggyBanks($objectGroup);
+        $count      = $collection->count();
+        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]) . $this->buildParams());
+
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+
+    }
+
+    /**
+     * Show single instance.
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @return JsonResponse
+     */
+    public function show(ObjectGroup $objectGroup): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        /** @var ObjectGroupTransformer $transformer */
+        $transformer = app(ObjectGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($objectGroup, $transformer, 'object_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Update object.
+     *
+     * @param ObjectGroupUpdateRequest $request
+     * @param Account                  $account
+     *
+     * @return JsonResponse
+     */
+    public function update(ObjectGroupUpdateRequest $request, ObjectGroup $objectGroup): JsonResponse
+    {
+        $data = $request->getUpdateData();
+        $this->repository->update($objectGroup, $data);
+        $this->repository->sort();
+        $manager = $this->getManager();
+
+        /** @var ObjectGroupTransformer $transformer */
+        $transformer = app(ObjectGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($objectGroup, $transformer, 'object_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V1/Controllers/PiggyBankController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\PiggyBankRequest;
+use FireflyIII\Api\V1\Requests\PiggyBankStoreRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
@@ -39,13 +40,10 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class PiggyBankController.
- *
  */
 class PiggyBankController extends Controller
 {
-
-    /** @var PiggyBankRepositoryInterface The piggy bank repository */
-    private $repository;
+    private PiggyBankRepositoryInterface $repository;
 
     /**
      * PiggyBankController constructor.
@@ -111,7 +109,7 @@ class PiggyBankController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -142,7 +140,7 @@ class PiggyBankController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -175,7 +173,7 @@ class PiggyBankController extends Controller
         $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -197,19 +195,19 @@ class PiggyBankController extends Controller
 
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
     /**
      * Store new object.
      *
-     * @param PiggyBankRequest $request
+     * @param PiggyBankStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function store(PiggyBankRequest $request): JsonResponse
+    public function store(PiggyBankStoreRequest $request): JsonResponse
     {
         $piggyBank = $this->repository->store($request->getAll());
         $manager   = $this->getManager();
@@ -220,7 +218,7 @@ class PiggyBankController extends Controller
 
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -240,7 +238,6 @@ class PiggyBankController extends Controller
             $this->repository->setCurrentAmount($piggyBank, $data['current_amount']);
         }
 
-
         $manager = $this->getManager();
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
@@ -248,7 +245,7 @@ class PiggyBankController extends Controller
 
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/PreferenceController.php

@@ -35,7 +35,6 @@ use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 
 /**
- *
  * Class PreferenceController
  */
 class PreferenceController extends Controller
@@ -102,7 +101,7 @@ class PreferenceController extends Controller
 
         $resource = new FractalCollection($preferences, $transformer, 'preferences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -123,7 +122,7 @@ class PreferenceController extends Controller
 
         $resource = new Item($preference, $transformer, 'preferences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -162,7 +161,7 @@ class PreferenceController extends Controller
 
         $resource = new Item($result, $transformer, 'preferences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/RecurrenceController.php

@@ -48,9 +48,11 @@ use Log;
 class RecurrenceController extends Controller
 {
     use TransactionFilter;
+
     /** @var RecurringRepositoryInterface The recurring transaction repository */
     private $repository;
 
+
     /**
      * RecurrenceController constructor.
      *
@@ -117,7 +119,7 @@ class RecurrenceController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -139,7 +141,7 @@ class RecurrenceController extends Controller
 
         $resource = new Item($recurrence, $transformer, 'recurrences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
 
     }
@@ -149,8 +151,8 @@ class RecurrenceController extends Controller
      *
      * @param RecurrenceStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(RecurrenceStoreRequest $request): JsonResponse
     {
@@ -164,7 +166,7 @@ class RecurrenceController extends Controller
 
         $resource = new Item($recurrence, $transformer, 'recurrences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -220,13 +222,13 @@ class RecurrenceController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function trigger(): JsonResponse
     {
@@ -236,7 +238,7 @@ class RecurrenceController extends Controller
             $result = $recurring->fire();
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
-            throw new FireflyException('200022: Error in cron job.');
+            throw new FireflyException('200022: Error in cron job.', 0, $e);
         }
         if (false === $result) {
             return response()->json([], 204);
@@ -268,7 +270,7 @@ class RecurrenceController extends Controller
 
         $resource = new Item($category, $transformer, 'recurrences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/RuleController.php

@@ -28,33 +28,32 @@ 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;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
-use FireflyIII\TransactionRules\Engine\RuleEngine;
-use FireflyIII\TransactionRules\TransactionMatcher;
+use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use Log;
 
 /**
  * Class RuleController
- *
  */
 class RuleController extends Controller
 {
     /** @var AccountRepositoryInterface Account repository */
     private $accountRepository;
+
     /** @var RuleRepositoryInterface The rule repository */
     private $ruleRepository;
 
+
     /**
      * RuleController constructor.
      *
@@ -123,7 +122,7 @@ class RuleController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -144,7 +143,7 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -165,7 +164,7 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -186,7 +185,7 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -207,36 +206,44 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * @param RuleTestRequest $request
      * @param Rule            $rule
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function testRule(RuleTestRequest $request, Rule $rule): JsonResponse
     {
-        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $parameters = $request->getTestParameters();
-        /** @var Rule $rule */
-        Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
-        /** @var TransactionMatcher $matcher */
-        $matcher = app(TransactionMatcher::class);
-        // set all parameters:
-        $matcher->setRule($rule);
-        $matcher->setStartDate($parameters['start_date']);
-        $matcher->setEndDate($parameters['end_date']);
-        $matcher->setSearchLimit($parameters['search_limit']);
-        $matcher->setTriggeredLimit($parameters['trigger_limit']);
-        $matcher->setAccounts($parameters['accounts']);
 
-        $matchingTransactions = $matcher->findTransactionsByRule();
-        $count                = count($matchingTransactions);
-        $transactions         = array_slice($matchingTransactions, ($parameters['page'] - 1) * $pageSize, $pageSize);
-        $paginator            = new LengthAwarePaginator($transactions, $count, $pageSize, $this->parameters->get('page'));
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules(new Collection([$rule]));
+
+
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+        }
+
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+        }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
+
+        // file the rule(s)
+        $transactions = $ruleEngine->find();
+        $count        = $transactions->count();
+
+        $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
 
         // resulting list is presented as JSON thing.
@@ -245,10 +252,10 @@ class RuleController extends Controller
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -264,28 +271,27 @@ class RuleController extends Controller
         // Get parameters specified by the user
         $parameters = $request->getTriggerParameters();
 
-        /** @var RuleEngine $ruleEngine */
-        $ruleEngine = app(RuleEngine::class);
-        $ruleEngine->setUser(auth()->user());
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules(new Collection([$rule]));
 
-        $rules = [$rule->id];
-
-        $ruleEngine->setRulesToApply($rules);
-        $ruleEngine->setTriggerMode(RuleEngine::TRIGGER_STORE);
-
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts($parameters['accounts']);
-        $collector->setRange($parameters['start_date'], $parameters['end_date']);
-        $journals = $collector->getExtractedJournals();
-
-        /** @var array $journal */
-        foreach ($journals as $journal) {
-            Log::debug('Start of new journal.');
-            $ruleEngine->processJournalArray($journal);
-            Log::debug('Done with all rules for this group + done with journal.');
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+        }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
+
+        // file the rule(s)
+        $ruleEngine->fire();
+
         return response()->json([], 204);
     }
 
@@ -309,6 +315,6 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/RuleGroupController.php

@@ -28,13 +28,10 @@ use FireflyIII\Api\V1\Requests\RuleGroupRequest;
 use FireflyIII\Api\V1\Requests\RuleGroupTestRequest;
 use FireflyIII\Api\V1\Requests\RuleGroupTriggerRequest;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
-use FireflyIII\TransactionRules\Engine\RuleEngine;
-use FireflyIII\TransactionRules\TransactionMatcher;
+use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use FireflyIII\Transformers\RuleGroupTransformer;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -45,7 +42,6 @@ use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use Log;
 
 /**
  * Class RuleGroupController
@@ -54,9 +50,11 @@ class RuleGroupController extends Controller
 {
     /** @var AccountRepositoryInterface Account repository */
     private $accountRepository;
+
     /** @var RuleGroupRepositoryInterface The rule group repository */
     private $ruleGroupRepository;
 
+
     /**
      * RuleGroupController constructor.
      *
@@ -124,7 +122,7 @@ class RuleGroupController extends Controller
         $resource = new FractalCollection($ruleGroups, $transformer, 'rule_groups');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -144,7 +142,7 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -164,7 +162,7 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -195,7 +193,7 @@ class RuleGroupController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -216,7 +214,7 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -238,7 +236,7 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -246,57 +244,54 @@ class RuleGroupController extends Controller
      * @param RuleGroupTestRequest $request
      * @param RuleGroup            $group
      *
+     * @return JsonResponse
      * @throws FireflyException
      *
-     * @return JsonResponse
      */
     public function testGroup(RuleGroupTestRequest $request, RuleGroup $group): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        Log::debug('Now in testGroup()');
         /** @var Collection $rules */
         $rules = $this->ruleGroupRepository->getActiveRules($group);
         if (0 === $rules->count()) {
             throw new FireflyException('200023: No rules in this rule group.');
         }
-        $parameters           = $request->getTestParameters();
-        $matchingTransactions = [];
+        $parameters = $request->getTestParameters();
 
-        Log::debug(sprintf('Going to test %d rules', $rules->count()));
-        /** @var Rule $rule */
-        foreach ($rules as $rule) {
-            Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
-            /** @var TransactionMatcher $matcher */
-            $matcher = app(TransactionMatcher::class);
-            // set all parameters:
-            $matcher->setRule($rule);
-            $matcher->setStartDate($parameters['start_date']);
-            $matcher->setEndDate($parameters['end_date']);
-            $matcher->setSearchLimit($parameters['search_limit']);
-            $matcher->setTriggeredLimit($parameters['trigger_limit']);
-            $matcher->setAccounts($parameters['accounts']);
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules($rules);
 
-            $result = $matcher->findTransactionsByRule();
-            /** @noinspection AdditionOperationOnArraysInspection */
-            $matchingTransactions = $result + $matchingTransactions;
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
-        // make paginator out of results.
-        $count        = count($matchingTransactions);
-        $transactions = array_slice($matchingTransactions, ($parameters['page'] - 1) * $pageSize, $pageSize);
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+        }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
 
-        // make paginator:
-        $paginator = new LengthAwarePaginator($transactions, $count, $pageSize, $parameters['page']);
+        // file the rule(s)
+        $transactions = $ruleEngine->find();
+        $count        = $transactions->count();
+
+        $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rule_groups.test', [$group->id]) . $this->buildParams());
 
-        $manager     = $this->getManager();
+        // resulting list is presented as JSON thing.
+        $manager = $this->getManager();
+        /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -305,40 +300,40 @@ class RuleGroupController extends Controller
      * @param RuleGroupTriggerRequest $request
      * @param RuleGroup               $group
      *
-     * @throws Exception
      * @return JsonResponse
+     * @throws Exception
      */
     public function triggerGroup(RuleGroupTriggerRequest $request, RuleGroup $group): JsonResponse
     {
+        /** @var Collection $rules */
+        $rules = $this->ruleGroupRepository->getActiveRules($group);
+        if (0 === $rules->count()) {
+            throw new FireflyException('200023: No rules in this rule group.');
+        }
+
+        // Get parameters specified by the user
         $parameters = $request->getTriggerParameters();
 
-        /** @var Collection $collection */
-        $collection = $this->ruleGroupRepository->getActiveRules($group);
-        $rules      = [];
-        /** @var Rule $item */
-        foreach ($collection as $item) {
-            $rules[] = $item->id;
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules($rules);
+
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
-        // start looping.
-        /** @var RuleEngine $ruleEngine */
-        $ruleEngine = app(RuleEngine::class);
-        $ruleEngine->setUser(auth()->user());
-        $ruleEngine->setRulesToApply($rules);
-        $ruleEngine->setTriggerMode(RuleEngine::TRIGGER_STORE);
-
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts($parameters['accounts']);
-        $collector->setRange($parameters['start_date'], $parameters['end_date']);
-        $journals = $collector->getExtractedJournals();
-
-        /** @var array $journal */
-        foreach ($journals as $journal) {
-            Log::debug('Start of new journal.');
-            $ruleEngine->processJournalArray($journal);
-            Log::debug('Done with all rules for this group + done with journal.');
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
         }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
+
+        // file the rule(s)
+        $ruleEngine->fire();
 
         return response()->json([], 204);
     }
@@ -362,6 +357,6 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

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

@@ -1,8 +1,8 @@
 <?php
-declare(strict_types=1);
+
 /**
  * AccountController.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Controllers\Search;
 
 use FireflyIII\Api\V1\Controllers\Controller;
@@ -41,8 +43,8 @@ class AccountController extends Controller
 {
     use AccountFilter;
 
-    /** @var array */
-    private $validFields;
+    private array $validFields;
+
 
     public function __construct()
     {
@@ -95,6 +97,6 @@ class AccountController extends Controller
         $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');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

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

@@ -1,8 +1,8 @@
 <?php
-declare(strict_types=1);
+
 /**
  * TransactionController.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,45 +20,51 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Controllers\Search;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Support\Search\SearchInterface;
+use FireflyIII\Transformers\TransactionGroupTransformer;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection;
 
 /**
  * Class TransactionController
  */
 class TransactionController extends Controller
 {
-    /** @var string */
-    public const SEARCH_ALL = 'all';
-    /** @var string */
-    public const SEARCH_DESCRIPTION = 'description';
-    /** @var string */
-    public const SEARCH_NOTES = 'notes';
-    /** @var string */
-    public 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
+     * @param Request         $request
+     * @param SearchInterface $searcher
      *
-     * @return void
+     * @return JsonResponse
      */
-    public function search(Request $request): void
+    public function search(Request $request, SearchInterface $searcher): JsonResponse
     {
-        die('the route is present but nobody\'s home.');
+        $manager   = $this->getManager();
+        $fullQuery = (string) $request->get('query');
+        $page      = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
+
+        $searcher->parseQuery($fullQuery);
+        $searcher->setPage($page);
+        $searcher->setLimit((int) config('firefly.search_result_limit'));
+        $groups     = $searcher->searchTransactions();
+        $parameters = ['search' => $fullQuery];
+        $url        = route('api.v1.search.transactions') . '?' . http_build_query($parameters);
+        $groups->setPath($url);
+        $transactions = $groups->getCollection();
+
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Collection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($groups));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

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

@@ -1,113 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * TransferController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * 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\Api\V1\Requests\Search\TransferRequest;
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Support\Search\TransferSearch;
-use FireflyIII\Transformers\TransactionGroupTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use League\Fractal\Resource\Collection as FractalCollection;
-
-/**
- * Class TransferController
- */
-class TransferController extends Controller
-{
-    /**
-     * @param TransferRequest $request
-     *
-     * @return JsonResponse|Response
-     */
-    public function search(TransferRequest $request)
-    {
-        // configure transfer search to search for a > b
-        $search = app(TransferSearch::class);
-        $search->setSource($request->get('source'));
-        $search->setDestination($request->get('destination'));
-        $search->setAmount($request->get('amount'));
-        $search->setDescription($request->get('description'));
-        $search->setDate($request->get('date'));
-
-        $left = $search->search();
-
-        // configure transfer search to search for b > a
-        $search->setSource($request->get('destination'));
-        $search->setDestination($request->get('source'));
-        $search->setAmount($request->get('amount'));
-        $search->setDescription($request->get('description'));
-        $search->setDate($request->get('date'));
-
-        $right = $search->search();
-
-        // add parameters to URL:
-        $this->parameters->set('source', $request->get('source'));
-        $this->parameters->set('destination', $request->get('destination'));
-        $this->parameters->set('amount', $request->get('amount'));
-        $this->parameters->set('description', $request->get('description'));
-        $this->parameters->set('date', $request->get('date'));
-
-        // get all journal ID's.
-        $total = $left->merge($right)->unique('id')->pluck('id')->toArray();
-        if (0 === count($total)) {
-            // forces search to be empty.
-            $total = [-1];
-        }
-
-        // collector to return results.
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $manager  = $this->getManager();
-        /** @var User $admin */
-        $admin = auth()->user();
-
-        // use new group collector:
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector
-            ->setUser($admin)
-            // all info needed for the API:
-            ->withAPIInformation()
-            // set page size:
-            ->setLimit($pageSize)
-            // set page to retrieve
-            ->setPage(1)
-            ->setJournalIds($total);
-
-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.search.transfers') . $this->buildParams());
-        $transactions = $paginator->getCollection();
-
-        /** @var TransactionGroupTransformer $transformer */
-        $transformer = app(TransactionGroupTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($transactions, $transformer, 'transactions');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-}

app/Api/V1/Controllers/SummaryController.php

@@ -49,18 +49,23 @@ class SummaryController extends Controller
 {
     /** @var AvailableBudgetRepositoryInterface */
     private $abRepository;
+
     /** @var AccountRepositoryInterface */
     private $accountRepository;
+
     /** @var BillRepositoryInterface */
     private $billRepository;
+
     /** @var BudgetRepositoryInterface */
     private $budgetRepository;
+
     /** @var CurrencyRepositoryInterface */
     private $currencyRepos;
 
     /** @var OperationsRepositoryInterface */
     private $opsRepository;
 
+
     /**
      * SummaryController constructor.
      *
@@ -96,8 +101,8 @@ class SummaryController extends Controller
     /**
      * @param DateRequest $request
      *
-     * @throws Exception
      * @return JsonResponse
+     * @throws Exception
      */
     public function basic(DateRequest $request): JsonResponse
     {
@@ -125,30 +130,6 @@ class SummaryController extends Controller
         return response()->json($return);
     }
 
-    /**
-     * Check if date is outside session range.
-     *
-     * @param Carbon $date
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @return bool
-     */
-    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
-    {
-        $result = false;
-        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
-        }
-        // start and end in the past? use $end
-        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
-        }
-
-        return $result;
-    }
-
     /**
      * @param Carbon $start
      * @param Carbon $end
@@ -317,13 +298,13 @@ class SummaryController extends Controller
      * @param Carbon $start
      * @param Carbon $end
      *
-     * @throws Exception
      * @return array
+     * @throws Exception
      */
     private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
     {
         $return    = [];
-        $today     = new Carbon;
+        $today     = today(config('app.timezone'));
         $available = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
         $budgets   = $this->budgetRepository->getActiveBudgets();
         $spent     = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
@@ -424,4 +405,28 @@ class SummaryController extends Controller
 
         return $return;
     }
+
+    /**
+     * Check if date is outside session range.
+     *
+     * @param Carbon $date
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return bool
+     */
+    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
+    {
+        $result = false;
+        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
+            $result = true;
+        }
+        // start and end in the past? use $end
+        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
+            $result = true;
+        }
+
+        return $result;
+    }
 }

app/Api/V1/Controllers/TagController.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use Carbon\Carbon;
-use FireflyIII\Api\V1\Requests\DateRequest;
 use FireflyIII\Api\V1\Requests\TagStoreRequest;
 use FireflyIII\Api\V1\Requests\TagUpdateRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -38,7 +36,6 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
@@ -53,6 +50,7 @@ class TagController extends Controller
     /** @var TagRepositoryInterface The tag repository */
     private $repository;
 
+
     /**
      * TagController constructor.
      *
@@ -74,25 +72,6 @@ class TagController extends Controller
         );
     }
 
-    /**
-     * @param DateRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function cloud(DateRequest $request): JsonResponse
-    {
-        // parameters for boxes:
-        $dates = $request->getAll();
-        $start = $dates['start'];
-        $end   = $dates['end'];
-
-        // get all tags:
-        $tags  = $this->repository->get();
-        $cloud = $this->getTagCloud($tags, $start, $end);
-
-        return response()->json($cloud);
-    }
-
     /**
      * Delete the resource.
      *
@@ -136,7 +115,7 @@ class TagController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'tags');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -166,7 +145,7 @@ class TagController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -186,7 +165,7 @@ class TagController extends Controller
 
         $resource = new Item($tag, $transformer, 'tags');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -207,7 +186,7 @@ class TagController extends Controller
 
         $resource = new Item($rule, $transformer, 'tags');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -260,7 +239,7 @@ class TagController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -281,59 +260,7 @@ class TagController extends Controller
 
         $resource = new Item($rule, $transformer, 'tags');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-
-    /**
-     * @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
-    {
-        $min   = null;
-        $max   = 0;
-        $cloud = [
-            'tags' => [],
-        ];
-        /** @var Tag $tag */
-        foreach ($tags as $tag) {
-            $earned = (float) $this->repository->earnedInPeriod($tag, $start, $end);
-            $spent  = (float) $this->repository->spentInPeriod($tag, $start, $end);
-            $size   = ($spent * -1) + $earned;
-            $min    = $min ?? $size;
-            if ($size > 0) {
-                $max             = $size > $max ? $size : $max;
-                $cloud['tags'][] = [
-                    'tag'  => $tag->tag,
-                    'id'   => $tag->id,
-                    'size' => $size,
-                ];
-            }
-        }
-        $cloud = $this->analyseTagCloud($cloud, $min, $max);
-
-        return $cloud;
-    }
 }

app/Api/V1/Controllers/TransactionController.php

@@ -40,6 +40,7 @@ use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankEventTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
+use FireflyIII\Transformers\TransactionLinkTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -57,12 +58,10 @@ class TransactionController extends Controller
 {
     use TransactionFilter;
 
-    /** @var TransactionGroupRepositoryInterface Group repository. */
-    private $groupRepository;
-    /** @var JournalAPIRepositoryInterface Journal API repos */
-    private $journalAPIRepository;
-    /** @var JournalRepositoryInterface The journal repository */
-    private $repository;
+    private TransactionGroupRepositoryInterface $groupRepository;
+    private JournalAPIRepositoryInterface       $journalAPIRepository;
+    private JournalRepositoryInterface          $repository;
+
 
     /**
      * TransactionController constructor.
@@ -109,7 +108,27 @@ class TransactionController extends Controller
 
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * @param TransactionJournal $transactionJournal
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse
+    {
+        $manager      = $this->getManager();
+        $journalLinks = $this->journalAPIRepository->getJournalLinks($transactionJournal);
+
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -190,7 +209,7 @@ class TransactionController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -213,7 +232,20 @@ class TransactionController extends Controller
 
         $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Show a single transaction, by transaction journal.
+     *
+     * @param TransactionJournal $transactionJournal
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function showByJournal(TransactionJournal $transactionJournal): JsonResponse
+    {
+        return $this->show($transactionJournal->transactionGroup);
     }
 
     /**
@@ -248,20 +280,7 @@ class TransactionController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($selectedGroup, $transformer, 'transactions');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Show a single transaction, by transaction journal.
-     *
-     * @param TransactionJournal $transactionJournal
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function showByJournal(TransactionJournal $transactionJournal): JsonResponse
-    {
-        return $this->show($transactionJournal->transactionGroup);
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -270,6 +289,7 @@ class TransactionController extends Controller
      * @param TransactionStoreRequest $request
      *
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(TransactionStoreRequest $request): JsonResponse
     {
@@ -283,7 +303,7 @@ class TransactionController extends Controller
         try {
             $transactionGroup = $this->groupRepository->store($data);
         } catch (DuplicateTransactionException $e) {
-            Log::warning('Caught a duplicate. Return error message.');
+            Log::warning('Caught a duplicate transaction. Return error message.');
             // return bad validation message.
             // TODO use Laravel's internal validation thing to do this.
             $response = [
@@ -326,14 +346,14 @@ class TransactionController extends Controller
 
         $selectedGroup = $collector->getGroups()->first();
         if (null === $selectedGroup) {
-            throw new NotFoundHttpException(); // @codeCoverageIgnore
+            throw new FireflyException('Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
         }
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
         $resource = new Item($selectedGroup, $transformer, 'transactions');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -376,6 +396,6 @@ class TransactionController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($selectedGroup, $transformer, 'transactions');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/TransactionLinkController.php

@@ -47,9 +47,11 @@ class TransactionLinkController extends Controller
 
     /** @var JournalRepositoryInterface The journal repository */
     private $journalRepository;
+
     /** @var LinkTypeRepositoryInterface The link type repository */
     private $repository;
 
+
     /**
      * TransactionLinkController constructor.
      *
@@ -124,7 +126,7 @@ class TransactionLinkController extends Controller
         $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -146,7 +148,7 @@ 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');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -155,8 +157,8 @@ class TransactionLinkController extends Controller
      *
      * @param TransactionLinkRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(TransactionLinkRequest $request): JsonResponse
     {
@@ -177,7 +179,7 @@ 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');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -186,8 +188,8 @@ class TransactionLinkController extends Controller
      * @param TransactionLinkRequest $request
      * @param TransactionJournalLink $journalLink
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function update(TransactionLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
     {
@@ -207,7 +209,7 @@ 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');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/UserController.php

@@ -39,13 +39,11 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class UserController.
- *
  */
 class UserController extends Controller
 {
+    private UserRepositoryInterface $repository;
 
-    /** @var UserRepositoryInterface The user repository */
-    private $repository;
 
     /**
      * UserController constructor.
@@ -70,9 +68,9 @@ class UserController extends Controller
      *
      * @param User $user
      *
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function delete(User $user): JsonResponse
     {
@@ -115,7 +113,7 @@ class UserController extends Controller
         $resource = new FractalCollection($users, $transformer, 'users');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -137,7 +135,7 @@ class UserController extends Controller
 
         $resource = new Item($user, $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -161,7 +159,7 @@ class UserController extends Controller
 
         $resource = new Item($user, $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -184,7 +182,7 @@ class UserController extends Controller
 
         $resource = new Item($user, $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 

app/Api/V1/Middleware/ApiDemoUser.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * ConverterInterface.php
+ * ApiDemoUser.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -20,23 +20,38 @@
  */
 declare(strict_types=1);
 
-namespace FireflyIII\Import\Converter;
+namespace FireflyIII\Api\V1\Middleware;
+
+use Closure;
+use FireflyIII\User;
+use Illuminate\Http\Request;
 
 /**
- * Interface ConverterInterface.
- *
- * @deprecated
- * @codeCoverageIgnore
+ * Class ApiDemoUser.
  */
-interface ConverterInterface
+class ApiDemoUser
 {
     /**
-     * Convert a value.
+     * Handle an incoming request.
      *
-     * @param $value
+     * @param Request $request
+     * @param Closure $next
      *
      * @return mixed
-     *
      */
-    public function convert($value);
+    public function handle(Request $request, Closure $next)
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        if (null === $user) {
+            return $next($request);
+        }
+        if ($user->hasRole('demo')) {
+            return response('', 403);
+
+        }
+
+        return $next($request);
+    }
 }

app/Api/V1/Requests/AccountStoreRequest.php

@@ -26,14 +26,18 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class AccountStoreRequest
  *
  * @codeCoverageIgnore
  */
-class AccountStoreRequest extends Request
+class AccountStoreRequest extends FormRequest
 {
+    use ConvertsDataTypes, AppendsLocationData;
 
     /**
      * Authorize logged in users.
@@ -66,6 +70,7 @@ class AccountStoreRequest extends Request
             'account_type'            => $this->string('type'),
             'account_type_id'         => null,
             'currency_id'             => $this->integer('currency_id'),
+            'order'                   => $this->integer('order'),
             'currency_code'           => $this->string('currency_code'),
             'virtual_balance'         => $this->string('virtual_balance'),
             'iban'                    => $this->string('iban'),
@@ -75,7 +80,7 @@ class AccountStoreRequest extends Request
             'opening_balance'         => $this->string('opening_balance'),
             'opening_balance_date'    => $this->date('opening_balance_date'),
             'cc_type'                 => $this->string('credit_card_type'),
-            'cc_Monthly_payment_date' => $this->string('monthly_payment_date'),
+            'cc_monthly_payment_date' => $this->string('monthly_payment_date'),
             'notes'                   => $this->nlString('notes'),
             'interest'                => $this->string('interest'),
             'interest_period'         => $this->string('interest_period'),
@@ -112,6 +117,7 @@ class AccountStoreRequest extends Request
             'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
             'opening_balance_date' => 'date|required_with:opening_balance|nullable',
             'virtual_balance'      => 'numeric|nullable',
+            'order'                => 'numeric|nullable',
             'currency_id'          => 'numeric|exists:transaction_currencies,id',
             'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
             'active'               => [new IsBoolean],
@@ -126,8 +132,6 @@ class AccountStoreRequest extends Request
             'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
             'notes'                => 'min:0|max:65536',
         ];
-        $rules          = Location::requestRules($rules);
-
-        return $rules;
+        return Location::requestRules($rules);
     }
 }

app/Api/V1/Requests/AccountUpdateRequest.php

@@ -26,14 +26,18 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class AccountUpdateRequest
  *
  * @codeCoverageIgnore
  */
-class AccountUpdateRequest extends Request
+class AccountUpdateRequest extends FormRequest
 {
+    use ConvertsDataTypes, AppendsLocationData;
 
     /**
      * Authorize logged in users.
@@ -66,6 +70,7 @@ class AccountUpdateRequest extends Request
             'account_type'            => $this->nullableString('type'),
             'account_type_id'         => null,
             'currency_id'             => $this->nullableInteger('currency_id'),
+            'order'                   => $this->integer('order'),
             'currency_code'           => $this->nullableString('currency_code'),
             'virtual_balance'         => $this->nullableString('virtual_balance'),
             'iban'                    => $this->nullableString('iban'),
@@ -75,7 +80,7 @@ class AccountUpdateRequest extends Request
             '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'),
+            'cc_monthly_payment_date' => $this->nullableString('monthly_payment_date'),
             'notes'                   => $this->nullableNlString('notes'),
             'interest'                => $this->nullableString('interest'),
             'interest_period'         => $this->nullableString('interest_period'),
@@ -114,6 +119,7 @@ class AccountUpdateRequest extends Request
             'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
             'opening_balance_date' => 'date|required_with:opening_balance|nullable',
             'virtual_balance'      => 'numeric|nullable',
+            'order'                => 'numeric|nullable',
             'currency_id'          => 'numeric|exists:transaction_currencies,id',
             'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
             'active'               => [new IsBoolean],
@@ -128,8 +134,6 @@ class AccountUpdateRequest extends Request
             'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
             'notes'                => 'min:0|max:65536',
         ];
-        $rules = Location::requestRules($rules);
-
-        return $rules;
+        return Location::requestRules($rules);
     }
 }

app/Api/V1/Requests/AttachmentStoreRequest.php

@@ -24,14 +24,18 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsValidAttachmentModel;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class AttachmentStoreRequest
  *
  * @codeCoverageIgnore
  */
-class AttachmentStoreRequest extends Request
+class AttachmentStoreRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/AttachmentUpdateRequest.php

@@ -23,13 +23,18 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
 /**
  * ClassAttachmentUpdateRequest
  *
  * @codeCoverageIgnore
  */
-class AttachmentUpdateRequest extends Request
+class AttachmentUpdateRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * AutocompleteRequest.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Autocomplete;
+
+
+use FireflyIII\Models\AccountType;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class AutocompleteRequest
+ */
+class AutocompleteRequest extends FormRequest
+{
+    use ConvertsDataTypes;
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getData(): array
+    {
+        $types = $this->string('types');
+        $array = [];
+        if ('' !== $types) {
+            $array = explode(',', $types);
+        }
+        $limit = $this->integer('limit');
+        $limit = 0 === $limit ? 10 : $limit;
+
+        // remove 'initial balance' from allowed types. its internal
+        $array = array_diff($array, [AccountType::INITIAL_BALANCE]);
+
+        return [
+            'types' => $array,
+            'query' => $this->string('query'),
+            'date'  => $this->date('date'),
+            'limit' => $limit,
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'limit' => 'min:0|max:1337',
+        ];
+    }
+}

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -23,13 +23,18 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
 /**
  * Class AvailableBudgetRequest
  *
  * @codeCoverageIgnore
  */
-class AvailableBudgetRequest extends Request
+class AvailableBudgetRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -67,7 +72,7 @@ class AvailableBudgetRequest extends Request
         return [
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
-            'amount'        => 'required|numeric|more:0',
+            'amount'        => 'required|numeric|gt:0',
             'start'         => 'required|date|before:end',
             'end'           => 'required|date|after:start',
         ];

app/Api/V1/Requests/BillStoreRequest.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * BillRequest.php
+ * BillStoreRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -25,28 +25,19 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
 /**
- * Class BillRequest
- *
- * TODO AFTER 4.8,0: split this into two request classes.
+ * Class BillStoreRequest
  *
  * @codeCoverageIgnore
  */
-class BillRequest extends Request
+class BillStoreRequest extends FormRequest
 {
-
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -70,6 +61,7 @@ class BillRequest extends Request
             'repeat_freq'   => $this->string('repeat_freq'),
             'skip'          => $this->integer('skip'),
             'active'        => $active,
+            'order'         => $this->integer('order'),
             'notes'         => $this->nlString('notes'),
         ];
     }
@@ -78,33 +70,21 @@ class BillRequest extends Request
      * The rules that the incoming request must be matched against.
      *
      * @return array
-     *
      */
     public function rules(): array
     {
-        $rules = [
-            'name'          => 'required|between:1,255|uniqueObjectForUser:bills,name',
-            'amount_min'    => 'required|numeric|more:0',
-            'amount_max'    => 'required|numeric|more:0',
+        return [
+            'name'          => 'between:1,255|uniqueObjectForUser:bills,name',
+            'amount_min'    => 'numeric|gt:0',
+            'amount_max'    => 'numeric|gt:0',
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
-            'date'          => 'required|date',
-            'repeat_freq'   => 'required|in:weekly,monthly,quarterly,half-year,yearly',
+            'date'          => 'date',
+            'repeat_freq'   => 'in:weekly,monthly,quarterly,half-year,yearly',
             'skip'          => 'between:0,31',
             'active'        => [new IsBoolean],
             'notes'         => 'between:1,65536',
         ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                $bill          = $this->route()->parameter('bill');
-                $rules['name'] .= ',' . $bill->id;
-                break;
-        }
-
-        return $rules;
     }
 
     /**

app/Api/V1/Requests/BillUpdateRequest.php

@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * BillUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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 FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
+
+/**
+ * Class BillUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class BillUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $active = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
+        return [
+            'name'          => $this->string('name'),
+            'amount_min'    => $this->string('amount_min'),
+            'amount_max'    => $this->string('amount_max'),
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
+            'date'          => $this->date('date'),
+            'repeat_freq'   => $this->string('repeat_freq'),
+            'skip'          => $this->integer('skip'),
+            'active'        => $active,
+            'order'         => $this->integer('order'),
+            'notes'         => $this->nlString('notes'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $bill          = $this->route()->parameter('bill');
+        return [
+            'name'          => sprintf('between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id),
+            'amount_min'    => 'numeric|gt:0',
+            'amount_max'    => 'numeric|gt:0',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'date'          => 'date',
+            'repeat_freq'   => 'in:weekly,monthly,quarterly,half-year,yearly',
+            'skip'          => 'between:0,31',
+            'active'        => [new IsBoolean],
+            'notes'         => 'between:1,65536',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            static function (Validator $validator) {
+                $data = $validator->getData();
+                $min  = (float) ($data['amount_min'] ?? 0);
+                $max  = (float) ($data['amount_max'] ?? 0);
+                if ($min > $max) {
+                    $validator->errors()->add('amount_min', (string) trans('validation.amount_min_over_max'));
+                }
+            }
+        );
+    }
+}

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -23,14 +23,19 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
 /**
  * Class BudgetLimitRequest
  *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */
-class BudgetLimitRequest extends Request
+class BudgetLimitRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -49,7 +54,7 @@ class BudgetLimitRequest extends Request
      */
     public function getAll(): array
     {
-        return [
+        $data = [
             'budget_id'     => $this->integer('budget_id'),
             'start'         => $this->date('start'),
             'end'           => $this->date('end'),
@@ -57,6 +62,12 @@ class BudgetLimitRequest extends Request
             'currency_id'   => $this->integer('currency_id'),
             'currency_code' => $this->string('currency_code'),
         ];
+        // if request has a budget already, drop the rule.
+        $budget = $this->route()->parameter('budget');
+        if (null !== $budget) {
+            $data['budget_id'] = $budget->id;
+        }
+        return $data;
     }
 
     /**
@@ -70,7 +81,7 @@ class BudgetLimitRequest extends Request
             'budget_id'     => 'required|exists:budgets,id|belongsToUser:budgets,id',
             'start'         => 'required|before:end|date',
             'end'           => 'required|after:start|date',
-            'amount'        => 'required|more:0',
+            'amount'        => 'required|gt:0',
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
         ];

app/Api/V1/Requests/BudgetStoreRequest.php

@@ -24,6 +24,9 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
 /**
@@ -31,8 +34,10 @@ use Illuminate\Validation\Validator;
  *
  * @codeCoverageIgnore
  */
-class BudgetStoreRequest extends Request
+class BudgetStoreRequest extends FormRequest
 {
+    use ConvertsDataTypes, ValidatesAutoBudgetRequest;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/BudgetUpdateRequest.php

@@ -24,6 +24,9 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
 /**
@@ -31,8 +34,10 @@ use Illuminate\Validation\Validator;
  *
  * @codeCoverageIgnore
  */
-class BudgetUpdateRequest extends Request
+class BudgetUpdateRequest extends FormRequest
 {
+    use ConvertsDataTypes, ValidatesAutoBudgetRequest;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/CategoryStoreRequest.php

@@ -1,7 +1,6 @@
 <?php
-declare(strict_types=1);
 /**
- * TransferRequest.php
+ * CategoryStoreRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -20,38 +19,46 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Requests\Search;
+declare(strict_types=1);
 
-use FireflyIII\Api\V1\Requests\Request;
-use FireflyIII\Rules\IsTransferAccount;
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Rules\ZeroOrMore;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
- * Class TransferRequest
+ * Class CategoryRequest
+ *
+ * @codeCoverageIgnore
  */
-class TransferRequest extends Request
+class CategoryStoreRequest extends FormRequest
 {
+    use ConvertsDataTypes, ChecksLogin;
+
     /**
-     * Authorize logged in users.
+     * Get all data from the request.
      *
-     * @return bool
+     * @return array
      */
-    public function authorize(): bool
+    public function getAll(): array
     {
-        // Only allow authenticated users
-        return auth()->check();
+        return [
+            'name'  => $this->string('name'),
+            'notes' => $this->nlString('notes'),
+        ];
     }
 
     /**
+     * The rules that the incoming request must be matched against.
+     *
      * @return array
      */
     public function rules(): array
     {
         return [
-            'source'      => ['required', new IsTransferAccount],
-            'destination' => ['required', new IsTransferAccount],
-            'amount'      => 'required|numeric|more:0',
-            'description' => 'required|min:1',
-            'date'        => 'required|date',
+            'name' => 'required|between:1,100|uniqueObjectForUser:categories,name',
         ];
     }
 }

app/Api/V1/Requests/CategoryUpdateRequest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * CategoryUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class CategoryUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class CategoryUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $notes = null;
+        $all   = $this->all();
+        if (array_key_exists('notes', $all)) {
+            $notes = $this->nlString('notes');
+        }
+
+        return [
+            'name'  => $this->string('name'),
+            'notes' => $notes,
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $category = $this->route()->parameter('category');
+
+        return [
+            'name' => sprintf('required|between:1,100|uniqueObjectForUser:categories,name,%d', $category->id),
+        ];
+    }
+}

app/Api/V1/Requests/ConfigurationRequest.php

@@ -25,14 +25,17 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class ConfigurationRequest
  *
  * @codeCoverageIgnore
  */
-class ConfigurationRequest extends Request
+class ConfigurationRequest extends FormRequest
 {
+    use ConvertsDataTypes;
 
     /**
      * Authorize logged in users.
@@ -54,6 +57,8 @@ class ConfigurationRequest extends Request
     {
         $name = $this->route()->parameter('configName');
         switch ($name) {
+            default:
+                break;
             case 'is_demo_site':
             case 'single_user_mode':
                 return ['value' => $this->boolean('value')];
@@ -73,6 +78,8 @@ class ConfigurationRequest extends Request
     {
         $name = $this->route()->parameter('configName');
         switch ($name) {
+            default:
+                break;
             case 'is_demo_site':
             case 'single_user_mode':
                 return ['value' => ['required', new IsBoolean]];

app/Api/V1/Requests/CurrencyRequest.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 
 /**
@@ -32,8 +34,10 @@ use FireflyIII\Rules\IsBoolean;
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */
-class CurrencyRequest extends Request
+class CurrencyRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/DataDestroyRequest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * DataDestroyRequest.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class DataDestroyRequest
+ */
+class DataDestroyRequest extends FormRequest
+{
+    use ConvertsDataTypes;
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check() && !auth()->user()->hasRole('demo');
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return string
+     */
+    public function getObjects(): string
+    {
+        return $this->get('objects') ?? '';
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups' .
+                 ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers';
+
+        return [
+            'objects' => sprintf('required|min:1|string|in:%s', $valid),
+        ];
+    }
+}

app/Api/V1/Requests/DateRequest.php

@@ -25,13 +25,18 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
 /**
  * Request class for end points that require date parameters.
  *
  * Class DateRequest
  */
-class DateRequest extends Request
+class DateRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/LinkTypeRequest.php

@@ -24,17 +24,20 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\LinkType;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
 /**
- *
  * Class LinkTypeRequest
  *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */
-class LinkTypeRequest extends Request
+class LinkTypeRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/ObjectGroupUpdateRequest.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * CategoryRequest.php
+ * ObjectGroupUpdateRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -23,16 +24,18 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-use FireflyIII\Models\Category;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
- * Class CategoryRequest
+ * Class AccountObjectGroupUpdateRequestUpdateRequest
  *
  * @codeCoverageIgnore
- * TODO AFTER 4.8,0: split this into two request classes.
  */
-class CategoryRequest extends Request
+class ObjectGroupUpdateRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -45,14 +48,13 @@ class CategoryRequest extends Request
     }
 
     /**
-     * Get all data from the request.
-     *
      * @return array
      */
-    public function getAll(): array
+    public function getUpdateData(): array
     {
         return [
-            'name' => $this->string('name'),
+            'title' => $this->string('title'),
+            'order' => $this->integer('order'),
         ];
     }
 
@@ -63,20 +65,11 @@ class CategoryRequest extends Request
      */
     public function rules(): array
     {
-        $rules = [
-            'name' => 'required|between:1,100|uniqueObjectForUser:categories,name',
-        ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                /** @var Category $category */
-                $category      = $this->route()->parameter('category');
-                $rules['name'] = sprintf('required|between:1,100|uniqueObjectForUser:categories,name,%d', $category->id);
-                break;
-        }
+        $objectGroup = $this->route()->parameter('objectGroup');
 
-        return $rules;
+        return [
+            'title' => sprintf('min:1|uniqueObjectGroup:%d', $objectGroup->id),
+            'order' => 'numeric',
+        ];
     }
 }

app/Api/V1/Requests/PiggyBankRequest.php

@@ -26,17 +26,19 @@ namespace FireflyIII\Api\V1\Requests;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Rules\IsAssetAccountId;
 use FireflyIII\Rules\LessThanPiggyTarget;
-use FireflyIII\Rules\ZeroOrMore;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
- *
  * Class PiggyBankRequest
  *
  * @codeCoverageIgnore
  * TODO AFTER 4.8,0: split this into two request classes.
  */
-class PiggyBankRequest extends Request
+class PiggyBankRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -63,6 +65,7 @@ class PiggyBankRequest extends Request
             'startdate'      => $this->date('start_date'),
             'targetdate'     => $this->date('target_date'),
             'notes'          => $this->nlString('notes'),
+            'order'          => $this->integer('order'),
         ];
     }
 
@@ -75,7 +78,7 @@ class PiggyBankRequest extends Request
     {
         $rules = [
             'name'           => 'required|between:1,255|uniquePiggyBankForUser',
-            'current_amount' => ['numeric', new ZeroOrMore, 'lte:target_amount'],
+            'current_amount' => ['numeric', 'gte:0', 'lte:target_amount'],
             'start_date'     => 'date|nullable',
             'target_date'    => 'date|nullable|after:start_date',
             'notes'          => 'max:65000',
@@ -90,8 +93,8 @@ class PiggyBankRequest extends Request
                 $piggyBank               = $this->route()->parameter('piggyBank');
                 $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];
+                $rules['target_amount']  = 'numeric|gt:0';
+                $rules['current_amount'] = ['numeric', 'gte:0', new LessThanPiggyTarget];
                 break;
         }
 

app/Api/V1/Requests/PiggyBankStoreRequest.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * PiggyBankStoreRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class PiggyBankStoreRequest
+ *
+ * @codeCoverageIgnore
+ */
+class PiggyBankStoreRequest extends FormRequest
+{
+    use ConvertsDataTypes;
+
+    /**
+     * 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
+    {
+        return [
+            'name'            => $this->string('name'),
+            'account_id'      => $this->integer('account_id'),
+            'targetamount'    => $this->string('target_amount'),
+            'current_amount'  => $this->string('current_amount'),
+            'startdate'       => $this->date('start_date'),
+            'targetdate'      => $this->date('target_date'),
+            'notes'           => $this->nlString('notes'),
+            'object_group_id' => $this->integer('object_group_id'),
+            'object_group'    => $this->string('object_group_name'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'name'            => 'required|between:1,255|uniquePiggyBankForUser',
+            'current_amount'  => ['numeric', 'gte:0', 'lte:target_amount'],
+            'account_id'      => 'required|numeric|belongsToUser:accounts,id',
+            'object_group_id' => 'numeric|belongsToUser:object_groups,id',
+            'target_amount'   => ['numeric', 'gte:0', 'lte:target_amount', 'required'],
+            'start_date'      => 'date|nullable',
+            'target_date'     => 'date|nullable|after:start_date',
+            'notes'           => 'max:65000',
+        ];
+    }
+
+}

app/Api/V1/Requests/PreferenceRequest.php

@@ -23,15 +23,17 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
 /**
- *
  * Class PreferenceRequest
  *
  * @codeCoverageIgnore
  */
-class PreferenceRequest extends Request
+class PreferenceRequest extends FormRequest
 {
-
+    use ConvertsDataTypes;
 
     /**
      * Authorize logged in users.

app/Api/V1/Requests/RecurrenceStoreRequest.php

@@ -26,17 +26,20 @@ namespace FireflyIII\Api\V1\Requests;
 use Carbon\Carbon;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetRecurrenceData;
 use FireflyIII\Validation\CurrencyValidation;
 use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
 /**
  * Class RecurrenceStoreRequest
  */
-class RecurrenceStoreRequest extends Request
+class RecurrenceStoreRequest extends FormRequest
 {
-    use RecurrenceValidation, TransactionValidation, CurrencyValidation;
+    use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData;
 
     /**
      * Authorize logged in users.
@@ -81,6 +84,56 @@ class RecurrenceStoreRequest extends Request
         ];
     }
 
+    /**
+     * 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[] = $this->getSingleRecurrenceData($transaction);
+        }
+
+        return $return;
+    }
+
+    /**
+     * 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;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -104,8 +157,8 @@ class RecurrenceStoreRequest extends Request
             '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.*.amount'                => 'required|numeric|gt:0',
+            'transactions.*.foreign_amount'        => 'numeric|gt: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',
@@ -148,54 +201,4 @@ 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[] = $this->getSingleRecurrenceData($transaction);
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/RecurrenceUpdateRequest.php

@@ -26,17 +26,20 @@ namespace FireflyIII\Api\V1\Requests;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetRecurrenceData;
 use FireflyIII\Validation\CurrencyValidation;
 use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
 /**
  * Class RecurrenceUpdateRequest
  */
-class RecurrenceUpdateRequest extends Request
+class RecurrenceUpdateRequest extends FormRequest
 {
-    use RecurrenceValidation, TransactionValidation, CurrencyValidation;
+    use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData;
 
     /**
      * Authorize logged in users.
@@ -82,6 +85,56 @@ class RecurrenceUpdateRequest extends Request
         ];
     }
 
+    /**
+     * 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[] = $this->getSingleRecurrenceData($transaction);
+        }
+
+        return $return;
+    }
+
+    /**
+     * 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;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -107,8 +160,8 @@ class RecurrenceUpdateRequest extends Request
             '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.*.amount'                => 'required|numeric|gt:0',
+            'transactions.*.foreign_amount'        => 'numeric|gt: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',
@@ -150,54 +203,4 @@ class RecurrenceUpdateRequest extends Request
             }
         );
     }
-
-    /**
-     * 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[] = $this->getSingleRecurrenceData($transaction);
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/RuleGroupRequest.php

@@ -25,6 +25,8 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 
 /**
@@ -32,8 +34,10 @@ use FireflyIII\Rules\IsBoolean;
  * Class RuleGroupRequest
  * TODO AFTER 4.8,0: split this into two request classes.
  */
-class RuleGroupRequest extends Request
+class RuleGroupRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *

app/Api/V1/Requests/RuleGroupTestRequest.php

@@ -22,22 +22,21 @@
 
 declare(strict_types=1);
 
-
 namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Collection;
-use Log;
 
 /**
  * Class RuleGroupTestRequest
  */
-class RuleGroupTestRequest extends Request
+class RuleGroupTestRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -55,47 +54,12 @@ class RuleGroupTestRequest extends Request
     public function getTestParameters(): array
     {
         return [
-            'page'          => $this->getPage(),
-            'start_date'    => $this->getDate('start_date'),
-            'end_date'      => $this->getDate('end_date'),
-            'search_limit'  => $this->getSearchLimit(),
-            'trigger_limit' => $this->getTriggerLimit(),
-            'accounts'      => $this->getAccounts(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        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
      *
@@ -103,45 +67,28 @@ class RuleGroupTestRequest extends Request
      */
     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 null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
-     * @return int
+     * @return Collection
      */
-    private function getPage(): int
+    private function getAccounts(): string
     {
-        return 0 === (int) $this->query('page') ? 1 : (int) $this->query('page');
-
+        return (string) $this->query('accounts');
     }
 
     /**
-     * @return int
+     * @return array
      */
-    private function getSearchLimit(): int
+    public function rules(): array
     {
-        return 0 === (int) $this->query('search_limit') ? (int) config('firefly.test-triggers.limit') : (int) $this->query('search_limit');
-    }
-
-    /**
-     * @return int
-     */
-    private function getTriggerLimit(): int
-    {
-        return 0 === (int) $this->query('triggered_limit') ? (int) config('firefly.test-triggers.range') : (int) $this->query('triggered_limit');
-    }
-
-    /**
-     * @param Account|null $account
-     *
-     * @return bool
-     */
-    private function validAccount(?Account $account): bool
-    {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleGroupTriggerRequest.php

@@ -22,22 +22,20 @@
 
 declare(strict_types=1);
 
-
 namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use Illuminate\Support\Collection;
-use Log;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class RuleGroupTriggerRequest
  */
-class RuleGroupTriggerRequest extends Request
+class RuleGroupTriggerRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -55,47 +53,12 @@ class RuleGroupTriggerRequest extends Request
     public function getTriggerParameters(): array
     {
         return [
-            'start_date' => $this->getDate('start_date'),
-            'end_date'   => $this->getDate('end_date'),
-            'accounts'   => $this->getAccounts(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        return [
-            'start_date' => 'required|date',
-            'end_date'   => 'required|date|after:start_date',
-        ];
-    }
-
-    /**
-     * @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
      *
@@ -103,20 +66,26 @@ class RuleGroupTriggerRequest extends Request
      */
     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 null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
-     * @param Account|null $account
-     *
-     * @return bool
+     * @return string
      */
-    private function validAccount(?Account $account): bool
+    private function getAccounts(): string
     {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return (string) $this->query('accounts');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start' => 'date',
+            'end'   => 'date|after:start',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleStoreRequest.php

@@ -24,16 +24,20 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetRuleConfiguration;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 use function is_array;
 
 
 /**
  * Class RuleStoreRequest
- *
  */
-class RuleStoreRequest extends Request
+class RuleStoreRequest extends FormRequest
 {
+    use ConvertsDataTypes, GetRuleConfiguration;
+
     /**
      * Authorize logged in users.
      *
@@ -79,6 +83,48 @@ class RuleStoreRequest extends Request
         ];
     }
 
+    /**
+     * @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;
+    }
+
+    /**
+     * @return array
+     */
+    private function getRuleActions(): array
+    {
+        $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;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -86,11 +132,11 @@ class RuleStoreRequest extends Request
      */
     public function rules(): array
     {
-        $validTriggers = array_keys(config('firefly.rule-triggers'));
+        $validTriggers = $this->getTriggers();
         $validActions  = array_keys(config('firefly.rule-actions'));
 
         // some triggers and actions require text:
-        $contextTriggers = implode(',', config('firefly.context-rule-triggers'));
+        $contextTriggers = implode(',', $this->getTriggersWithContext());
         $contextActions  = implode(',', config('firefly.context-rule-actions'));
 
         return [
@@ -130,21 +176,6 @@ class RuleStoreRequest extends Request
         );
     }
 
-    /**
-     * 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'] ?? [];
-        // need at least one trigger
-        if (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.
      *
@@ -161,44 +192,17 @@ class RuleStoreRequest 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 getRuleActions(): array
+    protected function atLeastOneAction(Validator $validator): void
     {
-        $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')),
-                ];
-            }
+        $data    = $validator->getData();
+        $actions = $data['actions'] ?? [];
+        // need at least one trigger
+        if (0 === count($actions)) {
+            $validator->errors()->add('title', (string) trans('validation.at_least_one_action'));
         }
-
-        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

@@ -22,22 +22,20 @@
 
 declare(strict_types=1);
 
-
 namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use Illuminate\Support\Collection;
-use Log;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class RuleTestRequest
  */
-class RuleTestRequest extends Request
+class RuleTestRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -55,60 +53,14 @@ class RuleTestRequest extends Request
     public function getTestParameters(): array
     {
         return [
-            'page'          => $this->getPage(),
-            'start_date'    => $this->getDate('start_date'),
-            'end_date'      => $this->getDate('end_date'),
-            'search_limit'  => $this->getSearchLimit(),
-            'trigger_limit' => $this->getTriggerLimit(),
-            'accounts'      => $this->getAccounts(),
+            'page'     => $this->getPage(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
+
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        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
-    {
-        /** @var Carbon $result */
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
-
-        return $result;
-    }
-
     /**
      * @return int
      */
@@ -119,29 +71,34 @@ class RuleTestRequest extends Request
     }
 
     /**
-     * @return int
-     */
-    private function getSearchLimit(): int
-    {
-        return 0 === (int) $this->query('search_limit') ? (int) config('firefly.test-triggers.limit') : (int) $this->query('search_limit');
-    }
-
-    /**
-     * @return int
-     */
-    private function getTriggerLimit(): int
-    {
-        return 0 === (int) $this->query('triggered_limit') ? (int) config('firefly.test-triggers.range') : (int) $this->query('triggered_limit');
-    }
-
-    /**
-     * @param Account|null $account
+     * @param string $field
      *
-     * @return bool
+     * @return Carbon|null
      */
-    private function validAccount(?Account $account): bool
+    private function getDate(string $field): ?Carbon
     {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+    }
+
+    /**
+     * @return string
+     */
+    private function getAccounts(): string
+    {
+        return (string) $this->query('accounts');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after:start',
+            'accounts'   => '',
+            'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleTriggerRequest.php

@@ -26,17 +26,16 @@ namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use Illuminate\Support\Collection;
-use Log;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class RuleTriggerRequest
  */
-class RuleTriggerRequest extends Request
+class RuleTriggerRequest extends FormRequest
 {
+    use ConvertsDataTypes;
+
     /**
      * Authorize logged in users.
      *
@@ -54,47 +53,12 @@ class RuleTriggerRequest extends Request
     public function getTriggerParameters(): array
     {
         return [
-            'start_date' => $this->getDate('start_date'),
-            'end_date'   => $this->getDate('end_date'),
-            'accounts'   => $this->getAccounts(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        return [
-            'start_date' => 'required|date',
-            'end_date'   => 'required|date|after:start_date',
-        ];
-    }
-
-    /**
-     * @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
      *
@@ -102,20 +66,28 @@ class RuleTriggerRequest extends Request
      */
     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 null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
-     * @param Account|null $account
-     *
-     * @return bool
+     * @return string
      */
-    private function validAccount(?Account $account): bool
+    private function getAccounts(): string
     {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return (string) $this->query('accounts');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleUpdateRequest.php

@@ -24,16 +24,20 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetRuleConfiguration;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 use function is_array;
 
 
 /**
  * Class RuleUpdateRequest
- *
  */
-class RuleUpdateRequest extends Request
+class RuleUpdateRequest extends FormRequest
 {
+    use ConvertsDataTypes, GetRuleConfiguration;
+
     /**
      * Authorize logged in users.
      *
@@ -79,6 +83,54 @@ class RuleUpdateRequest extends Request
         ];
     }
 
+    /**
+     * @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;
+    }
+
+    /**
+     * @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;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -86,12 +138,12 @@ class RuleUpdateRequest extends Request
      */
     public function rules(): array
     {
-        $validTriggers = array_keys(config('firefly.rule-triggers'));
+        $validTriggers = $this->getTriggers();
         $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'));
+        $contextTriggers = implode(',', $this->getTriggersWithContext());
         $contextActions  = implode(',', config('firefly.context-rule-actions'));
 
         return [
@@ -131,21 +183,6 @@ class RuleUpdateRequest extends Request
         );
     }
 
-    /**
-     * 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.
      *
@@ -162,50 +199,17 @@ class RuleUpdateRequest extends Request
     }
 
     /**
-     * @return array|null
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
      */
-    private function getRuleActions(): ?array
+    protected function atLeastOneAction(Validator $validator): void
     {
-        if (!$this->has('actions')) {
-            return null;
+        $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'));
         }
-        $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;
     }
 }